From 9959ed92ff61d85f7af5936cbf99b4fedce9204a Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Tue, 29 Apr 2025 23:52:54 +0300 Subject: [PATCH 001/155] ci: Run daily workflows at 22:00 UTC (#785) --- .github/workflows/release_dev.yml | 2 +- .github/workflows/stale_labeler.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index 6b9e821054..fe36d8329a 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -11,7 +11,7 @@ on: - YYC - VM schedule: - - cron: "0 0 * * *" + - cron: "0 22 * * *" # every day at 22:00 UTC jobs: build_needed: diff --git a/.github/workflows/stale_labeler.yml b/.github/workflows/stale_labeler.yml index 6d0bb9466f..0277edc566 100644 --- a/.github/workflows/stale_labeler.yml +++ b/.github/workflows/stale_labeler.yml @@ -1,7 +1,7 @@ name: "Mark stale issues and PRs" on: schedule: - - cron: '0 0 * * *' # every day at midnight UTC + - cron: '0 22 * * *' # every day at 22:00 UTC jobs: stale: From c9fc13aef6ce9c98f21c0835e9d84625fad9a133 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 29 Apr 2025 22:06:01 +0100 Subject: [PATCH 002/155] fix: Role names displays player chosen names in creation (#780) --- scripts/scr_livery_setup/scr_livery_setup.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_livery_setup/scr_livery_setup.gml b/scripts/scr_livery_setup/scr_livery_setup.gml index 9ddaa3fa68..4a54e43385 100644 --- a/scripts/scr_livery_setup/scr_livery_setup.gml +++ b/scripts/scr_livery_setup/scr_livery_setup.gml @@ -536,7 +536,7 @@ function scr_livery_setup(){ draw_set_color(38144); draw_rectangle(xxx,yyy,1150,yyy+20,1); draw_set_color(38144); - draw_text(xxx,yyy,string_hash_to_newline(role[c,role_id])); + draw_text(xxx,yyy,role[100,role_id]); if (scr_hit(xxx,yyy,1150,yyy+20)) and ((!instance_exists(obj_creation_popup)) || ((instance_exists(obj_creation_popup) and obj_creation_popup.target_gear=0))) { draw_set_alpha(custom==2?0.2:0.1); From e298f6a0a32e1f37d1941eb89bf72283bfba25e3 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Tue, 29 Apr 2025 22:08:05 +0100 Subject: [PATCH 003/155] fix: Remaining sprite weapon issues and streamline customiser (#782) --- scripts/scr_ComplexSet/scr_ComplexSet.gml | 11 +- scripts/scr_buttons/scr_buttons.gml | 6 +- .../scr_complex_colour_kit.gml | 1 + .../scr_culture_visuals.gml | 65 ++++++- scripts/scr_livery_setup/scr_livery_setup.gml | 165 +++++------------- 5 files changed, 110 insertions(+), 138 deletions(-) diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 966c83bb68..47f1c8348a 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -539,7 +539,11 @@ function ComplexSet(_unit) constructor { } else if (_variant == 3) { _bio = [spr_terminator_complex_arm_hidden_right, spr_terminator_complex_arm_hidden_left]; } - } + } else { + if (_variant == 2 || _variant == 3){ + continue; + } + } if (_bionic_arm && !array_length(_bio)) { if (armour_type == ArmourType.Normal) { var _bio = [spr_bionic_right_arm, spr_bionic_left_arm]; @@ -774,11 +778,6 @@ function ComplexSet(_unit) constructor { weapon_left.hand_type = 0; _arm.ui_ymod += 15; } - - if (array_contains(["Chainaxe", "Power Axe", "Crozius Arcanum", "Power Mace", "Mace of Absolution", "Relic Blade"], _wep)) { - _arm.hand_type = 3; - _arm.arm_type = 3; - } } else if (armour_type == ArmourType.Scout) { _arm.ui_xmod += 4; _arm.ui_ymod += 11; diff --git a/scripts/scr_buttons/scr_buttons.gml b/scripts/scr_buttons/scr_buttons.gml index a9c2910ddc..40fe67c43d 100644 --- a/scripts/scr_buttons/scr_buttons.gml +++ b/scripts/scr_buttons/scr_buttons.gml @@ -437,6 +437,7 @@ function radio_set(options_array, title)constructor{ y_gap = 5; x1 = 0; y1 = 0; + draw_title = true; changed = false; max_width = 0; max_height = 0; @@ -448,7 +449,10 @@ function radio_set(options_array, title)constructor{ static update = item_data_updater; static draw = function(){ - draw_text(x1, y1, title); + if (draw_title){ + draw_text(x1, y1, title); + } + changed = false; var _start_current_selection = current_selection; var _prev_x = x1; diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml index 49ba4f05f4..a6b76ffc76 100644 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml @@ -182,6 +182,7 @@ function ColourItem(xx,yy) constructor{ set_pattern(struct_cols.main_color, lower_left); set_pattern(struct_cols.main_color, head_set); } + reset_image(); return variable_clone(map_colour); } diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 3d86d304b0..4e1aea1dd3 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1417,7 +1417,9 @@ global.weapon_visual_data = { sprite: spr_weapon_plasma_cannon_term }, { - display_type: "ranged_twohand", + weapon_data: { + display_type: "ranged_twohand", + }, sprite: spr_weapon_plasc, body_types: [0, 1] } @@ -1436,8 +1438,11 @@ global.weapon_visual_data = { sprite: spr_weapon_plasma_cannon_term }, { - display_type: "ranged_twohand", + weapon_data: { + display_type: "ranged_twohand", + }, sprite: spr_weapon_grav_cannon, + body_types: [0,1] } ] }, @@ -1731,6 +1736,18 @@ global.weapon_visual_data = { } ] }, +"Eviscerator" : { + base: { + weapon_data: { + display_type: "melee_onehand", + hand_type: 0, + new_weapon_draw: true + }, + }, + variants: [{ + sprite: spr_weapon_evisc + }] +}, "Eldar Power Sword": { base: { @@ -1779,7 +1796,8 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "melee_onehand", - hand_type: 2, + hand_type: 3, + arm_type : 3, new_weapon_draw: true }, }, @@ -1789,12 +1807,44 @@ global.weapon_visual_data = { } ] }, +"Power Mace": { + base: { + weapon_data: { + display_type: "melee_onehand", + hand_type: 3, + arm_type : 3, + new_weapon_draw: true + }, + }, + variants: [ + { + sprite: spr_weapon_powmace + }, + ] +}, +"Mace of Absolution": { + base: { + weapon_data: { + display_type: "melee_onehand", + hand_type: 3, + arm_type : 3, + new_weapon_draw: true + }, + }, + variants: [ + { + sprite: spr_weapon_powmace + } + ] +}, "Crozius Arcanum": { base: { weapon_data: { hand_on_top: true, - display_type: "melee_onehand" + display_type: "melee_onehand", + hand_type: 3, + arm_type : 3, }, }, variants: [ @@ -1808,7 +1858,8 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "melee_onehand", - hand_type: 2, + hand_type: 3, + arm_type : 3, new_weapon_draw: true }, }, @@ -1868,7 +1919,9 @@ global.weapon_visual_data = { base: { weapon_data: { hand_on_top: true, - display_type: "melee_onehand" + display_type: "melee_onehand", + hand_type: 3, + arm_type : 3, }, }, variants: [ diff --git a/scripts/scr_livery_setup/scr_livery_setup.gml b/scripts/scr_livery_setup/scr_livery_setup.gml index 4a54e43385..d0bc83a284 100644 --- a/scripts/scr_livery_setup/scr_livery_setup.gml +++ b/scripts/scr_livery_setup/scr_livery_setup.gml @@ -1,7 +1,7 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information function scr_livery_setup(){ - draw_set_font(fnt_40k_30b); + draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_set_alpha(1); draw_set_color(38144); @@ -24,7 +24,7 @@ function scr_livery_setup(){ preview_box.x2 = preview_box.x1 + preview_box.w; preview_box.y2 = preview_box.y1 + preview_box.h; - draw_sprite_stretched(spr_creation_arrow,0,preview_box.x1,preview_box.y1,32,32);// Left Arrow + /*draw_sprite_stretched(spr_creation_arrow,0,preview_box.x1,preview_box.y1,32,32);// Left Arrow draw_sprite_stretched(spr_creation_arrow,1,preview_box.x2-32,preview_box.y1,32,32);// Right Arrow if (point_and_click([preview_box.x1,preview_box.y1,preview_box.x1+32,preview_box.y1+32])){ test_sprite++; @@ -33,107 +33,17 @@ function scr_livery_setup(){ if (point_and_click([preview_box.x2-32,preview_box.y1,preview_box.x2, preview_box.y1+32])){ test_sprite--; if (test_sprite<0) then test_sprite=(array_length(draw_sprites)-1); - } + }*/ livery_picker.draw_base(); - draw_rectangle_color_simple(preview_box.x1,preview_box.y1,preview_box.x2,preview_box.y2,1,38144); - if( shader_is_compiled(sReplaceColor)){ - shader_set(sReplaceColor); - - shader_set_uniform_f_array(colour_to_find1, body_colour_find ); - shader_set_uniform_f_array(colour_to_set1, body_colour_replace ); - shader_set_uniform_f_array(colour_to_find2, secondary_colour_find ); - shader_set_uniform_f_array(colour_to_set2, secondary_colour_replace ); - shader_set_uniform_f_array(colour_to_find3, pauldron_colour_find ); - shader_set_uniform_f_array(colour_to_set3, pauldron_colour_replace ); - shader_set_uniform_f_array(colour_to_find4, lens_colour_find ); - shader_set_uniform_f_array(colour_to_set4, lens_colour_replace ); - shader_set_uniform_f_array(colour_to_find5, trim_colour_find ); - shader_set_uniform_f_array(colour_to_set5, trim_colour_replace ); - shader_set_uniform_f_array(colour_to_find6, pauldron2_colour_find ); - shader_set_uniform_f_array(colour_to_set6, pauldron2_colour_replace ); - shader_set_uniform_f_array(colour_to_find7, weapon_colour_find ); - shader_set_uniform_f_array(colour_to_set7, weapon_colour_replace ); - - //Rejoice! - tester_sprite = draw_sprites[test_sprite]; - tester_helm = draw_hem[test_sprite]; - if (col_special=0) then draw_sprite(tester_sprite,10,preview_box.x1,preview_box.y1 + 8); - if (col_special=1) then draw_sprite(tester_sprite,11,preview_box.x1,preview_box.y1 + 8); - if (col_special>=2) then draw_sprite(tester_sprite,12,preview_box.x1,preview_box.y1 + 8); - - draw_sprite(tester_sprite,col_special,preview_box.x1,preview_box.y1 + 8); - if (col_special<=1){ - draw_sprite(tester_sprite,6,preview_box.x1,preview_box.y1 + 8); - draw_sprite(tester_sprite,8,preview_box.x1,preview_box.y1 + 8); - } - if (col_special>=2){ - draw_sprite(tester_sprite,6,preview_box.x1,preview_box.y1 + 8); - draw_sprite(tester_sprite,9,preview_box.x1,preview_box.y1 + 8); - } - if (trim=0) and (col_special<=1) then draw_sprite(tester_sprite,4,preview_box.x1,preview_box.y1 + 8); - if (trim=0) and (col_special>=2) then draw_sprite(tester_sprite,5,preview_box.x1,preview_box.y1 + 8); - //TODO this can be imprved but for now it's fit for purpose - if (complex_selection=="Sergeant Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.sgt.helm_primary; - var sgt_col_2 = complex_livery_data.sgt.helm_secondary; - var lens_col = complex_livery_data.sgt.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } - else if (complex_selection=="Veteran Sergeant Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.vet_sgt.helm_primary; - var sgt_col_2 = complex_livery_data.vet_sgt.helm_secondary; - var lens_col = complex_livery_data.vet_sgt.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } - else if (complex_selection=="Captain Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.captain.helm_primary; - var sgt_col_2 = complex_livery_data.captain.helm_secondary; - var lens_col = complex_livery_data.captain.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } else if (complex_selection=="Veteran Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.veteran.helm_primary; - var sgt_col_2 = complex_livery_data.veteran.helm_secondary; - var lens_col = complex_livery_data.veteran.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } - shader_set_uniform_f_array(colour_to_find1, body_colour_find ); - shader_set_uniform_f_array(colour_to_set1, body_colour_replace ); - shader_set_uniform_f_array(colour_to_find2, secondary_colour_find ); - shader_set_uniform_f_array(colour_to_set2, secondary_colour_replace ); - shader_set_uniform_f_array(colour_to_set4, lens_colour_replace ); - if(tester_sprite == spr_terminator3_colors){ - draw_sprite(spr_weapon_colors,0,444 - 12,252 + 5); - } else { - draw_sprite(spr_weapon_colors,0,444,252); - } - shader_reset(); - - }else{ - draw_text(444,252,string_hash_to_newline("Color swap shader#did not compile")); - } + draw_set_alpha(1); + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + draw_set_alpha(1); + draw_set_color(38144); var comp_toggle = buttons.company_options_toggle; var company_radio = buttons.company_liveries_choice; + company_radio.draw_title = false; var comp_change = false; comp_toggle.update({ x1 : 50, @@ -179,6 +89,23 @@ function scr_livery_setup(){ } } + var _updater = draw_unit_buttons([preview_box.x1,preview_box.y1], "Update Sprite"); + if(scr_hit(_updater)){ + tooltip_draw("Click to Update Marine colour picker with Colour settings, warning this will overide Existing colour selections"); + } + + if (point_and_click(_updater)){ + var struct_cols = { + main_color :main_color, + secondary_color:secondary_color, + main_trim:main_trim, + right_pauldron:right_pauldron, + left_pauldron:left_pauldron, + lens_color:lens_color, + weapon_color:weapon_color + } + livery_picker.set_default_armour(struct_cols, col_special); + } draw_set_color(38144); draw_set_halign(fa_left); draw_text_transformed(580,118,"Battle Cry:",0.6,0.6,0); @@ -213,11 +140,12 @@ function scr_livery_setup(){ draw_text_transformed(cur_button.cords[0]+30,cur_button.cords[1]+4,cur_button.text,0.4,0.4,0); }*/ if (!complex_livery){ + var _tooltip_add_on = ". You can change this value as much as you want in order to update the marine role, company and defualt options on the left but remember to set this value back to your desired base value before continuing"; var button_data = [ { text : $"Primary : {col[main_color]}", tooltip:"Primary", - tooltip2:"The main color of your Astartes and their vehicles.", + tooltip2:"The main color of your Astartes and their vehicles. And the colour of your chapters Ships", cords : [620, 252], }, { @@ -264,7 +192,7 @@ function scr_livery_setup(){ button_cords = draw_unit_buttons(cur_button.cords, cur_button.text,[0.5,0.5], 38144,, fnt_40k_30b, button_alpha); if (scr_hit(button_cords[0],button_cords[1],button_cords[2],button_cords[3])){ tooltip=cur_button.tooltip; - tooltip2=cur_button.tooltip2; + tooltip2=cur_button.tooltip2+_tooltip_add_on; } if (point_and_click(button_cords) && custom >= 2){ @@ -291,33 +219,17 @@ function scr_livery_setup(){ var yar; for (var i=0;i Date: Wed, 30 Apr 2025 00:08:18 +0300 Subject: [PATCH 004/155] fix: NameGenerator breakage (#783) --- objects/obj_creation/Create_0.gml | 2 ++ scripts/NameGenerator/NameGenerator.gml | 46 ++++++++++++------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index afc15d2bbd..cf01253c0f 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -9,6 +9,8 @@ try{ handle_exception(_exception); } +global.name_generator = new NameGenerator(); + #region Global Settings: volume, fullscreen etc ini_open("saves.ini"); master_volume=ini_read_real("Settings","master_volume",1); diff --git a/scripts/NameGenerator/NameGenerator.gml b/scripts/NameGenerator/NameGenerator.gml index 1e03be5ab6..3453164078 100644 --- a/scripts/NameGenerator/NameGenerator.gml +++ b/scripts/NameGenerator/NameGenerator.gml @@ -39,37 +39,37 @@ function NameGenerator() constructor { }; // vars // TODO put these into a struct or dict or something - static sector_names = LoadSimpleNames("sector", "Sector 1"); - static sector_used_names = []; + sector_names = LoadSimpleNames("sector", "Sector 1"); + sector_used_names = []; - static star_names = LoadSimpleNames("star", "Star 1"); - static star_used_names = []; - static star_names_generic_counter = 0; // TODO once we migrate Star data to proper structs and jsons, this can probably be removed + star_names = LoadSimpleNames("star", "Star 1"); + star_used_names = []; + star_names_generic_counter = 0; // TODO once we migrate Star data to proper structs and jsons, this can probably be removed - static space_marines_names = LoadSimpleNames("space_marine", "Space Marine 1"); - static space_marines_used_names = []; + space_marines_names = LoadSimpleNames("space_marine", "Space Marine 1"); + space_marines_used_names = []; - static imperial_names = LoadSimpleNames("imperial", "Imperial 1"); - static imperial_used_names = []; + imperial_names = LoadSimpleNames("imperial", "Imperial 1"); + imperial_used_names = []; - static chaos_names = LoadSimpleNames("chaos", "Chaos 1"); - static chaos_used_names = []; + chaos_names = LoadSimpleNames("chaos", "Chaos 1"); + chaos_used_names = []; - static eldar_syllables = LoadCompositeNames("eldar", ["first_syllables", "second_syllables", "third_syllables"]); + eldar_syllables = LoadCompositeNames("eldar", ["first_syllables", "second_syllables", "third_syllables"]); - static ork_name_composites = LoadCompositeNames("ork", ["prefixes", "suffixes", "special"]); + ork_name_composites = LoadCompositeNames("ork", ["prefixes", "suffixes", "special"]); - static imperial_ship_names = LoadSimpleNames("imperial_ship", "Imperial Ship 1"); - static imperial_ship_used_names = []; + imperial_ship_names = LoadSimpleNames("imperial_ship", "Imperial Ship 1"); + imperial_ship_used_names = []; - static ork_ship_names = LoadSimpleNames("ork_ship", "Ork Ship 1"); - static ork_ship_used_names = []; + ork_ship_names = LoadSimpleNames("ork_ship", "Ork Ship 1"); + ork_ship_used_names = []; - static hulk_name_composites = LoadCompositeNames("hulk", ["prefixes", "suffixes"]); + hulk_name_composites = LoadCompositeNames("hulk", ["prefixes", "suffixes"]); - static tau_name_composites = LoadCompositeNames("tau", ["prefixes", "suffixes"]); + tau_name_composites = LoadCompositeNames("tau", ["prefixes", "suffixes"]); - static genestealer_cult_names = LoadCompositeNames("genestealercult", ["main", "embelishment", "title"]); + genestealer_cult_names = LoadCompositeNames("genestealercult", ["main", "embelishment", "title"]); // init @@ -84,7 +84,8 @@ function NameGenerator() constructor { array_delete(used_names, 0, used_names_length); } else { log_error($"Used up all {entity_name} names. Generating a generic name. used_names_length = {used_names_length}; star_names_generic_counter = {star_names_generic_counter}."); - return $"{entity_name} {used_names_length + (star_names_generic_counter++)}"; + star_names_generic_counter++; + return $"{entity_name} {used_names_length + star_names_generic_counter}"; } } @@ -225,6 +226,3 @@ function NameGenerator() constructor { return CompositeNameGeneration(tau_name_composites, true); }; } - -// Init -global.name_generator = new NameGenerator(); From b6a3412e31277afe2772503056edd15b519db141 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 30 Apr 2025 00:19:06 +0300 Subject: [PATCH 005/155] ci: Title checker allows "!" (#787) --- .github/pr-title-checker-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pr-title-checker-config.json b/.github/pr-title-checker-config.json index be898e9522..497f9249ad 100644 --- a/.github/pr-title-checker-config.json +++ b/.github/pr-title-checker-config.json @@ -1,6 +1,6 @@ { "CHECKS": { - "regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?: )|Merge branch" + "regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?!?: )|Merge branch" }, "MESSAGES": { "failure": "Invalid PR Title. Please use the following formats: `(): `. Refer to the list of [conventional commit types](https://github.com/pvdlg/conventional-commit-types?tab=readme-ov-file#commit-types)." From e172b618774f81afd6a4ef3ac76df578a34098c5 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Wed, 30 Apr 2025 00:19:46 +0300 Subject: [PATCH 006/155] ci: Add the rest of conventional commits to labeler (#786) --- .github/pr_labeler_contents.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/pr_labeler_contents.yml b/.github/pr_labeler_contents.yml index ccdec76495..77f436312d 100644 --- a/.github/pr_labeler_contents.yml +++ b/.github/pr_labeler_contents.yml @@ -40,3 +40,13 @@ labels: title: "^perf" - label: "Type: Performance" body: "(?i)(\\[performance\\]|\\[perf\\])" + +- label: "Type: Revert" + title: "^revert" +- label: "Type: Revert" + body: "(?i)\\[revert\\]" + +- label: "Type: Build" + title: "^build" +- label: "Type: Build" + body: "(?i)\\[build\\]" From 1ce9c628a546271f71ffcbd84e4eae157b00c67c Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 30 Apr 2025 21:27:58 +0100 Subject: [PATCH 007/155] fix: Problem getting eta time for missions (#788) --- scripts/scr_mission_eta/scr_mission_eta.gml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/scr_mission_eta/scr_mission_eta.gml b/scripts/scr_mission_eta/scr_mission_eta.gml index 3982d2a17e..5aa6c8cb2b 100644 --- a/scripts/scr_mission_eta/scr_mission_eta.gml +++ b/scripts/scr_mission_eta/scr_mission_eta.gml @@ -17,8 +17,10 @@ function scr_mission_eta(star_x, star_y, type=1, leeway = 10) { if (instance_exists(obj_p_fleet)){ if (type=1){ - var nearest_fleet = get_nearest_player_fleet(star_x, star_y, true); - eta1 = get_viable_travel_time(leeway, nearest_fleet.x, nearest_fleet.y, star_x, star_y, nearest_fleet, false); + var nearest_fleet = get_nearest_player_fleet(star_x, star_y); + if (nearest_fleet != "none"){ + eta1 = get_viable_travel_time(leeway, nearest_fleet.x, nearest_fleet.y, star_x, star_y, nearest_fleet, false); + } // n1=instance_nearest(x,y,obj_p_fleet); // with(n1){y-=3000;} // n2=instance_nearest(x,y,obj_p_fleet); From 502d263e81b2f2b1ec51010576ee3354d460aa48 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 30 Apr 2025 23:13:54 +0100 Subject: [PATCH 008/155] feat: New Force Axe Sprite (#790) --- ChapterMaster.yyp | 1 + scripts/scr_ComplexSet/scr_ComplexSet.gml | 8 +- .../scr_culture_visuals.gml | 5 +- .../7e323b40-4d75-4c0f-9c71-ade5cce4038e.png | Bin 0 -> 6564 bytes .../074e27fd-1f15-4bfa-a7f0-b156311448c2.png | Bin 0 -> 6564 bytes .../spr_weapon_frcaxe/spr_weapon_frcaxe.yy | 92 ++++++++++++++++++ 6 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png create mode 100644 sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png create mode 100644 sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index d1d7b3e64a..ea1fa47894 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1620,6 +1620,7 @@ {"id":{"name":"spr_weapon_eldsword","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},}, {"id":{"name":"spr_weapon_evisc","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},}, {"id":{"name":"spr_weapon_flamer","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},}, + {"id":{"name":"spr_weapon_frcaxe","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},}, {"id":{"name":"spr_weapon_frcstaff","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},}, {"id":{"name":"spr_weapon_grav_cannon","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},}, {"id":{"name":"spr_weapon_grav_gun","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 47f1c8348a..c8d1801983 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -756,9 +756,11 @@ function ComplexSet(_unit) constructor { } _arm.ui_ymod += 24; } - if (_arm.display_type == "melee_onehand" && (_wep != "Company Standard")) { - _arm.arm_type = 2; - _arm.hand_type = 2; + if (_arm.display_type == "melee_onehand" && _wep != "Company Standard" ) { + if (!_arm.hand_type){ + _arm.arm_type = 2; + _arm.hand_type = 2; + } _arm.ui_xmod -= 14; _arm.ui_ymod += 23; } diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 4e1aea1dd3..2274be20dd 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1904,13 +1904,14 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "melee_onehand", - hand_type: 2, + hand_type: 3, + arm_type : 3, new_weapon_draw: true }, }, variants: [ { - sprite: spr_weapon_powaxe + sprite: spr_weapon_frcaxe, } ] }, diff --git a/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png b/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png new file mode 100644 index 0000000000000000000000000000000000000000..51f62f9ce055e37baf5930048d34addd96e1aed1 GIT binary patch literal 6564 zcmd5>Wmw!?w+&JlV36Vzr-OZHaVy1PO3_lhxH}XmgLNow1qS!xHQb6@DNtIZxVzh6 z#o?y!_dWM{?vMND{<@Q7pUKJD$;rxD>+GFGYN{&};y=I#0Dus#qM!|yeE@(#1Hl3R zJ&wc30ShKe6>T*D@MQx4WC#FUf>p>(0Px}mfNe7XkVpdnDz~ggEh+E-j)khS0&w?t zdEZi!2msWna0OW%pXt3hgxmA8AYAmph_h;I1wHKrq!zCPp0&8lT7wsYE%zLvru}=$ z%Fj79+of*r=WT8E-V@2pz1`hscbnc4Q++jaaP~c?K2#lZh}l~VTvSJzS#aeqbNp65 zG&7?_&dJP^)wAmyn5szSDfBXsT5)_N@uYv`YWsCF0Tavrn_oVHOoDxsn#PG`ClQG2M+EmkkD`oUOwnRKsVIb?ZO9~`<_@0Wj zbgl-W3O{v7w}mVR`CAw~9tKCs8jw!T3WRNLZXyRaf)@^YUOl;i2DULu=MsZ!hgtlu za@LSGo$n+Q<)#zDwXKKIjup``gbU#mHW3{o%S2iU3FE4jTJ3Q}q5_w1s z#RPl@d3)Bwv}WCH7B3g@L*$sTgJsix*@(12zr|C_(2^7}deoxLv*sjmqPwBd-NbFC z^oJIj(C_ioOjTXC1^X_e(qthEu49CFj;>YQT^5!695{=ZqG14Xq(lSU{UBPzSml1q zW#@ePa9sLG7?2tKWvE}OTUbkI(!K> znsgF5onLYTuIEuvze-ohZfmpUJ&soUKG;wKUq1U|0B(Cn%m5MwNBg$8iP1TE zv)-4tK$`JG68o^3v2k#56LNForl$>snKYzY7=a;l-%N#JsgK=_i?J)hbgI|R^YA%Q zs*guxiKD~N?4@GX8+%f=M0m^E#>UF|;Y#Cr@=?9Vh_tsvHqh2qxJdar`1(aDVV zj&!d~zn;|Q!GW@@EXF&A#}XrVn?UP+9}tF-wkLL3h;5K!E|U33Ts-pR#M673ipCMO zO2Wg#<1n(VvEa7&Q6f*ewdNJJ#>9`w39*pd+rZt~hUcX`g^L`4SKSyuJEJLdf~CVu zv!$fFCj%y4=(RJB2iQ3~hxS=@dh7sld2(K11sWM<0@jxO2_#6jYE=}h`EZrL)u0-a zlYx@N2^jbJ+1sj|J4_V{AX9x}^v2b=z`qyjT+vy}f0*Avla{Saw)#m;4 zv0O{{^&E+v)jFrG4i6`k4_uU^*PG}R9UZv>-RcNjoec8EiKdy&tEXb#zQr6J9c_21 z@3N`x0If@X!DasfCQwt)pj+aen%v!$VHJiXNjp`8^nF+&?X#t0*(rxg%TnNr~# z#6GUi^41LmCs^!m>tOUu)1}7eykAh>PWQ5*>B{oAqN*x^NojWH-F|O`L1Nl7HgZbJ zPqmSAEvIUA zP&qfRIC)5_A*~9Eyp}li_u1b|8XPZF%#F>5`^81cS*2 z_X#yrNv)vU+*75(edT*o;9hTUZ}Ud~z(7ub;yY-UfAOzu07*c_`$4uM%{oM`_=BMW zBxru#gxj>0PFPsjftmradLL+yr4^+{!T2R$q`>gZ%xBu)F?7qL(ka$7d72QTdYA0} zGMc~4tm1yi$EP9s(ll!8=ceRJM#IXp=y@(t7mtCQ$I*<&FL9Wq1ck#SFIB#wm47zB zu%hNQZH=j_5&+s47vH;>80xE9c=j*3{k%v?NhzlD5h@8t8%6%KE_{kwf0KCyp&rN* z57y)eIaHT4x#8C!{C1$qeO`aOVaZVU`OEcm0w18?7Wf!=Ur-<~noXHAEQ|-Jh>MF` z`1?zJ!Wq7OX<}05r}gqBJw5@!@Yq;rSs5=m6_v6`fr6f1s)UAn^SV}yrO@>Bw5RP0 zoxoFTgYOx_j`^mN;mJA%TX(j8e65H|ea4XI$PZC3Gfz%W^C~Jx7z0ic3=@r;eeM&5 z%ZomdJczdB48aCQSJ-#G{eEs385-tim;$3$nWC;1-BA?V8NSEsYP}%qdxTov5)%{4 zLonc|_{7BE@p0X`%8jQgNoV%X&fU|sj;H0B^7=JgCuTNmIjt#?(_?!ia_;8*E9&y?wpE_JydX@-nlt z<7Q`Pe<&|kc6H_ZqRVx(JgPq(PiHXvcH@envw!2r-E4$JDSAXRb%daujskygC;6(l zn9Yl}kE#`Y569|0PjWmklI_zpSC(b_lnQ_CFql{x0@&HvA-Vg-UadoQ%ZwxI>go{w zsF0u_j4TN+{N&_h02vt>xm5x?H9^6^$pw`4^P50$qM19Mo={U)&#$b!kA;QhW0vw> zVH|oJNWdgZU+TM5pMC!Pw9qAI>ULaxXKybyLy5qaGZY(ug?BOgOXvEk|H~jHxwH>J ze%34hRQvSB3ksy$ox&EokfE`%Gq{E3+vxjf2C}tvkY5Wj8N$ z((T>3YvX~8;#3PWGp0|voP2!BMn;*w*o-7Zs)~yD9?;UR1R}MAznHWkTH_?Z zmFBNl(tFthNV1uN%-Ei|Yf@9+Z9lv7RcEKkb1&m2e@GG6>-TNPNy7_s0rs3>*l8}l zh?e;ew<>{w(!l%jaxj1}Fi3w8^ZmP$j;`+VY{RSSR)m+AFi2Y3GFg_u(B#so>C(A` z0;3=I!zAS1%c0!Ri?TX;dOg>(ZMRMJ?kg#{^z_+jbO${VTmkFwa_I96ELlJ~m(a9+ zRdS-Z;#davu7T60ZISigXi2<>>O z5!LBsU7d(nwt7-h(zlt#4|k;A*IbJgGRn z!JYH-tP9Uo)zE08YMt==p;U7!KYSiKQx{r|Id6ZB-X|8s?K@FZFjPA@&JbYgB5S0>}9mC zgOk&vj#lfDVgC-JdsRN|Z%Wt*vU9{HuKr&n@&^Nmd7r#5QqERrl9?KIqW zd#5)Qm->L9qMk}j=W+f(Nj4*LANi$+!4C?CA0Rj!TwGm4LnN7o(RT3N#jlXUmrdTx zBoLW~IC#W|fKDPt=`Vh}XIEoJ%@?Hiup{V6f%BE`%pp?RKiAXbXi=c_oF0Hv*Qu)^ z-I<3PDx$`Akl}E@>45EvRt;tlFzQve%TH9?MI3~5S?#*V$cuhNE43r zRsj{w@;GrJ5+5SD7tQ{Ha(gy#`(Yh|L%8QeSa#8)p)(*Q;$od?{Fxlhn6~ao`Iw~p zxhlp>XDuC_kd>ae&+;uZ-hqr8Pj2W%TmtV+@G@$b9CIH>Zv>XZYYHP~pnDx!8Og0p zO|+JlmSC_+O-n2P`gQ&K9LqbKQPBpQJ8nW}XA6OJw@r7(R&TpvO3r`%OHNHKRsz=I zym99KXQkduBy;%pIWL1@Tc%nm>}&27%uqYaUeNLNH#`QD*cYmHajtDwE3+6f(-r2y zcJ}sKT}MS-4HdkJ%<$*iQRR>EzNeG5DV?Uag{p2WbTs~;ay#A*cOZ+QB!2U@hDGms zim3bM8biyzK7hL#vG~&Eg=2zc&pX9z9vtKYd{!orOhU8gj>G)0g!RT{zM=iCr?2eK z@VKNWDdhS}C4E}iq&$k9ZYJh=v)|x?36W@d;D@kqO1)1)^~-{8@>wwW2MGfJ;7<=b zoL47^ijLMYGNPr3?=|dp65(oEs-QGb_ySL&*mW7eqMNgio6(ve0lw8bPM8U#FM2}@ zw$dfzVR+r$-P^TfXA{ZGGmI3=>3I}j8Zdc->-ck>iibB0)_@JTul=Clz_{4=;(OE;J6SUZCDf*b4 zf+DZ1OuglIS+_;ULH)UTHHPV9hoJg5Y)rF0X;Q|$<^*2xKFw>KWhO132;gH|)^@WJ z#Uj!cgL!2m-?xOk6<7NNvpI&?(<=M)N zv+dX>*v>GR-l@fs0kfq~!cn9QBGsrk<_4o_!l+}Pzhd%?jm*P|OstKod3b2g8=P!R z2zytI+Mq;L_+gp(tJsNZ=`2OTcv8?J+^US~Bz>WZ{KrMWldE09T0xgu!^)i) z0`^>@?aq9{Us6xPDFNkr7W+)i$huDpb7h>Ez~4Y^bhHp>wbrQKt=bmL=`n_W>7NhC z3YImBzt2U;GfejSs70 zg@N;u)U`6;T{c~^rA&>ewbc%o?}8^heS~EpB~o9Lq-oc6pNk_hM+40X1__k(^z>R2 zkwTfjeD+InnTe5Oh5|Q#pb^7g(UxRjCMWOhE#k}OjRhz@)w7tS`IhqTuCuonLPRG9 z%-$UR%|08~Q|hKD+zpunm2oW9NRWe%L{X9_M^ryoLT z;){ZrBfIvbLNs6dJZ_P`<#<3xyJV7BHob5_&CX@0Y42E%MKns{DZjr>} z&U%w~#U$KAxLTi)g$msz2t36MgT0%1XA!eEfC)hSB&u-e-Tay;Iama#-xbBmx4WqkS|<6&;>o1IBd2w%VDT}6bs&1f}ix@M!3`t& z&@$Lw2>=EE#saRu>^ z=?$f)NAp%UPU|Pa+<5Du9lQhsYbi?s8+tLkL^McYIA*AQ0lxtz z$1~b)tghhPJHoA;t_)aEM|3)vU|FIq*l;|KV*k^0oQ@_q{h}hn`pb5c!{2UvfiHi} zd2#PJ3E54DL_A$odY@Hb#2LXHX}M;H^?h87so@@I0YF^ZMe~`klMAb+#}3i>WTyF{ zb^gz3q6wDWe`%=FI-Iupoxj_H^4$1%3je255s4RRro?01A8dow-!TYYdkje*XsVe*jk@ z?HxQbyAC6`xL}YH_-*%Z$m!^5C^q+BhV9R?c%JdfKld*B+fRO&dy;R){Ua4OC<3&T zLjL2MED0FYC_6bBjsiXEU+P^7ff7p9BSYc==Gj=dL>#na4T_KMfqtG=I_=v8om<(+ zF)D@fXj@gdBHhLW+4P(mOhx}{MtxOZf}cAzzjq`o&cqKV;TYL}*!n#~K||ZyIEl&p z?)IjFupfO%4_Y_x7)x+}XaEamwY4WU67QsZAdGV)Y)D_?X)$+u#V~8W6-Xd86qETv zYXAUjP%!G!H{)+mJgIVwcsW`d2mtKNhxEh~9BVF~eoN z)8p$b@T>Ym9=$I9%LzA6B|Zn-9^vptrtgpAjcI&#m*Lm9J>?#_J>*>(3V)AvBs_bD z7~vN~MH*od|E>QD)~ z|Es^JiT~!ln!wm)K`7Vi5Ze6!8vtn@!%N9Z1K!6a?Hi?bn;=1FI*iPF1|3=j(F!StHT3_mu7B0BQZ3CusKjOuP%853A%A4CE4= zX;r|yii40@&qu42&Y8baCCLhGhj`Ag>IG$X{Shp*ko0eqxPl}T)qQX#9#;H}6t;=` zr?NiEuGxlVtAZ`kyeu_0B`q$gT^dgd6AErld=dWubYZd!ia$y}%qOjl2s z_xHM+^nkb1AdHId zdJ=G^Y(*NytblPC-t53n8T(5fut2gJt%Hv>0u&l9#!dOeB2uo@Q}do*#6yD9UBP94 zfx!-Q6<^w=?m_dg@26D_r?&pyWYI!B`iCCxC$eJ?y?9R=tB0w5$U_q+V*m3@K%6Tb zzEB0JbLqyO=Fbiw3t2$jJ{7%HvAcBA@EAA*G@~<2fjE=*{wtsiHZRcH_A~k)x)S-gC}82{G*f1@OCG% ziqv!SIy~drQn`;MQ-AyDZfSuzMiq!(KSNkQ6Ppvsa68ZqiCDn{^9Ou%JD#kUc z;P5@yZ}V4!BWh>y%u_T8iAc^`JT+vllL7tL7uuN3{6Sc5I_zmt!q*nwZ(7Tr<;P`7{bG zR57JUPC?=&5iCc}Hh)=S5KM9)-bn1ez>|+nO$u%(gQQ)EtCzB8E;g%V3@`og@AhFH z%=XG#g>T$5@UOGlkha}#ERKY{g8zq?`%ek)h*^Y6ORqZBGr^A*te%Sco>u0b))JN; z)?fh$@Cyj@@C)$>^6LmZk`NSS_Q0 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png b/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png new file mode 100644 index 0000000000000000000000000000000000000000..51f62f9ce055e37baf5930048d34addd96e1aed1 GIT binary patch literal 6564 zcmd5>Wmw!?w+&JlV36Vzr-OZHaVy1PO3_lhxH}XmgLNow1qS!xHQb6@DNtIZxVzh6 z#o?y!_dWM{?vMND{<@Q7pUKJD$;rxD>+GFGYN{&};y=I#0Dus#qM!|yeE@(#1Hl3R zJ&wc30ShKe6>T*D@MQx4WC#FUf>p>(0Px}mfNe7XkVpdnDz~ggEh+E-j)khS0&w?t zdEZi!2msWna0OW%pXt3hgxmA8AYAmph_h;I1wHKrq!zCPp0&8lT7wsYE%zLvru}=$ z%Fj79+of*r=WT8E-V@2pz1`hscbnc4Q++jaaP~c?K2#lZh}l~VTvSJzS#aeqbNp65 zG&7?_&dJP^)wAmyn5szSDfBXsT5)_N@uYv`YWsCF0Tavrn_oVHOoDxsn#PG`ClQG2M+EmkkD`oUOwnRKsVIb?ZO9~`<_@0Wj zbgl-W3O{v7w}mVR`CAw~9tKCs8jw!T3WRNLZXyRaf)@^YUOl;i2DULu=MsZ!hgtlu za@LSGo$n+Q<)#zDwXKKIjup``gbU#mHW3{o%S2iU3FE4jTJ3Q}q5_w1s z#RPl@d3)Bwv}WCH7B3g@L*$sTgJsix*@(12zr|C_(2^7}deoxLv*sjmqPwBd-NbFC z^oJIj(C_ioOjTXC1^X_e(qthEu49CFj;>YQT^5!695{=ZqG14Xq(lSU{UBPzSml1q zW#@ePa9sLG7?2tKWvE}OTUbkI(!K> znsgF5onLYTuIEuvze-ohZfmpUJ&soUKG;wKUq1U|0B(Cn%m5MwNBg$8iP1TE zv)-4tK$`JG68o^3v2k#56LNForl$>snKYzY7=a;l-%N#JsgK=_i?J)hbgI|R^YA%Q zs*guxiKD~N?4@GX8+%f=M0m^E#>UF|;Y#Cr@=?9Vh_tsvHqh2qxJdar`1(aDVV zj&!d~zn;|Q!GW@@EXF&A#}XrVn?UP+9}tF-wkLL3h;5K!E|U33Ts-pR#M673ipCMO zO2Wg#<1n(VvEa7&Q6f*ewdNJJ#>9`w39*pd+rZt~hUcX`g^L`4SKSyuJEJLdf~CVu zv!$fFCj%y4=(RJB2iQ3~hxS=@dh7sld2(K11sWM<0@jxO2_#6jYE=}h`EZrL)u0-a zlYx@N2^jbJ+1sj|J4_V{AX9x}^v2b=z`qyjT+vy}f0*Avla{Saw)#m;4 zv0O{{^&E+v)jFrG4i6`k4_uU^*PG}R9UZv>-RcNjoec8EiKdy&tEXb#zQr6J9c_21 z@3N`x0If@X!DasfCQwt)pj+aen%v!$VHJiXNjp`8^nF+&?X#t0*(rxg%TnNr~# z#6GUi^41LmCs^!m>tOUu)1}7eykAh>PWQ5*>B{oAqN*x^NojWH-F|O`L1Nl7HgZbJ zPqmSAEvIUA zP&qfRIC)5_A*~9Eyp}li_u1b|8XPZF%#F>5`^81cS*2 z_X#yrNv)vU+*75(edT*o;9hTUZ}Ud~z(7ub;yY-UfAOzu07*c_`$4uM%{oM`_=BMW zBxru#gxj>0PFPsjftmradLL+yr4^+{!T2R$q`>gZ%xBu)F?7qL(ka$7d72QTdYA0} zGMc~4tm1yi$EP9s(ll!8=ceRJM#IXp=y@(t7mtCQ$I*<&FL9Wq1ck#SFIB#wm47zB zu%hNQZH=j_5&+s47vH;>80xE9c=j*3{k%v?NhzlD5h@8t8%6%KE_{kwf0KCyp&rN* z57y)eIaHT4x#8C!{C1$qeO`aOVaZVU`OEcm0w18?7Wf!=Ur-<~noXHAEQ|-Jh>MF` z`1?zJ!Wq7OX<}05r}gqBJw5@!@Yq;rSs5=m6_v6`fr6f1s)UAn^SV}yrO@>Bw5RP0 zoxoFTgYOx_j`^mN;mJA%TX(j8e65H|ea4XI$PZC3Gfz%W^C~Jx7z0ic3=@r;eeM&5 z%ZomdJczdB48aCQSJ-#G{eEs385-tim;$3$nWC;1-BA?V8NSEsYP}%qdxTov5)%{4 zLonc|_{7BE@p0X`%8jQgNoV%X&fU|sj;H0B^7=JgCuTNmIjt#?(_?!ia_;8*E9&y?wpE_JydX@-nlt z<7Q`Pe<&|kc6H_ZqRVx(JgPq(PiHXvcH@envw!2r-E4$JDSAXRb%daujskygC;6(l zn9Yl}kE#`Y569|0PjWmklI_zpSC(b_lnQ_CFql{x0@&HvA-Vg-UadoQ%ZwxI>go{w zsF0u_j4TN+{N&_h02vt>xm5x?H9^6^$pw`4^P50$qM19Mo={U)&#$b!kA;QhW0vw> zVH|oJNWdgZU+TM5pMC!Pw9qAI>ULaxXKybyLy5qaGZY(ug?BOgOXvEk|H~jHxwH>J ze%34hRQvSB3ksy$ox&EokfE`%Gq{E3+vxjf2C}tvkY5Wj8N$ z((T>3YvX~8;#3PWGp0|voP2!BMn;*w*o-7Zs)~yD9?;UR1R}MAznHWkTH_?Z zmFBNl(tFthNV1uN%-Ei|Yf@9+Z9lv7RcEKkb1&m2e@GG6>-TNPNy7_s0rs3>*l8}l zh?e;ew<>{w(!l%jaxj1}Fi3w8^ZmP$j;`+VY{RSSR)m+AFi2Y3GFg_u(B#so>C(A` z0;3=I!zAS1%c0!Ri?TX;dOg>(ZMRMJ?kg#{^z_+jbO${VTmkFwa_I96ELlJ~m(a9+ zRdS-Z;#davu7T60ZISigXi2<>>O z5!LBsU7d(nwt7-h(zlt#4|k;A*IbJgGRn z!JYH-tP9Uo)zE08YMt==p;U7!KYSiKQx{r|Id6ZB-X|8s?K@FZFjPA@&JbYgB5S0>}9mC zgOk&vj#lfDVgC-JdsRN|Z%Wt*vU9{HuKr&n@&^Nmd7r#5QqERrl9?KIqW zd#5)Qm->L9qMk}j=W+f(Nj4*LANi$+!4C?CA0Rj!TwGm4LnN7o(RT3N#jlXUmrdTx zBoLW~IC#W|fKDPt=`Vh}XIEoJ%@?Hiup{V6f%BE`%pp?RKiAXbXi=c_oF0Hv*Qu)^ z-I<3PDx$`Akl}E@>45EvRt;tlFzQve%TH9?MI3~5S?#*V$cuhNE43r zRsj{w@;GrJ5+5SD7tQ{Ha(gy#`(Yh|L%8QeSa#8)p)(*Q;$od?{Fxlhn6~ao`Iw~p zxhlp>XDuC_kd>ae&+;uZ-hqr8Pj2W%TmtV+@G@$b9CIH>Zv>XZYYHP~pnDx!8Og0p zO|+JlmSC_+O-n2P`gQ&K9LqbKQPBpQJ8nW}XA6OJw@r7(R&TpvO3r`%OHNHKRsz=I zym99KXQkduBy;%pIWL1@Tc%nm>}&27%uqYaUeNLNH#`QD*cYmHajtDwE3+6f(-r2y zcJ}sKT}MS-4HdkJ%<$*iQRR>EzNeG5DV?Uag{p2WbTs~;ay#A*cOZ+QB!2U@hDGms zim3bM8biyzK7hL#vG~&Eg=2zc&pX9z9vtKYd{!orOhU8gj>G)0g!RT{zM=iCr?2eK z@VKNWDdhS}C4E}iq&$k9ZYJh=v)|x?36W@d;D@kqO1)1)^~-{8@>wwW2MGfJ;7<=b zoL47^ijLMYGNPr3?=|dp65(oEs-QGb_ySL&*mW7eqMNgio6(ve0lw8bPM8U#FM2}@ zw$dfzVR+r$-P^TfXA{ZGGmI3=>3I}j8Zdc->-ck>iibB0)_@JTul=Clz_{4=;(OE;J6SUZCDf*b4 zf+DZ1OuglIS+_;ULH)UTHHPV9hoJg5Y)rF0X;Q|$<^*2xKFw>KWhO132;gH|)^@WJ z#Uj!cgL!2m-?xOk6<7NNvpI&?(<=M)N zv+dX>*v>GR-l@fs0kfq~!cn9QBGsrk<_4o_!l+}Pzhd%?jm*P|OstKod3b2g8=P!R z2zytI+Mq;L_+gp(tJsNZ=`2OTcv8?J+^US~Bz>WZ{KrMWldE09T0xgu!^)i) z0`^>@?aq9{Us6xPDFNkr7W+)i$huDpb7h>Ez~4Y^bhHp>wbrQKt=bmL=`n_W>7NhC z3YImBzt2U;GfejSs70 zg@N;u)U`6;T{c~^rA&>ewbc%o?}8^heS~EpB~o9Lq-oc6pNk_hM+40X1__k(^z>R2 zkwTfjeD+InnTe5Oh5|Q#pb^7g(UxRjCMWOhE#k}OjRhz@)w7tS`IhqTuCuonLPRG9 z%-$UR%|08~Q|hKD+zpunm2oW9NRWe%L{X9_M^ryoLT z;){ZrBfIvbLNs6dJZ_P`<#<3xyJV7BHob5_&CX@0Y42E%MKns{DZjr>} z&U%w~#U$KAxLTi)g$msz2t36MgT0%1XA!eEfC)hSB&u-e-Tay;Iama#-xbBmx4WqkS|<6&;>o1IBd2w%VDT}6bs&1f}ix@M!3`t& z&@$Lw2>=EE#saRu>^ z=?$f)NAp%UPU|Pa+<5Du9lQhsYbi?s8+tLkL^McYIA*AQ0lxtz z$1~b)tghhPJHoA;t_)aEM|3)vU|FIq*l;|KV*k^0oQ@_q{h}hn`pb5c!{2UvfiHi} zd2#PJ3E54DL_A$odY@Hb#2LXHX}M;H^?h87so@@I0YF^ZMe~`klMAb+#}3i>WTyF{ zb^gz3q6wDWe`%=FI-Iupoxj_H^4$1%3je255s4RRro?01A8dow-!TYYdkje*XsVe*jk@ z?HxQbyAC6`xL}YH_-*%Z$m!^5C^q+BhV9R?c%JdfKld*B+fRO&dy;R){Ua4OC<3&T zLjL2MED0FYC_6bBjsiXEU+P^7ff7p9BSYc==Gj=dL>#na4T_KMfqtG=I_=v8om<(+ zF)D@fXj@gdBHhLW+4P(mOhx}{MtxOZf}cAzzjq`o&cqKV;TYL}*!n#~K||ZyIEl&p z?)IjFupfO%4_Y_x7)x+}XaEamwY4WU67QsZAdGV)Y)D_?X)$+u#V~8W6-Xd86qETv zYXAUjP%!G!H{)+mJgIVwcsW`d2mtKNhxEh~9BVF~eoN z)8p$b@T>Ym9=$I9%LzA6B|Zn-9^vptrtgpAjcI&#m*Lm9J>?#_J>*>(3V)AvBs_bD z7~vN~MH*od|E>QD)~ z|Es^JiT~!ln!wm)K`7Vi5Ze6!8vtn@!%N9Z1K!6a?Hi?bn;=1FI*iPF1|3=j(F!StHT3_mu7B0BQZ3CusKjOuP%853A%A4CE4= zX;r|yii40@&qu42&Y8baCCLhGhj`Ag>IG$X{Shp*ko0eqxPl}T)qQX#9#;H}6t;=` zr?NiEuGxlVtAZ`kyeu_0B`q$gT^dgd6AErld=dWubYZd!ia$y}%qOjl2s z_xHM+^nkb1AdHId zdJ=G^Y(*NytblPC-t53n8T(5fut2gJt%Hv>0u&l9#!dOeB2uo@Q}do*#6yD9UBP94 zfx!-Q6<^w=?m_dg@26D_r?&pyWYI!B`iCCxC$eJ?y?9R=tB0w5$U_q+V*m3@K%6Tb zzEB0JbLqyO=Fbiw3t2$jJ{7%HvAcBA@EAA*G@~<2fjE=*{wtsiHZRcH_A~k)x)S-gC}82{G*f1@OCG% ziqv!SIy~drQn`;MQ-AyDZfSuzMiq!(KSNkQ6Ppvsa68ZqiCDn{^9Ou%JD#kUc z;P5@yZ}V4!BWh>y%u_T8iAc^`JT+vllL7tL7uuN3{6Sc5I_zmt!q*nwZ(7Tr<;P`7{bG zR57JUPC?=&5iCc}Hh)=S5KM9)-bn1ez>|+nO$u%(gQQ)EtCzB8E;g%V3@`og@AhFH z%=XG#g>T$5@UOGlkha}#ERKY{g8zq?`%ek)h*^Y6ORqZBGr^A*te%Sco>u0b))JN; z)?fh$@Cyj@@C)$>^6LmZk`NSS_Q0 literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy new file mode 100644 index 0000000000..d8a5fe83b6 --- /dev/null +++ b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"", + "%Name":"spr_weapon_frcaxe", + "bboxMode":0, + "bbox_bottom":247, + "bbox_left":31, + "bbox_right":116, + "bbox_top":89, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":281, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"074e27fd-1f15-4bfa-a7f0-b156311448c2","blendMode":0,"displayName":"default","isLocked":false,"name":"074e27fd-1f15-4bfa-a7f0-b156311448c2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_frcaxe", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_frcaxe", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_frcaxe", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":281.0, + "seqWidth":201.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":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d1cbf5d8-ad42-4a35-b45b-c36bbcb08988","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":201, +} \ No newline at end of file From b6ffb54f918f667dd6a8334b2c02bd0addee0ad4 Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Thu, 1 May 2025 12:09:17 +1000 Subject: [PATCH 009/155] fix: Crash on mission_inquisition_tyranid_organism (#792) --- .../scr_inquisition_mission.gml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml index 54f2302d11..562abb2ba2 100644 --- a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml +++ b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml @@ -131,9 +131,9 @@ function mission_inquisition_demon_world(demon_worlds){ } } var eta = scr_mission_eta(star.x, star.y, 25); - var text="The Inquisitor is trusting you with a special mission. The planet " + string(star.name) + " " + scr_roman(planet); - text+=" has been uncovered as a Demon World. The taint of chaos must be eradicated from this system. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","demon_world|"+string(star.name)+"|"+string(planet)+"|"+string(eta+1)+"|"); + var text=$"The Inquisitor is trusting you with a special mission. The planet {string(star.name)} {scr_roman(planet)}"; + text+=$" has been uncovered as a Demon World. The taint of chaos must be eradicated from this system. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"demon_world|{string(star.name)}|{string(planet)}|{string(eta+1)}|"); } function mission_inquisition_ethereal(){ @@ -161,9 +161,9 @@ function mission_inquisition_ethereal(){ } var eta = scr_mission_eta(star.x,star.y,1); eta = min(max(eta,12),50); - var text = "An Inquisitor is trusting you with a special mission."; - text +="They require that you capture a Tau Ethereal from the planet "+string(star.name)+" "+scr_roman(planet)+"for research purposes. You have"+string(eta)+" months to locate and capture one. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","ethereal|" + string(star.name) + "|" + string(planet) + "|" +string(eta+1) + "|"); + var text = $"An Inquisitor is trusting you with a special mission."; + text +=$"They require that you capture a Tau Ethereal from the planet {string(star.name)} {scr_roman(planet)} for research purposes. You have {string(eta)} months to locate and capture one. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"ethereal|{string(star.name)}|{string(planet)}|{string(eta+1)}|"); } @@ -181,9 +181,9 @@ function mission_inquisition_tyranid_organism(worlds){ var eta = scr_mission_eta(star.x, star.y, 1); var eta = min(max(eta,6),50); - var text="An Inquisitor is trusting you with a special mission. The planet " + string(star.name) + " " + scr_roman(planet); + var text=$"An Inquisitor is trusting you with a special mission. The planet {string(star.name)} {scr_roman(planet)}"; text+=" is ripe with Tyranid organisms. They require that you capture one of the Gaunt species for research purposes. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","tyranid_org|"+string(star.name)+"|"+string(planet)+"|"+string(eta+1)+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"tyranid_org|{string(star.name)}|{string(planet)}|{string(eta+1)}|"); } @@ -193,9 +193,9 @@ function mission_inquisition_tomb_world(tomb_worlds){ var planet = scr_get_planet_with_feature(star, P_features.Necron_Tomb); var eta = scr_mission_eta(star.x, star.y,1) - var text="The Inquisition is trusting you with a special mission. They have reason to suspect the Necron Tomb on planet " + string(star.name) + " " +scr_roman(planet); - text+=" may become active. You are to send a small group of marines to plant a bomb deep inside, within "+string(eta)+" months. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","necron|"+string(star.name)+"|"+string(planet)+"|"+string((eta+1))+"|"); + var text=$"The Inquisition is trusting you with a special mission. They have reason to suspect the Necron Tomb on planet {string(star.name)} {scr_roman(planet)}"; + text+=$" may become active. You are to send a small group of marines to plant a bomb deep inside, within {string(eta)} months. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"necron|{string(star.name)}|{string(planet)}|{string((eta+1))}|"); } @@ -203,7 +203,7 @@ function mission_inquisition_artifact(){ var text; log_message("RE: Artifact Hold"); text="The Inquisition is trusting you with a special mission. A local Inquisitor has a powerful artifact. You are to keep it safe, and NOT use it, until the artifact may be safely retrieved. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","artifact|bop|0|"+string(irandom_range(6,26))+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"artifact|bop|0|{string(irandom_range(6,26))}|"); } function mission_inquistion_hunt_inquisitor(){ @@ -236,8 +236,8 @@ function mission_inquistion_hunt_inquisitor(){ var eta = scr_mission_eta(star.x,star.y,1); eta=max(eta, 8); - var text="The Inquisition is trusting you with a special mission. A radical inquisitor named "+string(name)+" will be visiting the "+string(star.name)+" system in "+string(eta)+" month's time. They are highly suspect of heresy, and as such, are to be put down. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","inquisitor|"+string(star.name)+"|"+string(planet)+"|"+string(real(eta))+"|"); + var text=$"The Inquisition is trusting you with a special mission. A radical inquisitor named {string(name)} will be visiting the {string(star.name)} system in {string(eta)} month's time. They are highly suspect of heresy, and as such, are to be put down. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"inquisitor|{string(star.name)}|{string(planet)}|{string(real(eta))}|"); } function mission_inquistion_spyrer(){ @@ -258,9 +258,9 @@ function mission_inquistion_spyrer(){ eta = min(max(eta, 6), 50); - var text="The Inquisition is trusting you with a special mission. An experienced Spyrer on hive world " + string(star.name) + " " + scr_roman(planet); - text += " has began to hunt indiscriminately, and proven impossible to take down by conventional means. If they are not put down within "+string(eta)+" month's time panic is likely. Can your chapter handle this mission?"; - var mission_params = "spyrer|"+string(star.name)+"|"+string(planet)+"|"+string(eta+1)+"|"; + var text=$"The Inquisition is trusting you with a special mission. An experienced Spyrer on hive world {string(star.name)} {scr_roman(planet)}"; + text += $" has began to hunt indiscriminately, and proven impossible to take down by conventional means. If they are not put down within {string(eta)} month's time panic is likely. Can your chapter handle this mission?"; + var mission_params = $"spyrer|{string(star.name)}|{string(planet)}|{string(eta+1)}|"; log_message($"Starting spyrer mission with params {mission_params}") scr_popup("Inquisition Mission",text,"inquisition",mission_params); } @@ -333,20 +333,20 @@ function mission_inquistion_purge(){ if (mission_flavour==1) { - text +=" A number of high-ranking nobility on the planet "+scr_roman(planet)+" are being difficult and harboring heretical thoughts. They are to be selectively purged within "+string(eta)+" months. Can your chapter handle this mission?"; + text +=$" A number of high-ranking nobility on the planet {scr_roman(planet)} are being difficult and harboring heretical thoughts. They are to be selectively purged within {string(eta)} months. Can your chapter handle this mission?"; } else if (mission_flavour==2) { - text+=" A powerful crimelord on the planet "+scr_roman(planet)+" is gaining an unacceptable amount of power and disrupting daily operations. They are to be selectively purged within "+string(eta)+" months. Can your chapter handle this mission?"; + text+=$" A powerful crimelord on the planet {scr_roman(planet)} is gaining an unacceptable amount of power and disrupting daily operations. They are to be selectively purged within {string(eta)} months. Can your chapter handle this mission?"; } else if (mission_flavour==3) { - text+=" The mutants of hive world "+scr_roman(planet)+" are growing in numbers and ferocity, rising sporadically from the underhive. They are to be cleansed by promethium within "+string(eta)+" months. Can your chapter handle this mission?"; + text+=$" The mutants of hive world {scr_roman(planet)} are growing in numbers and ferocity, rising sporadically from the underhive. They are to be cleansed by promethium within {string(eta)} months. Can your chapter handle this mission?"; } if (mission_flavour!=3) { - scr_popup("Inquisition Mission",text,"inquisition","purge|"+string(star.name)+"|"+string(planet)+"|"+string(real(eta+1))+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"purge|{string(star.name)}|{string(planet)}|{string(real(eta+1))}|"); } else { - scr_popup("Inquisition Mission",text,"inquisition","cleanse|"+string(star.name)+"|"+string(planet)+"|"+string(real(eta+1))+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"cleanse|{string(star.name)}|{string(planet)}|{string(real(eta+1))}|"); } } @@ -387,9 +387,9 @@ function mission_investigate_planet(){ } eta = min(max(3,eta),100); - var text="The Inquisition wishes for you to investigate " + string(star.name) + " " + scr_roman(planet) + "."; - text+=" Boots are expected to be planted on its surface over the course of your investigation."; - text += " You have " + string(eta) + " months to complete this task."; - scr_popup("Inquisition Recon",text,"inquisition","recon|"+string(star.name)+"|"+string(planet)+"|"+string(eta)+"|"); + var text=$"The Inquisition wishes for you to investigate {string(star.name)} {scr_roman(planet)}"; + text+=$" Boots are expected to be planted on its surface over the course of your investigation."; + text += $" You have {string(eta)} months to complete this task."; + scr_popup("Inquisition Recon",text,"inquisition",$"recon|{string(star.name)}|{string(planet)}|{string(eta)}|"); } \ No newline at end of file From 74b79af4eef2ab66c181c5c79d4745735d315610 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Fri, 2 May 2025 08:39:34 +0300 Subject: [PATCH 010/155] refactor: Inquisitor, loyalty, quest arrays with array_create() (#791) --- objects/obj_controller/Create_0.gml | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index cca061f4b6..ce3b3e21d9 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -803,25 +803,27 @@ recruit_training[0]=0; recruit_exp[0]=0; recruit_data[0]={}; -for(var i=0; i<501; i++){ - - // For loyalty penalties - if (i<=50){ - loyal[i]=""; - loyal_num[i]=0;// If less than 1 and greater than 0; that x100 is the chance for discovery - loyal_time[i]=0; - } - if (i<=10){ - inquisitor_gender[i]=choose(0,0,0,1,1,1,1); // 4:3 chance of male Inquisitor - inquisitor_type[i]=choose("Ordo Malleus","Ordo Xenos","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus"); - inquisitor[i]=global.name_generator.generate_imperial_name(inquisitor_gender[i]);// For 'random inquisitor wishes to inspect your fleet - } - if (i<60){ - quest[i]="";// 300req - quest_faction[i]=0;// 6 - quest_end[i]=0;// like 4 or so after the turn this is created - } +// ** Sets loyalty variables ** +loyal = array_create(51, ""); +loyal_num = array_create(51, 0); +loyal_time = array_create(51, 0); + +// ** Sets quest variables ** +quest = array_create(60, ""); +quest_faction = array_create(60, 0); +quest_end = array_create(60, 0); + +// ** Sets inquisitor variables ** +inquisitor_gender = array_create(11, 0); +inquisitor_type = array_create(11, ""); +inquisitor = array_create(11, ""); + +for (var i = 0, l = array_length(inquisitor_gender); i < l; i++) { + inquisitor_gender[i] = choose(0, 0, 0, 1, 1, 1, 1); + inquisitor_type[i] = choose("Ordo Malleus", "Ordo Xenos", "Ordo Hereticus", "Ordo Hereticus", "Ordo Hereticus", "Ordo Hereticus", "Ordo Hereticus", "Ordo Hereticus"); + inquisitor[i] = global.name_generator.generate_imperial_name(inquisitor_gender[i]); } + // ** Sets diplomacy variables ** diplo_last=""; diplo_text=""; From 6707a87248fdf4e3c5472949959f62405922284a Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sat, 3 May 2025 21:24:42 +0300 Subject: [PATCH 011/155] fix: NameGenerator not initialized when loading (#796) --- objects/obj_creation/CleanUp_0.gml | 3 ++- objects/obj_creation/Create_0.gml | 2 -- scripts/__init_global/__init_global.gml | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/objects/obj_creation/CleanUp_0.gml b/objects/obj_creation/CleanUp_0.gml index 82d9187617..276e87902e 100644 --- a/objects/obj_creation/CleanUp_0.gml +++ b/objects/obj_creation/CleanUp_0.gml @@ -1 +1,2 @@ -chapter_icons_container.cleanup(); \ No newline at end of file +chapter_icons_container.cleanup(); +global.name_generator = new NameGenerator(); \ No newline at end of file diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index cf01253c0f..afc15d2bbd 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -9,8 +9,6 @@ try{ handle_exception(_exception); } -global.name_generator = new NameGenerator(); - #region Global Settings: volume, fullscreen etc ini_open("saves.ini"); master_volume=ini_read_real("Settings","master_volume",1); diff --git a/scripts/__init_global/__init_global.gml b/scripts/__init_global/__init_global.gml index e1afd62310..63ef6ff9d2 100644 --- a/scripts/__init_global/__init_global.gml +++ b/scripts/__init_global/__init_global.gml @@ -11,4 +11,5 @@ function __init_global() { global.chapter_name = "None"; global.game_seed = 0; global.ui_click_lock = false; + global.name_generator = new NameGenerator(); } From 32b820b1db02d44d76c4c269061692d09932cc37 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 4 May 2025 05:05:07 +0300 Subject: [PATCH 012/155] feat: Force Axe and Mace of Absolution sprite edits (#799) --- .../scr_culture_visuals.gml | 2 +- .../7e323b40-4d75-4c0f-9c71-ade5cce4038e.png | Bin 6564 -> 5727 bytes .../074e27fd-1f15-4bfa-a7f0-b156311448c2.png | Bin 6564 -> 0 bytes .../ea93f36a-f600-49c5-852d-94e130eda274.png | Bin 0 -> 5727 bytes .../spr_weapon_frcaxe/spr_weapon_frcaxe.yy | 22 +++++++++--------- .../630e8d95-baaa-4950-8761-35b8ccf4848c.png | Bin 2308 -> 2488 bytes .../a09831c3-3081-40fc-8d7d-4b4f2da95434.png | Bin 0 -> 2488 bytes .../dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png | Bin 2308 -> 0 bytes .../spr_weapon_mace_of_absolution.yy | 14 ++++++----- 9 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png create mode 100644 sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/ea93f36a-f600-49c5-852d-94e130eda274.png create mode 100644 sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/a09831c3-3081-40fc-8d7d-4b4f2da95434.png delete mode 100644 sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 2274be20dd..380e8d7594 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1833,7 +1833,7 @@ global.weapon_visual_data = { }, variants: [ { - sprite: spr_weapon_powmace + sprite: spr_weapon_mace_of_absolution } ] }, diff --git a/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png b/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png index 51f62f9ce055e37baf5930048d34addd96e1aed1..9dec60d31ea1620025de365a1641d5c3e376f82e 100644 GIT binary patch literal 5727 zcmcIIcQl;M*G~{cuTf)>2uYOH+b)7A5iKNo5V5)lR_|RBC6y?vx9Huf(V}-&T|{RQ z!YZqMoA>>l@0{Ns-=E(+_nA3oX70?rcW#@B*3nX>Bx5B50Dw|mP5CLlt;YZBq{R5z zkdf&bzTvb|d#VWlK6e2iC=38__^zN00Dyx5V9NpkWD)^@$t9&;7lI!keyO3V3|#&F z(wp)=0RZDub>)ZpUNbvrZx@EiRFb{lm|f{Gm5L79&^vqABrM_u=pEnRDgjyxOl#D8 z8dj$6XpuI&`PfoX{RMr&>x;_$qw10R*@51saym@E(K3}=IN{-Ym!+`w3hQ8^?ynCG zNrT^q?Mg3P3U8?%v$Nhx--R`U>>oeX9@?;5>q|Co2|!cQ(EfiGG)>zkv6S*3@j5u; z7Tf)tC#%M!SUQF+hc|uq#wDMI8#mEV91AG9)nC(!?tH0s_tTcmJsy=%LEek(6|!(< z`{~))cWQS+@Bm+s`$+2yoO5BY z+|7hKCVMN%_G3OK2%5FcA>BrXhk$F7_fL~($Xp`AT%4IIj^Gz%5xnHCX|}~L-XS5a2U&^K&r2= zzc^KH1*RYjR#2FjkxQcvXaPl7{`h^|zJ9>POmTAtvnCxrs@GR(GxQzAQE))0hDEK- zcc|UTd`ycu9AMV`(Et$+Ja@tKAg_}&L{Qry+PS>mtX2(pq=)yQmkd)<+xv5 zY%EogQ6=$+?YPI;O4|ATDThEWTI#E{`+YRjeA#ijH-Ns&j2kVdm7I84F8o%-UW$l0 zZHDLCxdv|hVQ*HH%+v|6cTqIu<&%!kBKd#cq1tpVXU z4y6QqC)Lh}M(Ox*cDxeKb5UN9SiDe~B&c7`BEJ0~;QXMLuaLYTWL(v~Ir+B2Wwt9X zEJb-;63GJpvprooET%bdO_+kv!CYkc2#X|*Y_FlE!4s&!8Ds&@Z=MvR%+TqMDYbg& zW~B{vD#`-o;&`93g{;-VMZW2q=X^Fay|_15eUgRO!{MrsfK$^xKZCmmALPH#aVBG$ zs=7z_W2zlL(w_~aC$&o0{D!-`TO6zne4jI{JuUQlwZnv0lKr0}<^)0CON~q#;;t$5 zvh5*AS5kW=d0 z7JDi$DJG`yIC}lEk=-OPjm(w*W+jJTVe?(O8z!1g#gzkW$iAvuchcJ+9}v&p>#DE# zARPO`2|DQntB-$ zc|l3g+FUzZdwWIv05J)Pu7N=$-dW&r*7;5P%XXV8SuQOov_WZvK;83aVM?q1_O~$g zfQSTHa#GUp%*@-PBad0D?pveB9PbP7Rz-jmE=RdBpGZxc{aCPAEHmrlf!7@D?Ceb# z98$8s$sg}U>Prf(QP}=2N=nL%=4KB3k#LAk0W>?0{nefs7%cbZia_9y&*dL%D^TN` zIVuJQOiDW<)4g#;Sh&yYl;%0s?Z&1577&g?JVF$w+k8xs>K52M#}hVF5uSs)gxNvkiQO^me(q6AN{xVX4sqt_dI<<<&4 z9%hQ~>W^TQPQ){&h$nXkvUJ9+63Bx;@oICk#w_6-XwAa$$#R^H#7nFs?Qa$!g!r)d zDni2?5#4aLOeg1>O$xYpS(z5wUk+kH)4`K%^5xg(8q?-1i@2b{?7nQ3*zW1x59J|E z_7nHnp*~_0N;ao;+IQ%_H{v5COBQI&Th=kV!$m6)slU{a+MgLJ-)=3ognZn6_^DvGv?vkbsW>8P;otC+XZ+7X+qjF_ZoM4HGZTlam{ zL=Ij|f2658dy4f7_Yo#S1-?>^WqSK8(&W9(`nzt4CwaU5v>Se-eT0S0&2sP=p-R=7 zqj6Z7s)|a5+~s(I9!sCc=xb@lW@!^xRu5N-?2{(ORh5hWOV!7e3gD3O)Bl5jbu^vzoTw-ji} zG%**^3-T+XR*S9S5(Q2RwhvtEnlMSEQ=H|D&WoS^R@Z$qXl$LF2I>k+OSQvGv$H#H zGT-Cz@%42ZjBmKQJQF1-W=)XLuiMB=^*SRz0Dysk0i(&%{QMsXs4r)j&eewsv{!$o z?-TfLSK{lJ^CHTR=R{|$gsKivY!Z%T#U3l&wAhQ8Y6rKfSBKuNL^z!N(cRM7Kr;FK z&qiG>nrnl2lbM*9s5v{s;c`zzMq}JXsnIl>t7^}m=7!kr|LGH&4X8oXSQKG@(%WKo zCdJJ*Hd3N_wfZZHt<0F}IP5jY%3gMoiAhRk6&F(i!)WxtXuGxZ5r5Mg&CidiU-I8< z-$gfYg(>hcD5|U9cwS-}P0y>fxc94_nVDHst+JY68jffz4Yv7Xk7Tf!i1<+*V*=+V4VdvftIWlsRb@T@Zaw z421ariwhif3uac*U8N8w*jE=*eJM4oXJ+Qa=6gBZSLp(WsR-9I0qNm(oSo1RMLfGKWghhr(xQOmQc(C95p!Aig3}FyiIg4$}0(Dt} z$Cph%(TW`H733A{61r7ol}2$^Zlg!1ee1C%$jNKXIjr3hUN3wgW`%6lI>4xTKf&;< z^IMa&{c>3&+iY?!Iq-R9A{Tv&Q<1cYVu1=6uHx99f0_RMI~hK})GXgFmaLpa!Bc}h z?j3&t<&MPscwe?=EEhl*Yf10&w+gbVCyPxY;TV)P$#zQ$dY z>tCN{wM`r9Qt<6|f6Ye*j8arh;IJ54s>lIy!i?t2+!R$Mf**gcGgDLfDx%FEmykiT zqKK=P6msT2Zo-IXd{dY&%C5^o7h(Cu;?)ywLr}>a^GlS;>*?H2tP#Oi#`O#;;(N&4 zF)zp0;`8TK=3lrWzz^RP)=|AyElDu`M!lxO8Kkf26p*?U!A%gXpprjO+VH%%Z3|?o zXJc61UkVf2;nIrLD~wTcs2k8p#vW1%Ds?P%zO(lA^;JoSn{{#;8s}%34(+DQsCnAtS(1cP>3$w!=wL%UGdp+F zp2tMfKQyYMLWCtoWx~?5MwZ2P$jvGL^;6B_?4e&}DeIxZM^cj!I2daDImJP7S9QkV zbG^XhhJ}Het!zQ{R`5c-DchE*IJR;~&Vj9vBQ-=um*S5=e|1Bj>%awPZ&x)GUXtYV zy`g6lwT_DWl`Ni?L>81xD2&K5pPLJCjdJLt2J(xG9~l|3$bhC}$#YoO+~Lb5Kh3jh zYngMDmgqIToXJh6L(~(`egCd`hIy41WOaFkG)m z4k?^s(e;%5KU2gT@$*n{5o12 zT#n-678i8v{J^06jtku)ON%W#gm%j!kl}=$=AOM$_vX)d4AMJ}{g`hwyH1>8xju1Y zV>JVflZ;n_lxL`k(Nc(`UFXh629lEQc23}v8vdpQ`EyUcU1Zqx@`FV9F5}>6mM~Ig zJog=+>b@goG`S2+8qMqq)gB*bY~_GRolz>ouBSMYc?a<-LT$9N|nRje( zsA{3JD4Z#)V}w2`?00j@C^2eDhC_bD$O<_g$Pp2Jz1$|~jq&K;U}aI;D07Z}wt59z z8(~aJI*vjS0B?tsU4EBfNYE%0sv;pbWscQ8nQ_T1tfjVf6Be)P#XWv?7Bdkae}Z1{ zBlt~HnBq(|lHD^iV;nth8&z+VAd6OT<&~Vw&hj-7seJH5!$ilqL{OfeE$l6v@FO3a zK_sif&$`2-o!L}pI%En4AHOwP0hVWCg@dVU1$4i4}u+ktPN&knib=k~-v;XlK2A2j7KbKGk??ela| zq+eadvs-7iM+T#Aj%&WoFV81m8!;o1aU)=nuonL7$cqWkvdt_Vuq9Pf#b$mr$HOMb}l zD;nW*6h{~Q;6M)M4t;%d=5udGCOJNBz9pr)!}*;=ki$PFf*`HlO(5-$TPnJG@ej^g4?~L2<9`I=BA6tm{TZZ8->Nev z&@});7Zq%Ny~~qLRGO@|ycmuUG>LB-c6N=LZ5Q@2nthMC>yxpwLNocAFDY1}9fHV^ zyYJ{sRsDp#N{w7%Ow$M{Jr0O?l##Z65B=lfpFifa`ew&2yKU{rdFXjacEW8f$=JCb z^454G75T=$%Nn#<7E3pd!npsdxTao_Xh^_Br3X31@b9fW?vD)JUs<|a%UHQu;~PK( zEFvxd#)FtXSXf3}Tt-Cr0T?U;1`{$YJ^C*Mr`NCSVBY^Xf~&gmDIS6Ee|K=VbFy}G bw{&v(zj1g>eetiv0HFRzOSweRBIJJnLh|MN literal 6564 zcmd5>Wmw!?w+&JlV36Vzr-OZHaVy1PO3_lhxH}XmgLNow1qS!xHQb6@DNtIZxVzh6 z#o?y!_dWM{?vMND{<@Q7pUKJD$;rxD>+GFGYN{&};y=I#0Dus#qM!|yeE@(#1Hl3R zJ&wc30ShKe6>T*D@MQx4WC#FUf>p>(0Px}mfNe7XkVpdnDz~ggEh+E-j)khS0&w?t zdEZi!2msWna0OW%pXt3hgxmA8AYAmph_h;I1wHKrq!zCPp0&8lT7wsYE%zLvru}=$ z%Fj79+of*r=WT8E-V@2pz1`hscbnc4Q++jaaP~c?K2#lZh}l~VTvSJzS#aeqbNp65 zG&7?_&dJP^)wAmyn5szSDfBXsT5)_N@uYv`YWsCF0Tavrn_oVHOoDxsn#PG`ClQG2M+EmkkD`oUOwnRKsVIb?ZO9~`<_@0Wj zbgl-W3O{v7w}mVR`CAw~9tKCs8jw!T3WRNLZXyRaf)@^YUOl;i2DULu=MsZ!hgtlu za@LSGo$n+Q<)#zDwXKKIjup``gbU#mHW3{o%S2iU3FE4jTJ3Q}q5_w1s z#RPl@d3)Bwv}WCH7B3g@L*$sTgJsix*@(12zr|C_(2^7}deoxLv*sjmqPwBd-NbFC z^oJIj(C_ioOjTXC1^X_e(qthEu49CFj;>YQT^5!695{=ZqG14Xq(lSU{UBPzSml1q zW#@ePa9sLG7?2tKWvE}OTUbkI(!K> znsgF5onLYTuIEuvze-ohZfmpUJ&soUKG;wKUq1U|0B(Cn%m5MwNBg$8iP1TE zv)-4tK$`JG68o^3v2k#56LNForl$>snKYzY7=a;l-%N#JsgK=_i?J)hbgI|R^YA%Q zs*guxiKD~N?4@GX8+%f=M0m^E#>UF|;Y#Cr@=?9Vh_tsvHqh2qxJdar`1(aDVV zj&!d~zn;|Q!GW@@EXF&A#}XrVn?UP+9}tF-wkLL3h;5K!E|U33Ts-pR#M673ipCMO zO2Wg#<1n(VvEa7&Q6f*ewdNJJ#>9`w39*pd+rZt~hUcX`g^L`4SKSyuJEJLdf~CVu zv!$fFCj%y4=(RJB2iQ3~hxS=@dh7sld2(K11sWM<0@jxO2_#6jYE=}h`EZrL)u0-a zlYx@N2^jbJ+1sj|J4_V{AX9x}^v2b=z`qyjT+vy}f0*Avla{Saw)#m;4 zv0O{{^&E+v)jFrG4i6`k4_uU^*PG}R9UZv>-RcNjoec8EiKdy&tEXb#zQr6J9c_21 z@3N`x0If@X!DasfCQwt)pj+aen%v!$VHJiXNjp`8^nF+&?X#t0*(rxg%TnNr~# z#6GUi^41LmCs^!m>tOUu)1}7eykAh>PWQ5*>B{oAqN*x^NojWH-F|O`L1Nl7HgZbJ zPqmSAEvIUA zP&qfRIC)5_A*~9Eyp}li_u1b|8XPZF%#F>5`^81cS*2 z_X#yrNv)vU+*75(edT*o;9hTUZ}Ud~z(7ub;yY-UfAOzu07*c_`$4uM%{oM`_=BMW zBxru#gxj>0PFPsjftmradLL+yr4^+{!T2R$q`>gZ%xBu)F?7qL(ka$7d72QTdYA0} zGMc~4tm1yi$EP9s(ll!8=ceRJM#IXp=y@(t7mtCQ$I*<&FL9Wq1ck#SFIB#wm47zB zu%hNQZH=j_5&+s47vH;>80xE9c=j*3{k%v?NhzlD5h@8t8%6%KE_{kwf0KCyp&rN* z57y)eIaHT4x#8C!{C1$qeO`aOVaZVU`OEcm0w18?7Wf!=Ur-<~noXHAEQ|-Jh>MF` z`1?zJ!Wq7OX<}05r}gqBJw5@!@Yq;rSs5=m6_v6`fr6f1s)UAn^SV}yrO@>Bw5RP0 zoxoFTgYOx_j`^mN;mJA%TX(j8e65H|ea4XI$PZC3Gfz%W^C~Jx7z0ic3=@r;eeM&5 z%ZomdJczdB48aCQSJ-#G{eEs385-tim;$3$nWC;1-BA?V8NSEsYP}%qdxTov5)%{4 zLonc|_{7BE@p0X`%8jQgNoV%X&fU|sj;H0B^7=JgCuTNmIjt#?(_?!ia_;8*E9&y?wpE_JydX@-nlt z<7Q`Pe<&|kc6H_ZqRVx(JgPq(PiHXvcH@envw!2r-E4$JDSAXRb%daujskygC;6(l zn9Yl}kE#`Y569|0PjWmklI_zpSC(b_lnQ_CFql{x0@&HvA-Vg-UadoQ%ZwxI>go{w zsF0u_j4TN+{N&_h02vt>xm5x?H9^6^$pw`4^P50$qM19Mo={U)&#$b!kA;QhW0vw> zVH|oJNWdgZU+TM5pMC!Pw9qAI>ULaxXKybyLy5qaGZY(ug?BOgOXvEk|H~jHxwH>J ze%34hRQvSB3ksy$ox&EokfE`%Gq{E3+vxjf2C}tvkY5Wj8N$ z((T>3YvX~8;#3PWGp0|voP2!BMn;*w*o-7Zs)~yD9?;UR1R}MAznHWkTH_?Z zmFBNl(tFthNV1uN%-Ei|Yf@9+Z9lv7RcEKkb1&m2e@GG6>-TNPNy7_s0rs3>*l8}l zh?e;ew<>{w(!l%jaxj1}Fi3w8^ZmP$j;`+VY{RSSR)m+AFi2Y3GFg_u(B#so>C(A` z0;3=I!zAS1%c0!Ri?TX;dOg>(ZMRMJ?kg#{^z_+jbO${VTmkFwa_I96ELlJ~m(a9+ zRdS-Z;#davu7T60ZISigXi2<>>O z5!LBsU7d(nwt7-h(zlt#4|k;A*IbJgGRn z!JYH-tP9Uo)zE08YMt==p;U7!KYSiKQx{r|Id6ZB-X|8s?K@FZFjPA@&JbYgB5S0>}9mC zgOk&vj#lfDVgC-JdsRN|Z%Wt*vU9{HuKr&n@&^Nmd7r#5QqERrl9?KIqW zd#5)Qm->L9qMk}j=W+f(Nj4*LANi$+!4C?CA0Rj!TwGm4LnN7o(RT3N#jlXUmrdTx zBoLW~IC#W|fKDPt=`Vh}XIEoJ%@?Hiup{V6f%BE`%pp?RKiAXbXi=c_oF0Hv*Qu)^ z-I<3PDx$`Akl}E@>45EvRt;tlFzQve%TH9?MI3~5S?#*V$cuhNE43r zRsj{w@;GrJ5+5SD7tQ{Ha(gy#`(Yh|L%8QeSa#8)p)(*Q;$od?{Fxlhn6~ao`Iw~p zxhlp>XDuC_kd>ae&+;uZ-hqr8Pj2W%TmtV+@G@$b9CIH>Zv>XZYYHP~pnDx!8Og0p zO|+JlmSC_+O-n2P`gQ&K9LqbKQPBpQJ8nW}XA6OJw@r7(R&TpvO3r`%OHNHKRsz=I zym99KXQkduBy;%pIWL1@Tc%nm>}&27%uqYaUeNLNH#`QD*cYmHajtDwE3+6f(-r2y zcJ}sKT}MS-4HdkJ%<$*iQRR>EzNeG5DV?Uag{p2WbTs~;ay#A*cOZ+QB!2U@hDGms zim3bM8biyzK7hL#vG~&Eg=2zc&pX9z9vtKYd{!orOhU8gj>G)0g!RT{zM=iCr?2eK z@VKNWDdhS}C4E}iq&$k9ZYJh=v)|x?36W@d;D@kqO1)1)^~-{8@>wwW2MGfJ;7<=b zoL47^ijLMYGNPr3?=|dp65(oEs-QGb_ySL&*mW7eqMNgio6(ve0lw8bPM8U#FM2}@ zw$dfzVR+r$-P^TfXA{ZGGmI3=>3I}j8Zdc->-ck>iibB0)_@JTul=Clz_{4=;(OE;J6SUZCDf*b4 zf+DZ1OuglIS+_;ULH)UTHHPV9hoJg5Y)rF0X;Q|$<^*2xKFw>KWhO132;gH|)^@WJ z#Uj!cgL!2m-?xOk6<7NNvpI&?(<=M)N zv+dX>*v>GR-l@fs0kfq~!cn9QBGsrk<_4o_!l+}Pzhd%?jm*P|OstKod3b2g8=P!R z2zytI+Mq;L_+gp(tJsNZ=`2OTcv8?J+^US~Bz>WZ{KrMWldE09T0xgu!^)i) z0`^>@?aq9{Us6xPDFNkr7W+)i$huDpb7h>Ez~4Y^bhHp>wbrQKt=bmL=`n_W>7NhC z3YImBzt2U;GfejSs70 zg@N;u)U`6;T{c~^rA&>ewbc%o?}8^heS~EpB~o9Lq-oc6pNk_hM+40X1__k(^z>R2 zkwTfjeD+InnTe5Oh5|Q#pb^7g(UxRjCMWOhE#k}OjRhz@)w7tS`IhqTuCuonLPRG9 z%-$UR%|08~Q|hKD+zpunm2oW9NRWe%L{X9_M^ryoLT z;){ZrBfIvbLNs6dJZ_P`<#<3xyJV7BHob5_&CX@0Y42E%MKns{DZjr>} z&U%w~#U$KAxLTi)g$msz2t36MgT0%1XA!eEfC)hSB&u-e-Tay;Iama#-xbBmx4WqkS|<6&;>o1IBd2w%VDT}6bs&1f}ix@M!3`t& z&@$Lw2>=EE#saRu>^ z=?$f)NAp%UPU|Pa+<5Du9lQhsYbi?s8+tLkL^McYIA*AQ0lxtz z$1~b)tghhPJHoA;t_)aEM|3)vU|FIq*l;|KV*k^0oQ@_q{h}hn`pb5c!{2UvfiHi} zd2#PJ3E54DL_A$odY@Hb#2LXHX}M;H^?h87so@@I0YF^ZMe~`klMAb+#}3i>WTyF{ zb^gz3q6wDWe`%=FI-Iupoxj_H^4$1%3je255s4RRro?01A8dow-!TYYdkje*XsVe*jk@ z?HxQbyAC6`xL}YH_-*%Z$m!^5C^q+BhV9R?c%JdfKld*B+fRO&dy;R){Ua4OC<3&T zLjL2MED0FYC_6bBjsiXEU+P^7ff7p9BSYc==Gj=dL>#na4T_KMfqtG=I_=v8om<(+ zF)D@fXj@gdBHhLW+4P(mOhx}{MtxOZf}cAzzjq`o&cqKV;TYL}*!n#~K||ZyIEl&p z?)IjFupfO%4_Y_x7)x+}XaEamwY4WU67QsZAdGV)Y)D_?X)$+u#V~8W6-Xd86qETv zYXAUjP%!G!H{)+mJgIVwcsW`d2mtKNhxEh~9BVF~eoN z)8p$b@T>Ym9=$I9%LzA6B|Zn-9^vptrtgpAjcI&#m*Lm9J>?#_J>*>(3V)AvBs_bD z7~vN~MH*od|E>QD)~ z|Es^JiT~!ln!wm)K`7Vi5Ze6!8vtn@!%N9Z1K!6a?Hi?bn;=1FI*iPF1|3=j(F!StHT3_mu7B0BQZ3CusKjOuP%853A%A4CE4= zX;r|yii40@&qu42&Y8baCCLhGhj`Ag>IG$X{Shp*ko0eqxPl}T)qQX#9#;H}6t;=` zr?NiEuGxlVtAZ`kyeu_0B`q$gT^dgd6AErld=dWubYZd!ia$y}%qOjl2s z_xHM+^nkb1AdHId zdJ=G^Y(*NytblPC-t53n8T(5fut2gJt%Hv>0u&l9#!dOeB2uo@Q}do*#6yD9UBP94 zfx!-Q6<^w=?m_dg@26D_r?&pyWYI!B`iCCxC$eJ?y?9R=tB0w5$U_q+V*m3@K%6Tb zzEB0JbLqyO=Fbiw3t2$jJ{7%HvAcBA@EAA*G@~<2fjE=*{wtsiHZRcH_A~k)x)S-gC}82{G*f1@OCG% ziqv!SIy~drQn`;MQ-AyDZfSuzMiq!(KSNkQ6Ppvsa68ZqiCDn{^9Ou%JD#kUc z;P5@yZ}V4!BWh>y%u_T8iAc^`JT+vllL7tL7uuN3{6Sc5I_zmt!q*nwZ(7Tr<;P`7{bG zR57JUPC?=&5iCc}Hh)=S5KM9)-bn1ez>|+nO$u%(gQQ)EtCzB8E;g%V3@`og@AhFH z%=XG#g>T$5@UOGlkha}#ERKY{g8zq?`%ek)h*^Y6ORqZBGr^A*te%Sco>u0b))JN; z)?fh$@Cyj@@C)$>^6LmZk`NSS_Q0 diff --git a/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png b/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/074e27fd-1f15-4bfa-a7f0-b156311448c2.png deleted file mode 100644 index 51f62f9ce055e37baf5930048d34addd96e1aed1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6564 zcmd5>Wmw!?w+&JlV36Vzr-OZHaVy1PO3_lhxH}XmgLNow1qS!xHQb6@DNtIZxVzh6 z#o?y!_dWM{?vMND{<@Q7pUKJD$;rxD>+GFGYN{&};y=I#0Dus#qM!|yeE@(#1Hl3R zJ&wc30ShKe6>T*D@MQx4WC#FUf>p>(0Px}mfNe7XkVpdnDz~ggEh+E-j)khS0&w?t zdEZi!2msWna0OW%pXt3hgxmA8AYAmph_h;I1wHKrq!zCPp0&8lT7wsYE%zLvru}=$ z%Fj79+of*r=WT8E-V@2pz1`hscbnc4Q++jaaP~c?K2#lZh}l~VTvSJzS#aeqbNp65 zG&7?_&dJP^)wAmyn5szSDfBXsT5)_N@uYv`YWsCF0Tavrn_oVHOoDxsn#PG`ClQG2M+EmkkD`oUOwnRKsVIb?ZO9~`<_@0Wj zbgl-W3O{v7w}mVR`CAw~9tKCs8jw!T3WRNLZXyRaf)@^YUOl;i2DULu=MsZ!hgtlu za@LSGo$n+Q<)#zDwXKKIjup``gbU#mHW3{o%S2iU3FE4jTJ3Q}q5_w1s z#RPl@d3)Bwv}WCH7B3g@L*$sTgJsix*@(12zr|C_(2^7}deoxLv*sjmqPwBd-NbFC z^oJIj(C_ioOjTXC1^X_e(qthEu49CFj;>YQT^5!695{=ZqG14Xq(lSU{UBPzSml1q zW#@ePa9sLG7?2tKWvE}OTUbkI(!K> znsgF5onLYTuIEuvze-ohZfmpUJ&soUKG;wKUq1U|0B(Cn%m5MwNBg$8iP1TE zv)-4tK$`JG68o^3v2k#56LNForl$>snKYzY7=a;l-%N#JsgK=_i?J)hbgI|R^YA%Q zs*guxiKD~N?4@GX8+%f=M0m^E#>UF|;Y#Cr@=?9Vh_tsvHqh2qxJdar`1(aDVV zj&!d~zn;|Q!GW@@EXF&A#}XrVn?UP+9}tF-wkLL3h;5K!E|U33Ts-pR#M673ipCMO zO2Wg#<1n(VvEa7&Q6f*ewdNJJ#>9`w39*pd+rZt~hUcX`g^L`4SKSyuJEJLdf~CVu zv!$fFCj%y4=(RJB2iQ3~hxS=@dh7sld2(K11sWM<0@jxO2_#6jYE=}h`EZrL)u0-a zlYx@N2^jbJ+1sj|J4_V{AX9x}^v2b=z`qyjT+vy}f0*Avla{Saw)#m;4 zv0O{{^&E+v)jFrG4i6`k4_uU^*PG}R9UZv>-RcNjoec8EiKdy&tEXb#zQr6J9c_21 z@3N`x0If@X!DasfCQwt)pj+aen%v!$VHJiXNjp`8^nF+&?X#t0*(rxg%TnNr~# z#6GUi^41LmCs^!m>tOUu)1}7eykAh>PWQ5*>B{oAqN*x^NojWH-F|O`L1Nl7HgZbJ zPqmSAEvIUA zP&qfRIC)5_A*~9Eyp}li_u1b|8XPZF%#F>5`^81cS*2 z_X#yrNv)vU+*75(edT*o;9hTUZ}Ud~z(7ub;yY-UfAOzu07*c_`$4uM%{oM`_=BMW zBxru#gxj>0PFPsjftmradLL+yr4^+{!T2R$q`>gZ%xBu)F?7qL(ka$7d72QTdYA0} zGMc~4tm1yi$EP9s(ll!8=ceRJM#IXp=y@(t7mtCQ$I*<&FL9Wq1ck#SFIB#wm47zB zu%hNQZH=j_5&+s47vH;>80xE9c=j*3{k%v?NhzlD5h@8t8%6%KE_{kwf0KCyp&rN* z57y)eIaHT4x#8C!{C1$qeO`aOVaZVU`OEcm0w18?7Wf!=Ur-<~noXHAEQ|-Jh>MF` z`1?zJ!Wq7OX<}05r}gqBJw5@!@Yq;rSs5=m6_v6`fr6f1s)UAn^SV}yrO@>Bw5RP0 zoxoFTgYOx_j`^mN;mJA%TX(j8e65H|ea4XI$PZC3Gfz%W^C~Jx7z0ic3=@r;eeM&5 z%ZomdJczdB48aCQSJ-#G{eEs385-tim;$3$nWC;1-BA?V8NSEsYP}%qdxTov5)%{4 zLonc|_{7BE@p0X`%8jQgNoV%X&fU|sj;H0B^7=JgCuTNmIjt#?(_?!ia_;8*E9&y?wpE_JydX@-nlt z<7Q`Pe<&|kc6H_ZqRVx(JgPq(PiHXvcH@envw!2r-E4$JDSAXRb%daujskygC;6(l zn9Yl}kE#`Y569|0PjWmklI_zpSC(b_lnQ_CFql{x0@&HvA-Vg-UadoQ%ZwxI>go{w zsF0u_j4TN+{N&_h02vt>xm5x?H9^6^$pw`4^P50$qM19Mo={U)&#$b!kA;QhW0vw> zVH|oJNWdgZU+TM5pMC!Pw9qAI>ULaxXKybyLy5qaGZY(ug?BOgOXvEk|H~jHxwH>J ze%34hRQvSB3ksy$ox&EokfE`%Gq{E3+vxjf2C}tvkY5Wj8N$ z((T>3YvX~8;#3PWGp0|voP2!BMn;*w*o-7Zs)~yD9?;UR1R}MAznHWkTH_?Z zmFBNl(tFthNV1uN%-Ei|Yf@9+Z9lv7RcEKkb1&m2e@GG6>-TNPNy7_s0rs3>*l8}l zh?e;ew<>{w(!l%jaxj1}Fi3w8^ZmP$j;`+VY{RSSR)m+AFi2Y3GFg_u(B#so>C(A` z0;3=I!zAS1%c0!Ri?TX;dOg>(ZMRMJ?kg#{^z_+jbO${VTmkFwa_I96ELlJ~m(a9+ zRdS-Z;#davu7T60ZISigXi2<>>O z5!LBsU7d(nwt7-h(zlt#4|k;A*IbJgGRn z!JYH-tP9Uo)zE08YMt==p;U7!KYSiKQx{r|Id6ZB-X|8s?K@FZFjPA@&JbYgB5S0>}9mC zgOk&vj#lfDVgC-JdsRN|Z%Wt*vU9{HuKr&n@&^Nmd7r#5QqERrl9?KIqW zd#5)Qm->L9qMk}j=W+f(Nj4*LANi$+!4C?CA0Rj!TwGm4LnN7o(RT3N#jlXUmrdTx zBoLW~IC#W|fKDPt=`Vh}XIEoJ%@?Hiup{V6f%BE`%pp?RKiAXbXi=c_oF0Hv*Qu)^ z-I<3PDx$`Akl}E@>45EvRt;tlFzQve%TH9?MI3~5S?#*V$cuhNE43r zRsj{w@;GrJ5+5SD7tQ{Ha(gy#`(Yh|L%8QeSa#8)p)(*Q;$od?{Fxlhn6~ao`Iw~p zxhlp>XDuC_kd>ae&+;uZ-hqr8Pj2W%TmtV+@G@$b9CIH>Zv>XZYYHP~pnDx!8Og0p zO|+JlmSC_+O-n2P`gQ&K9LqbKQPBpQJ8nW}XA6OJw@r7(R&TpvO3r`%OHNHKRsz=I zym99KXQkduBy;%pIWL1@Tc%nm>}&27%uqYaUeNLNH#`QD*cYmHajtDwE3+6f(-r2y zcJ}sKT}MS-4HdkJ%<$*iQRR>EzNeG5DV?Uag{p2WbTs~;ay#A*cOZ+QB!2U@hDGms zim3bM8biyzK7hL#vG~&Eg=2zc&pX9z9vtKYd{!orOhU8gj>G)0g!RT{zM=iCr?2eK z@VKNWDdhS}C4E}iq&$k9ZYJh=v)|x?36W@d;D@kqO1)1)^~-{8@>wwW2MGfJ;7<=b zoL47^ijLMYGNPr3?=|dp65(oEs-QGb_ySL&*mW7eqMNgio6(ve0lw8bPM8U#FM2}@ zw$dfzVR+r$-P^TfXA{ZGGmI3=>3I}j8Zdc->-ck>iibB0)_@JTul=Clz_{4=;(OE;J6SUZCDf*b4 zf+DZ1OuglIS+_;ULH)UTHHPV9hoJg5Y)rF0X;Q|$<^*2xKFw>KWhO132;gH|)^@WJ z#Uj!cgL!2m-?xOk6<7NNvpI&?(<=M)N zv+dX>*v>GR-l@fs0kfq~!cn9QBGsrk<_4o_!l+}Pzhd%?jm*P|OstKod3b2g8=P!R z2zytI+Mq;L_+gp(tJsNZ=`2OTcv8?J+^US~Bz>WZ{KrMWldE09T0xgu!^)i) z0`^>@?aq9{Us6xPDFNkr7W+)i$huDpb7h>Ez~4Y^bhHp>wbrQKt=bmL=`n_W>7NhC z3YImBzt2U;GfejSs70 zg@N;u)U`6;T{c~^rA&>ewbc%o?}8^heS~EpB~o9Lq-oc6pNk_hM+40X1__k(^z>R2 zkwTfjeD+InnTe5Oh5|Q#pb^7g(UxRjCMWOhE#k}OjRhz@)w7tS`IhqTuCuonLPRG9 z%-$UR%|08~Q|hKD+zpunm2oW9NRWe%L{X9_M^ryoLT z;){ZrBfIvbLNs6dJZ_P`<#<3xyJV7BHob5_&CX@0Y42E%MKns{DZjr>} z&U%w~#U$KAxLTi)g$msz2t36MgT0%1XA!eEfC)hSB&u-e-Tay;Iama#-xbBmx4WqkS|<6&;>o1IBd2w%VDT}6bs&1f}ix@M!3`t& z&@$Lw2>=EE#saRu>^ z=?$f)NAp%UPU|Pa+<5Du9lQhsYbi?s8+tLkL^McYIA*AQ0lxtz z$1~b)tghhPJHoA;t_)aEM|3)vU|FIq*l;|KV*k^0oQ@_q{h}hn`pb5c!{2UvfiHi} zd2#PJ3E54DL_A$odY@Hb#2LXHX}M;H^?h87so@@I0YF^ZMe~`klMAb+#}3i>WTyF{ zb^gz3q6wDWe`%=FI-Iupoxj_H^4$1%3je255s4RRro?01A8dow-!TYYdkje*XsVe*jk@ z?HxQbyAC6`xL}YH_-*%Z$m!^5C^q+BhV9R?c%JdfKld*B+fRO&dy;R){Ua4OC<3&T zLjL2MED0FYC_6bBjsiXEU+P^7ff7p9BSYc==Gj=dL>#na4T_KMfqtG=I_=v8om<(+ zF)D@fXj@gdBHhLW+4P(mOhx}{MtxOZf}cAzzjq`o&cqKV;TYL}*!n#~K||ZyIEl&p z?)IjFupfO%4_Y_x7)x+}XaEamwY4WU67QsZAdGV)Y)D_?X)$+u#V~8W6-Xd86qETv zYXAUjP%!G!H{)+mJgIVwcsW`d2mtKNhxEh~9BVF~eoN z)8p$b@T>Ym9=$I9%LzA6B|Zn-9^vptrtgpAjcI&#m*Lm9J>?#_J>*>(3V)AvBs_bD z7~vN~MH*od|E>QD)~ z|Es^JiT~!ln!wm)K`7Vi5Ze6!8vtn@!%N9Z1K!6a?Hi?bn;=1FI*iPF1|3=j(F!StHT3_mu7B0BQZ3CusKjOuP%853A%A4CE4= zX;r|yii40@&qu42&Y8baCCLhGhj`Ag>IG$X{Shp*ko0eqxPl}T)qQX#9#;H}6t;=` zr?NiEuGxlVtAZ`kyeu_0B`q$gT^dgd6AErld=dWubYZd!ia$y}%qOjl2s z_xHM+^nkb1AdHId zdJ=G^Y(*NytblPC-t53n8T(5fut2gJt%Hv>0u&l9#!dOeB2uo@Q}do*#6yD9UBP94 zfx!-Q6<^w=?m_dg@26D_r?&pyWYI!B`iCCxC$eJ?y?9R=tB0w5$U_q+V*m3@K%6Tb zzEB0JbLqyO=Fbiw3t2$jJ{7%HvAcBA@EAA*G@~<2fjE=*{wtsiHZRcH_A~k)x)S-gC}82{G*f1@OCG% ziqv!SIy~drQn`;MQ-AyDZfSuzMiq!(KSNkQ6Ppvsa68ZqiCDn{^9Ou%JD#kUc z;P5@yZ}V4!BWh>y%u_T8iAc^`JT+vllL7tL7uuN3{6Sc5I_zmt!q*nwZ(7Tr<;P`7{bG zR57JUPC?=&5iCc}Hh)=S5KM9)-bn1ez>|+nO$u%(gQQ)EtCzB8E;g%V3@`og@AhFH z%=XG#g>T$5@UOGlkha}#ERKY{g8zq?`%ek)h*^Y6ORqZBGr^A*te%Sco>u0b))JN; z)?fh$@Cyj@@C)$>^6LmZk`NSS_Q0 diff --git a/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/ea93f36a-f600-49c5-852d-94e130eda274.png b/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/ea93f36a-f600-49c5-852d-94e130eda274.png new file mode 100644 index 0000000000000000000000000000000000000000..9dec60d31ea1620025de365a1641d5c3e376f82e GIT binary patch literal 5727 zcmcIIcQl;M*G~{cuTf)>2uYOH+b)7A5iKNo5V5)lR_|RBC6y?vx9Huf(V}-&T|{RQ z!YZqMoA>>l@0{Ns-=E(+_nA3oX70?rcW#@B*3nX>Bx5B50Dw|mP5CLlt;YZBq{R5z zkdf&bzTvb|d#VWlK6e2iC=38__^zN00Dyx5V9NpkWD)^@$t9&;7lI!keyO3V3|#&F z(wp)=0RZDub>)ZpUNbvrZx@EiRFb{lm|f{Gm5L79&^vqABrM_u=pEnRDgjyxOl#D8 z8dj$6XpuI&`PfoX{RMr&>x;_$qw10R*@51saym@E(K3}=IN{-Ym!+`w3hQ8^?ynCG zNrT^q?Mg3P3U8?%v$Nhx--R`U>>oeX9@?;5>q|Co2|!cQ(EfiGG)>zkv6S*3@j5u; z7Tf)tC#%M!SUQF+hc|uq#wDMI8#mEV91AG9)nC(!?tH0s_tTcmJsy=%LEek(6|!(< z`{~))cWQS+@Bm+s`$+2yoO5BY z+|7hKCVMN%_G3OK2%5FcA>BrXhk$F7_fL~($Xp`AT%4IIj^Gz%5xnHCX|}~L-XS5a2U&^K&r2= zzc^KH1*RYjR#2FjkxQcvXaPl7{`h^|zJ9>POmTAtvnCxrs@GR(GxQzAQE))0hDEK- zcc|UTd`ycu9AMV`(Et$+Ja@tKAg_}&L{Qry+PS>mtX2(pq=)yQmkd)<+xv5 zY%EogQ6=$+?YPI;O4|ATDThEWTI#E{`+YRjeA#ijH-Ns&j2kVdm7I84F8o%-UW$l0 zZHDLCxdv|hVQ*HH%+v|6cTqIu<&%!kBKd#cq1tpVXU z4y6QqC)Lh}M(Ox*cDxeKb5UN9SiDe~B&c7`BEJ0~;QXMLuaLYTWL(v~Ir+B2Wwt9X zEJb-;63GJpvprooET%bdO_+kv!CYkc2#X|*Y_FlE!4s&!8Ds&@Z=MvR%+TqMDYbg& zW~B{vD#`-o;&`93g{;-VMZW2q=X^Fay|_15eUgRO!{MrsfK$^xKZCmmALPH#aVBG$ zs=7z_W2zlL(w_~aC$&o0{D!-`TO6zne4jI{JuUQlwZnv0lKr0}<^)0CON~q#;;t$5 zvh5*AS5kW=d0 z7JDi$DJG`yIC}lEk=-OPjm(w*W+jJTVe?(O8z!1g#gzkW$iAvuchcJ+9}v&p>#DE# zARPO`2|DQntB-$ zc|l3g+FUzZdwWIv05J)Pu7N=$-dW&r*7;5P%XXV8SuQOov_WZvK;83aVM?q1_O~$g zfQSTHa#GUp%*@-PBad0D?pveB9PbP7Rz-jmE=RdBpGZxc{aCPAEHmrlf!7@D?Ceb# z98$8s$sg}U>Prf(QP}=2N=nL%=4KB3k#LAk0W>?0{nefs7%cbZia_9y&*dL%D^TN` zIVuJQOiDW<)4g#;Sh&yYl;%0s?Z&1577&g?JVF$w+k8xs>K52M#}hVF5uSs)gxNvkiQO^me(q6AN{xVX4sqt_dI<<<&4 z9%hQ~>W^TQPQ){&h$nXkvUJ9+63Bx;@oICk#w_6-XwAa$$#R^H#7nFs?Qa$!g!r)d zDni2?5#4aLOeg1>O$xYpS(z5wUk+kH)4`K%^5xg(8q?-1i@2b{?7nQ3*zW1x59J|E z_7nHnp*~_0N;ao;+IQ%_H{v5COBQI&Th=kV!$m6)slU{a+MgLJ-)=3ognZn6_^DvGv?vkbsW>8P;otC+XZ+7X+qjF_ZoM4HGZTlam{ zL=Ij|f2658dy4f7_Yo#S1-?>^WqSK8(&W9(`nzt4CwaU5v>Se-eT0S0&2sP=p-R=7 zqj6Z7s)|a5+~s(I9!sCc=xb@lW@!^xRu5N-?2{(ORh5hWOV!7e3gD3O)Bl5jbu^vzoTw-ji} zG%**^3-T+XR*S9S5(Q2RwhvtEnlMSEQ=H|D&WoS^R@Z$qXl$LF2I>k+OSQvGv$H#H zGT-Cz@%42ZjBmKQJQF1-W=)XLuiMB=^*SRz0Dysk0i(&%{QMsXs4r)j&eewsv{!$o z?-TfLSK{lJ^CHTR=R{|$gsKivY!Z%T#U3l&wAhQ8Y6rKfSBKuNL^z!N(cRM7Kr;FK z&qiG>nrnl2lbM*9s5v{s;c`zzMq}JXsnIl>t7^}m=7!kr|LGH&4X8oXSQKG@(%WKo zCdJJ*Hd3N_wfZZHt<0F}IP5jY%3gMoiAhRk6&F(i!)WxtXuGxZ5r5Mg&CidiU-I8< z-$gfYg(>hcD5|U9cwS-}P0y>fxc94_nVDHst+JY68jffz4Yv7Xk7Tf!i1<+*V*=+V4VdvftIWlsRb@T@Zaw z421ariwhif3uac*U8N8w*jE=*eJM4oXJ+Qa=6gBZSLp(WsR-9I0qNm(oSo1RMLfGKWghhr(xQOmQc(C95p!Aig3}FyiIg4$}0(Dt} z$Cph%(TW`H733A{61r7ol}2$^Zlg!1ee1C%$jNKXIjr3hUN3wgW`%6lI>4xTKf&;< z^IMa&{c>3&+iY?!Iq-R9A{Tv&Q<1cYVu1=6uHx99f0_RMI~hK})GXgFmaLpa!Bc}h z?j3&t<&MPscwe?=EEhl*Yf10&w+gbVCyPxY;TV)P$#zQ$dY z>tCN{wM`r9Qt<6|f6Ye*j8arh;IJ54s>lIy!i?t2+!R$Mf**gcGgDLfDx%FEmykiT zqKK=P6msT2Zo-IXd{dY&%C5^o7h(Cu;?)ywLr}>a^GlS;>*?H2tP#Oi#`O#;;(N&4 zF)zp0;`8TK=3lrWzz^RP)=|AyElDu`M!lxO8Kkf26p*?U!A%gXpprjO+VH%%Z3|?o zXJc61UkVf2;nIrLD~wTcs2k8p#vW1%Ds?P%zO(lA^;JoSn{{#;8s}%34(+DQsCnAtS(1cP>3$w!=wL%UGdp+F zp2tMfKQyYMLWCtoWx~?5MwZ2P$jvGL^;6B_?4e&}DeIxZM^cj!I2daDImJP7S9QkV zbG^XhhJ}Het!zQ{R`5c-DchE*IJR;~&Vj9vBQ-=um*S5=e|1Bj>%awPZ&x)GUXtYV zy`g6lwT_DWl`Ni?L>81xD2&K5pPLJCjdJLt2J(xG9~l|3$bhC}$#YoO+~Lb5Kh3jh zYngMDmgqIToXJh6L(~(`egCd`hIy41WOaFkG)m z4k?^s(e;%5KU2gT@$*n{5o12 zT#n-678i8v{J^06jtku)ON%W#gm%j!kl}=$=AOM$_vX)d4AMJ}{g`hwyH1>8xju1Y zV>JVflZ;n_lxL`k(Nc(`UFXh629lEQc23}v8vdpQ`EyUcU1Zqx@`FV9F5}>6mM~Ig zJog=+>b@goG`S2+8qMqq)gB*bY~_GRolz>ouBSMYc?a<-LT$9N|nRje( zsA{3JD4Z#)V}w2`?00j@C^2eDhC_bD$O<_g$Pp2Jz1$|~jq&K;U}aI;D07Z}wt59z z8(~aJI*vjS0B?tsU4EBfNYE%0sv;pbWscQ8nQ_T1tfjVf6Be)P#XWv?7Bdkae}Z1{ zBlt~HnBq(|lHD^iV;nth8&z+VAd6OT<&~Vw&hj-7seJH5!$ilqL{OfeE$l6v@FO3a zK_sif&$`2-o!L}pI%En4AHOwP0hVWCg@dVU1$4i4}u+ktPN&knib=k~-v;XlK2A2j7KbKGk??ela| zq+eadvs-7iM+T#Aj%&WoFV81m8!;o1aU)=nuonL7$cqWkvdt_Vuq9Pf#b$mr$HOMb}l zD;nW*6h{~Q;6M)M4t;%d=5udGCOJNBz9pr)!}*;=ki$PFf*`HlO(5-$TPnJG@ej^g4?~L2<9`I=BA6tm{TZZ8->Nev z&@});7Zq%Ny~~qLRGO@|ycmuUG>LB-c6N=LZ5Q@2nthMC>yxpwLNocAFDY1}9fHV^ zyYJ{sRsDp#N{w7%Ow$M{Jr0O?l##Z65B=lfpFifa`ew&2yKU{rdFXjacEW8f$=JCb z^454G75T=$%Nn#<7E3pd!npsdxTao_Xh^_Br3X31@b9fW?vD)JUs<|a%UHQu;~PK( zEFvxd#)FtXSXf3}Tt-Cr0T?U;1`{$YJ^C*Mr`NCSVBY^Xf~&gmDIS6Ee|K=VbFy}G bw{&v(zj1g>eetiv0HFRzOSweRBIJJnLh|MN literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy index d8a5fe83b6..eb43e5f7dd 100644 --- a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy +++ b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy @@ -2,10 +2,10 @@ "$GMSprite":"", "%Name":"spr_weapon_frcaxe", "bboxMode":0, - "bbox_bottom":247, - "bbox_left":31, - "bbox_right":116, - "bbox_top":89, + "bbox_bottom":220, + "bbox_left":0, + "bbox_right":83, + "bbox_top":67, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -16,14 +16,14 @@ ], "gridX":0, "gridY":0, - "height":281, + "height":231, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"074e27fd-1f15-4bfa-a7f0-b156311448c2","blendMode":0,"displayName":"default","isLocked":false,"name":"074e27fd-1f15-4bfa-a7f0-b156311448c2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"ea93f36a-f600-49c5-852d-94e130eda274","blendMode":0,"displayName":"default","isLocked":false,"name":"ea93f36a-f600-49c5-852d-94e130eda274","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_weapon_frcaxe", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"melee", "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", @@ -63,8 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":281.0, - "seqWidth":201.0, + "seqHeight":231.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, + "xorigin":7, "yorigin":0, }, "swatchColours":null, @@ -88,5 +88,5 @@ }, "type":0, "VTile":false, - "width":201, + "width":181, } \ No newline at end of file diff --git a/sprites/spr_weapon_mace_of_absolution/630e8d95-baaa-4950-8761-35b8ccf4848c.png b/sprites/spr_weapon_mace_of_absolution/630e8d95-baaa-4950-8761-35b8ccf4848c.png index 6d60690ea20ef51fb0fbffc2accc9bda77b28d8f..782831f20ccda9cb3f5a02154e108ab47bc3df04 100644 GIT binary patch literal 2488 zcmd5;c{Cf?9!||rW39Ggsj*br(j^nMhoqFMrBqQ{>_kZ$iqsNYtw9VeRo<~w5X-2o z6|t+58dXIlmLarii6E(wP*S{f{&?rScg~#m*E{Fkd(ZiP-}k%U`Q3l+@7{Db&Kdx~o&^9NCIbL_eCZ(r0C)fa0GM6? z0JH!Akhx#fe#?-b5c09QZVEX3K1;i*asdG0S_@NShsZxR=&;}!$5U@MtwQXy0u1z$ z#AMABn;Blp&y0Lu?5ResRH_^4s)#qkUTH?Dl}hF+7mpAA?pPXd3)GkzV2(ejw!S5% zA(sJ-$yLu?fggH$X(81fKLIP1@V;0J@C*Mhhpg7*j>yOD+0|&lpajH4;PKupGckgh zpRo2jIc}GL!P9UU$igD0zj1i1oS3SgEWhkLC*AM>W`{9e|1L}*F3wLibJ1CI^lm4w z$>pu6?Vag+6Fbb0K<6Nm8+^28%?mNdVz?ZH)=J>NM=9G&mBw|5;NT0zs3})nci?^1 zpeAQM+OwiX`EQse1u@%4CRph^bfobO1amj0WPh=$)^K)i6P>I&HI_~BA%H9vVr=+73YpVw4kt-*Esut$DEa#Tf|I}Yr%-tGsM zp$;%|ZDl!xu7}CTm?R_K$s`w<^~$Xi_hwC3jdONmSRnm#D@ATPu>HdY&O+zv+R$7T zvnz&Oz9F&v5hzYFEw0tcv5=P+A4`*AXBj#?VvJRom(7sYaP7UAwUU4URmW;TtRyxw&QlW>%1TO zDhbWhnm>TiGA2YkD~x{*45w`Va#MypJIm@`X5@etp$@{rqjG@n&~$>bW%A6>a^^>hn|GM!Nd9L|W79 zz&YIE@{9|fzj;h@eCE2ZsC^Y2vm@(o1{5N)X4wXLM?;{+^}{jY;Vqj&-BB6d z;ESrwBWl=Q618US++00rw%f}ICa5cpiGxZCQP5#{O4)kq%3RapLQU15nF(ZPq0zSX zM)d4zPvjS(UhL2kptwfV)gA9PX-Reg3Y~uv!gTmt9&xk8@Nx65aybT@KlHjW8OW^r zqK9ual|uDXFx6G#fjVw0r&vkWKwhTJ9yKD4!+8AWbI3%M2RI+QwQPNG5CJ4#!2%J? zUrV1V*s6@0xrk|>zFzGuLHMh29YYnE{0GURnNX~4SmgGNv6o*dI_=XSr;HiorWHEu zr>B&S>=M#1B-*8fz&dnBneF<5)R-`iXlrneEcFp&;h^pArV*4ya&I8>9)r@~R-XDM zR(7X`2&UBaFZeX&`EXQ2d*_s2SmHxavVJ7uLYhzijTY*MDg| z$yJj1`Fp%S?c&|tSL5TmH=?xkFNX`uRc@Z6f2U z)UvJGYXuQXnhRafUd=3%FF60dZ+|C~k%QS}_sp#}4x;YTDx$p~%#@S)uk`vu0~n0v zcX@2h(_;-4PRz|cVSV;Q*WPa4+!;0|Cg%Cp)|S#47&{s{275`D>>px+3s^`0`aFDH zJT#1Sehs>1?#Sn7FxQ+he%=@))Hf8#2f$^>W$jB4{?c-QXh1bIq1u`kAP^`7qME+j z_-_VuuwS5m)ZZKIsK#P^gWA6;U;@#|FpM|){@;59d%ecLpVH!*jcNT=uf%@>s`Qe& literal 2308 zcmb`Jdo8R8m5@q)TY5Gl&#IU%+|;ylySd?!Gsyx-OjbCh}uFj1|ipS znPG-eX-sq6O5-}HMp2VSVho8nqrKKy=bW|nTIY}RzJEO5^*-zQJkRs4_g(LM)y~#R zPIkX60044GYlMT?wgA8uDQPLO(uieui_Jk_YX=kn#2x{F&ZK8v%Dc8F{siw4m?;4-S)i2?U9@U6b7wQ+`+iHC1nCMXx}rmae&9i z2l8X8U#)XYCbOFs`}^lC#2NoD<8etaPt|LRk81sVba1Py6T~z3JM~n1`dO3;&szEt zT9YY-6J$Kj%7?QRJDzx?k*iAy0k9CE(@RzCA5*_xlc6LW!(QvIhj+DRTEK~~my7C! zD@&udiFdTyOa=0Yc=_oOa&?~qMUwaxwV#JeYwP2gDDR)Wr+=4kC9)+`TD7zv@tOSm z>ihh;a}8xfVR4;Dt1mn&m3^W!1@goWxooR1quC`jWcfHe+(G`FN9FBsL&SNuHVABE zrh@m`U2`X+QmMSeH~5mZ^!HSW@pu&aWW^`z7rW>WqJ@OQ@u-xxOW1vpz;sTKIj!-5(k;@k<(lZ8k0d&6W;_9N^5?&l8)n{Ku9k z7v*jsnoY=5Rb4Rk+q5sijN!c+pi2t6uYKFs(ztNI;A#*hwB7D|M9MUi#Ka%!rUxKg zEJNIrS;{g|$b#B(&$E-YW*u3p0}}nzHTKZ#fyo+&3f^M9#Oq-uTd}@H8VXz9hqpTKC@BTwj8-jBZ`Tjo4Ah zy@Iv$@?vOP%_EMAYxBX0)z*+I(;G?J#%SKmI*KD5^$$FCnTGF#1#&}Z5YJSaS}7?x zyv7TxPb?4o`X?+fz&(vyhizCwsRz3T_L$)5xYsO_!VIP^&blEl(_#p$w-%K&Sn!m3 z+ccLhjI?}&X)<2btLPaNP?eM)dOPna9FOWF?{TAI8t?PnhKHh$(k@;aCXV18DyQzL z6!yaHV7yq6kMm?U*@)f8xv@v%9%alOEr;Xi)y(+z0lOrd-|zIAjiZF#`HE>jcaK_I z9ip@{YCw2ko+9C)R>SHF{yK=^+0;6uk2#=+aV8YsoCdGJussPp`#T>(X=k5|ZY<`{ z;@qT2Nlcf;=I7&1Cb% zx>Ta2Z$B|ZyI?3n=R!ss1yk3_A94cOb~N>Ny(@#5clRpVOFNtt!kayk2PMHD^@YC( zc>5Dncgey%3*)LZ)Vc58l?(iOSS%Ks*1gkTG1xi>RW;DxALfpqo14S%+n z{f18~ZF{w|AfyVdJcW0U>Nvq1Z&Ap{HMvZ_{jD-`<1~ilhUVGoob9?PuH4epI&bJH zM~7g=i?Hs>A2!Yyc#_vkzn`_zYI!*+$#hvLoPJqmwZNaGwYIlk@9F9JeSynh)0n+} zioDFsuC6XaL&HpFHiXHcgipWi%D5a8V@M{BBCT_3VsG&HJM3t^x_YsR5g}Z-%%z3XuO_W8qrb=ElmQeo zq%=oO2e4S#Yvw{Ty2xfZP+1GYE%P0fcIAd*Rb~f8%4dY8sUtxI&`%kAZAsRb#mb6g zoeP%d$XeuTg0yVqwTpg$H~CN_FjC{CrJJD(h@wc$G`piNB{QK4HOsxVKNvNh-ZrrqVr;&m#%Hm znn`>T_X`S$`TGDv_-+Ytfabq4L_kZ$iqsNYtw9VeRo<~w5X-2o z6|t+58dXIlmLarii6E(wP*S{f{&?rScg~#m*E{Fkd(ZiP-}k%U`Q3l+@7{Db&Kdx~o&^9NCIbL_eCZ(r0C)fa0GM6? z0JH!Akhx#fe#?-b5c09QZVEX3K1;i*asdG0S_@NShsZxR=&;}!$5U@MtwQXy0u1z$ z#AMABn;Blp&y0Lu?5ResRH_^4s)#qkUTH?Dl}hF+7mpAA?pPXd3)GkzV2(ejw!S5% zA(sJ-$yLu?fggH$X(81fKLIP1@V;0J@C*Mhhpg7*j>yOD+0|&lpajH4;PKupGckgh zpRo2jIc}GL!P9UU$igD0zj1i1oS3SgEWhkLC*AM>W`{9e|1L}*F3wLibJ1CI^lm4w z$>pu6?Vag+6Fbb0K<6Nm8+^28%?mNdVz?ZH)=J>NM=9G&mBw|5;NT0zs3})nci?^1 zpeAQM+OwiX`EQse1u@%4CRph^bfobO1amj0WPh=$)^K)i6P>I&HI_~BA%H9vVr=+73YpVw4kt-*Esut$DEa#Tf|I}Yr%-tGsM zp$;%|ZDl!xu7}CTm?R_K$s`w<^~$Xi_hwC3jdONmSRnm#D@ATPu>HdY&O+zv+R$7T zvnz&Oz9F&v5hzYFEw0tcv5=P+A4`*AXBj#?VvJRom(7sYaP7UAwUU4URmW;TtRyxw&QlW>%1TO zDhbWhnm>TiGA2YkD~x{*45w`Va#MypJIm@`X5@etp$@{rqjG@n&~$>bW%A6>a^^>hn|GM!Nd9L|W79 zz&YIE@{9|fzj;h@eCE2ZsC^Y2vm@(o1{5N)X4wXLM?;{+^}{jY;Vqj&-BB6d z;ESrwBWl=Q618US++00rw%f}ICa5cpiGxZCQP5#{O4)kq%3RapLQU15nF(ZPq0zSX zM)d4zPvjS(UhL2kptwfV)gA9PX-Reg3Y~uv!gTmt9&xk8@Nx65aybT@KlHjW8OW^r zqK9ual|uDXFx6G#fjVw0r&vkWKwhTJ9yKD4!+8AWbI3%M2RI+QwQPNG5CJ4#!2%J? zUrV1V*s6@0xrk|>zFzGuLHMh29YYnE{0GURnNX~4SmgGNv6o*dI_=XSr;HiorWHEu zr>B&S>=M#1B-*8fz&dnBneF<5)R-`iXlrneEcFp&;h^pArV*4ya&I8>9)r@~R-XDM zR(7X`2&UBaFZeX&`EXQ2d*_s2SmHxavVJ7uLYhzijTY*MDg| z$yJj1`Fp%S?c&|tSL5TmH=?xkFNX`uRc@Z6f2U z)UvJGYXuQXnhRafUd=3%FF60dZ+|C~k%QS}_sp#}4x;YTDx$p~%#@S)uk`vu0~n0v zcX@2h(_;-4PRz|cVSV;Q*WPa4+!;0|Cg%Cp)|S#47&{s{275`D>>px+3s^`0`aFDH zJT#1Sehs>1?#Sn7FxQ+he%=@))Hf8#2f$^>W$jB4{?c-QXh1bIq1u`kAP^`7qME+j z_-_VuuwS5m)ZZKIsK#P^gWA6;U;@#|FpM|){@;59d%ecLpVH!*jcNT=uf%@>s`Qe& literal 0 HcmV?d00001 diff --git a/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png b/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png deleted file mode 100644 index 6d60690ea20ef51fb0fbffc2accc9bda77b28d8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2308 zcmb`Jdo8R8m5@q)TY5Gl&#IU%+|;ylySd?!Gsyx-OjbCh}uFj1|ipS znPG-eX-sq6O5-}HMp2VSVho8nqrKKy=bW|nTIY}RzJEO5^*-zQJkRs4_g(LM)y~#R zPIkX60044GYlMT?wgA8uDQPLO(uieui_Jk_YX=kn#2x{F&ZK8v%Dc8F{siw4m?;4-S)i2?U9@U6b7wQ+`+iHC1nCMXx}rmae&9i z2l8X8U#)XYCbOFs`}^lC#2NoD<8etaPt|LRk81sVba1Py6T~z3JM~n1`dO3;&szEt zT9YY-6J$Kj%7?QRJDzx?k*iAy0k9CE(@RzCA5*_xlc6LW!(QvIhj+DRTEK~~my7C! zD@&udiFdTyOa=0Yc=_oOa&?~qMUwaxwV#JeYwP2gDDR)Wr+=4kC9)+`TD7zv@tOSm z>ihh;a}8xfVR4;Dt1mn&m3^W!1@goWxooR1quC`jWcfHe+(G`FN9FBsL&SNuHVABE zrh@m`U2`X+QmMSeH~5mZ^!HSW@pu&aWW^`z7rW>WqJ@OQ@u-xxOW1vpz;sTKIj!-5(k;@k<(lZ8k0d&6W;_9N^5?&l8)n{Ku9k z7v*jsnoY=5Rb4Rk+q5sijN!c+pi2t6uYKFs(ztNI;A#*hwB7D|M9MUi#Ka%!rUxKg zEJNIrS;{g|$b#B(&$E-YW*u3p0}}nzHTKZ#fyo+&3f^M9#Oq-uTd}@H8VXz9hqpTKC@BTwj8-jBZ`Tjo4Ah zy@Iv$@?vOP%_EMAYxBX0)z*+I(;G?J#%SKmI*KD5^$$FCnTGF#1#&}Z5YJSaS}7?x zyv7TxPb?4o`X?+fz&(vyhizCwsRz3T_L$)5xYsO_!VIP^&blEl(_#p$w-%K&Sn!m3 z+ccLhjI?}&X)<2btLPaNP?eM)dOPna9FOWF?{TAI8t?PnhKHh$(k@;aCXV18DyQzL z6!yaHV7yq6kMm?U*@)f8xv@v%9%alOEr;Xi)y(+z0lOrd-|zIAjiZF#`HE>jcaK_I z9ip@{YCw2ko+9C)R>SHF{yK=^+0;6uk2#=+aV8YsoCdGJussPp`#T>(X=k5|ZY<`{ z;@qT2Nlcf;=I7&1Cb% zx>Ta2Z$B|ZyI?3n=R!ss1yk3_A94cOb~N>Ny(@#5clRpVOFNtt!kayk2PMHD^@YC( zc>5Dncgey%3*)LZ)Vc58l?(iOSS%Ks*1gkTG1xi>RW;DxALfpqo14S%+n z{f18~ZF{w|AfyVdJcW0U>Nvq1Z&Ap{HMvZ_{jD-`<1~ilhUVGoob9?PuH4epI&bJH zM~7g=i?Hs>A2!Yyc#_vkzn`_zYI!*+$#hvLoPJqmwZNaGwYIlk@9F9JeSynh)0n+} zioDFsuC6XaL&HpFHiXHcgipWi%D5a8V@M{BBCT_3VsG&HJM3t^x_YsR5g}Z-%%z3XuO_W8qrb=ElmQeo zq%=oO2e4S#Yvw{Ty2xfZP+1GYE%P0fcIAd*Rb~f8%4dY8sUtxI&`%kAZAsRb#mb6g zoeP%d$XeuTg0yVqwTpg$H~CN_FjC{CrJJD(h@wc$G`piNB{QK4HOsxVKNvNh-ZrrqVr;&m#%Hm znn`>T_X`S$`TGDv_-+Ytfabq4L Date: Sun, 4 May 2025 05:47:27 +0300 Subject: [PATCH 013/155] fix: Grav-Cannon sprite artifact (#798) --- .../cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png | Bin 11016 -> 11028 bytes .../1300598b-ffe2-4a1c-a7c8-7db8b3078acf.png | Bin 1072 -> 910 bytes .../234b02f3-1afc-4539-ad33-93955d6e0288.png | Bin 0 -> 10701 bytes .../4c68dd2d-a1e6-4382-b7bf-d242a78c6b49.png | Bin 10729 -> 0 bytes .../a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png | Bin 0 -> 641 bytes .../spr_weapon_grav_cannon.yy | 7 +++++-- 6 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/234b02f3-1afc-4539-ad33-93955d6e0288.png delete mode 100644 sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/4c68dd2d-a1e6-4382-b7bf-d242a78c6b49.png create mode 100644 sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png diff --git a/sprites/spr_weapon_grav_cannon/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png b/sprites/spr_weapon_grav_cannon/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png index 7718a4de25edc86befd6666e61b4adb97563e75e..bf51f1fbd175f8b875ba07b91fe653ce6ec4558d 100644 GIT binary patch literal 11028 zcmd6NWmHsA+x8IB$RH^wA*u8TNOz|wAe{qBgLHR;NSCxo42_g@OAAO04I>~RARt}u z=6Tlo*7|$uB+^eG~hcX6sx_bwuTKYjW}Jh4`4@CisC!LNWhO9z9a@ z?8o<@GAR*OClr648&*-Ml~KaiNS5uAc1cUs2kUXCSWt0XX>VKJm2d^nF*543@=CoP zmGM)7DVGYxCs5+n(VZM05AeIVxcp*5o%y^yBF}?Kg3qU*_rt3_k2YF1FaLHE4Ym2- zoNp@oBBF}7a{_g$BOX6~Ts6N74j)wQm{?}&@Ur*5DAGNyA0w{6oBfM5Z*B%Yy*B%r zGFK~R^Wy!?5$1Ufef`WImcyShZos23eXyUNt<7n<_=3|V!GKNTobekrn zq?lP+Vm*KUoRWs7@9$s7r9+BkI~hAWje1S+vH}rOjgK z>+9+y3&tg&m`Gu7T&X_|)^>KieX-QNHZv6^YuM~2Jz-&3Aej8mpD~U7&Y9G*gqRk& z=q|;-Cn?-p`tc(moW=_WMEUOByN;6AMJZROj69<^!kH?}0*~%)#`m}UuN7+WhE>5!a6=gUDu&JIU5gvdk5IOMicJ3BjLh-~fbEOui) zsTmj>$3;fsGA}eDp1oAXV>{Fsv~jkOZFrat(bw1K5fjUXm5*2kFWQIqqarBZ}#3d{Xin0&XdQ=p+Tgjr6B>EIsV!E-p5mK%%$K&uJlng z&`QBK8#g{ZdwcezWMp~8#W>~V<%0Omve6n!LPL%Iw|+Q5U@79{@!8l|Uv`2j`CEh@s6_#>DW$NlCj zWqNU1p}C!y;#-1%w3q$;{Z8wHWXKb6vAw-LOvHC~6M;t{d8=$`y=4nD8W-(jK72U* zhfA7JNE||Tiv8dgo730+J@LliGf}~9?}@@Sl8`PEb9zGunmu<%M`)bb1uLWjWW}!A z(c(eZ&n=f%rs#Nc`U5E%5W17oQ?@-)6iu1tq-Wb{bM3>Ne-7;n{fDW9vZR>w8BWZH z7!-w7qsPq;VrE}}+>E%vYCvG$(^y1Jl zf0L*2WR&!ImDHywb~0-Y2^dP{dh0v7f4#>}Vcf!6YxcBU1#o=LspiYyn6=?Hf1?%wHhPnuwQB1r-h%Y1`Fe=^&fzrnOu5Xj$y ze%ehRBTLnLk`Wt>3d~`JP^66D3d235*ixB4G}64NNo+&q;mPM_tJVyL%JTGU#qq%Bri7O zar0iXmQebN(Y6?I@lp|fQezn$8Zxcc0e8H5;PH7nAuiHzz>HK_SlF}{**Ke^rG-2J zcZ{m;r^!r}h1>Pn$`};?b`iSqM0A}+APB!J*baQKnBPo{<89B+|MLrq7s@Rv8Y@8; zAVJrGD5i?V@@vnzOq`#e2l%w=B9u4&u2Fet=NM*Oha;ggU?#&$720d2X#Fr9r|`1S zuEzkg_k(HvC($@dK|T2r%1Zv8rG{2C%4eHm&&3wmZaI5j;!-}_Xp0;3O2ag?HLgK@ z_WAZArOnoRO)MqnpVxC!0Fng-1(dY3{m9zt<>QskU??U%e}wt;+VSaWGzSMqT6%im z*d}UvV#@^}YM81R6y$B;O}on$`R}VCulEiAR+s8*C?G54tq!J_^AbpZbd??R%f4GG z@0s7`^OJewW38FfW9x|oRyS1Uhgbi+e6>$0@IqJInh#Fq9WZLUym#wndM++5LcZR? z^}~mq2dI8D2v_UB2bPwWD=tDjLPAu{A41QF@gUWOg`xVg{6b-Mv?${;sv#kJ%}^Jd zMYE5x;lxJ>w17?%a6q8mXLWr|shS28y8}k&YGWrmF5k+^%o!ha4iBqzoxEiI+-RpA zfeu;yJzfCDljNrSwe_aVf>f5+vR2S;GnO?Y9 zWuD2!(oo(~!}(~NJ6(m6l2U<^m+P8y@qW+X?Qeh4C|X}g*~MO$Zl5ipMEra}9Rk^JzxC@nQEA{= z^1r=Kek#Y$BQRN7>LQFN-B_E}NvdCy`ggSfZr7Te0PEm*#<&}G(6RpBB5Q`^_CDoc z;BQ`NmYtuhboD+6Fnjln^$Z6yn`+EjAO?10<3wy*w|Z1 zGFE>S7!y4;kZN{XZu1rCKyFPIy{V^6#)`y;*b+-lW!9B)Kud zT@rMwVH%u`!qV2nZ$oSN8U%C|SIxx>gN8fsifUpew$0iQS;#MAQ!r*}MGvJcX|Glq ztl+>RV@0!`Cg)A~GRPPbadUoWD8*t47tXAgwLQVRt@XKJZPuCM;eB4*6BxVj6NsOGGpMRhg=R~hw zb-W*r@t?so%*ski;(g=f3Rq8k3a%RN$hLtV!*9vBgigKcDs?a zZ)HvFb3H_avhIU1Z6D(Dzg*ZkE}e#Pz9Z`S6R`AYYj@Xh!A5Ob%>2p6udDU9mi7&O zkatInatbtb>%Rbm3aYE)Z@a6Ykr2nLGbb7< zu7`_@i#2~ECs2jAdbZwI^_rJShw&40b9jXcQ%WsIqrxT9Fji5MgUu|m&)Tn^Pi!Bt z$fZ>B-l`xyT90+%Acda7^IrX&xFI8KAYe>X1OeWb3gZ$4kc1|72$a6jU>v@&YkI)DCuk_q}$)iKD z8I{8NQ3DQ54}ayZ{r*9JBYI<~=lWHLeSxX-#Ix1Nqt)nU(XzI4)$!Me zSIyD+wI8xQ_kmx#xPK^fR3jtK**JD}B^5)i;k}T)0A=x!r75SaqK-H*NYsmw*!7>3 zf#TvAu2JkmHG>qdc&zL6ZrB;4^9H5(?h_EOZWIaefH^rZgJq5Y_VrM|MuD+QycQz) z3Nbe^fery`L-8nb?D>?RTdP;m2pnxmv zU*U##13oD>F} z6b&&BE%A~`d8ChoTyV&v?*-8T`X9qZKjNhaq(eqV2FU#o3L_6RZG@I~vPFFB=TMM- zo^|93SLP;mawRza2hqm4`T6MU>+5G=AvkUSe2VmoSJfC)e#+@Y_MUz;XE;Ytcy91(Z2dc{Ws<{U%FD@KH9(Db8`m( zVSw~$0`t$oiWpSFMkgX5$gQg*%V%Y-`v}BTR#ujeH;iI9oiL~aD1Lb_j2uMuC_Duj!zw*?F6T%mKGLbYHDCc{cpRD zJwycjt^__j5)2w0RYM-vef??z7%<>33sHUg3emk?r`KSTF(Fqsr|s&EGw*n#08tI0 zO|7UcGST_vDvmiUN3U=?%(dV;kP@O?BaTW$XvcJ#KtX=I{_1l;4)dd?bGJ(yv3w-p z2q{v}k$e4`q-&LX!TyC>j@SsI_LVYKq|A@S#S#3bx;icXFg}vh$SG@Cd3kKWZ2k@z z-#h^5N5N$z^VOdBz5m&nPg-C6Z=>LG)AO$3Oa_$1Q8~%F7A!S-Z@t8Fe)1>ZoNhM&I!s9)wTuJwnZA z$hg66AL3(9MFE9oZPYzGI5-Hehy~LmQ=p-MF{~7dBf;DU6b2zR|KAR+iIXB;VvxV(^Kdyl>kaGBfdB zdivA)nWguauX;e~VjE{?YVACU#{ojq@$9cD((U9N(2f3VQE!jAh9xijy1Kf*m)BJQ za7N-w%ir>6db*x~aZ(HyI)kx62!OlK3gH1IAHo_{g|w~l(V_mh&Q%vvruvBXnthYj zx#Z@60=1gGFSz0C!@o||zUH!E1fPv8VCF%O(0a|r#s;{#XB<$yy>D}TvFJ{?9Tpnn z9pYr3v|wu?rq(*KX+vgqdMgZ@&qAi>=Jb|MqLbeo*3;M+*KC)4&Dc5ix?5>`>f2je zlIG?NpbRu5R4>aVwJLKkkd%IHc%!mer6!k>=zFBZygB+W&?xGd>B!YEC|4v=E}NM_ zvh-DqQRN%$>u8xL3;7_5g+?c7%g0EujU|)rdAI$gSdicN6r8zVzF>*v#OV*{Jbc=4 zsdJe?sB1ptUhM+%8Wdu%`~=?r!U>qA3x3D@OyA5NXaVojy>%-pDyp+b;#;%xpGr$q z2$bo+vyYDW)E!ja)1>g_52s^n{c^T5lw@G(!g9o(n+R94q@ErH17zDXpd7yy( zN9fUgo$_f+w(|w&v4g^uSFxhUUacZ3{Y$Oh=MlN0-X|S!SSK6?(k8#P^)Vm;oT>PP zgoIadzkcLNdjKh}VQ3f&90_SCri!{c>gxRHoxT0WUXsO>r6xGl^xEqjrt!jI3A4&& zvNWkeaq9xcWPA#uL9Y$MH0v^d%me_;peli zb%o*=S5$;8?}sC8wQZF@#Kj$zGSvEsii+Z31p_WDVQBbx*z!3rGr%iIPnIKPkkK91 zb!$K(c>u)%e=+m(XHU8F96t)y@s2mYu~ER38lpR#UD(E4xHCk$RhD+X5J%OEGdx|H zp8SZK8rTy31#x1}^uMWI(8S8Ex;3vJojY!8ZVO89w_S2VOg2ZeaP0;T4xD1*;!q&I zJ5T7>FGk3BZG1cs6A&t%o`Rs504i}$gLE8;#04x95Scqf3Zl!+%M0A($nt!$+iN)L zCzm)7((Jy^Y>UC@#7y2qG6;tik}@>6sSrn*MOW3xzHyel9!*8k%LfMs-}!I({zC2d-H470P@4Rivh! zom}CL0z=I%#fF%1NwUAXe8pDf&pu}S&jm$AES^n$i!&$q63ElQgWHI8E@>JYev823 zDcGTYNoi@2QKdYvcG8lQP7IVb+3ph(=9QM>0js4-uiW6HlDRIhQO3cOk^faC*Xr`f zMoWv#mYp>$ezGw~jbhzxY8N(Vj7M6#8LKC)5oHgSENkzp-TXw4!1X`N2DK8%%a8g#z z4p1WO-T?71B_+JQg(4Fyu5%{o?V%4>ec6jBDDtCf&`r=v)=P!;5ueepuIm2NOO3 z?*hp*H$QL6P5EPb8p}#QL06K_5}AgN@iAH>iZu!tpTVGF(LqhnEXU{Phl&)AkB{>T z3NR#w--mUZYHHrCyiSnm<>efO$?Tk*a=?oiS`Pw*8$^Dxw}_uJhK-mS6plNb3#^4| z1EGp{@h^z@UwToNgVzvhYx43Ic6<5Yy$+^sxf!YZ-U4pXsR6mQFM5+T{~kX3n&vgxK6?J3zQK>Wt! z;Y`YVt{f?NaLZQmNtk7#pV(=#BF#auMoj)!=MdMJs(L+8NkJjJs}&(q^!7}^xO?{O z*^kM|L=6nXNWd6oZTSg^h%g|);NiEM!>pXiOio?^b5CI>D;qkjbaHYcRWz9gxCW!wTc32iuQBwnj*>Q(5R*skeOG8gDYGUG5OiYZ)?alRq z5-{DICHpSvQ0>b7E!je@c)Pp1p#C^EFD?vL(`bPCC})HK7aa~~vaz;?Yu7Y3rs)sd z-1vQMXuyb&<@-+kOpl$6ZYYhgloSOPl+(!{-A7_Rl*YctWYZOf(Q9jF052Ix@l4@x zOyKJXc%QJ}rxA&uF!mwF3PuB?0cZ=*My!ig4EQ7rKkiyf?WMO?e zCnhJCRa9))4MauZ$vh#pXVMirFZ;sDDi{G1!jK8xnuKS#@k|yeqt3ZckY72;&E0@B za24KpvQ`YFynFklVNz0(N&kn(0&agO1JdH+byG~ZBgV%yJ_$NwfsAq#%F=0e-C{AV9EWip$DC1($vMmL;f@ zt|7rT2Jtfs8Y#1Kdg=6MmWSry2SUo(+P6dwJF04G`3(&edgbI`c7N~ff#7vUwQIh7 z39A%xx%g)Vu(SY}|0opdh)aNs^FK*rbVKX;3_pyH5s$lHT$V3V!=SW6(@cpaB+Ew){|o7cQo?iZaP3yfF>DHTpZEB)qcJ~{b#v7hs&?qOQvv@ zvaq#i0{YO_f*x2y(Y@#Z|MeT}0aJ_>jz*O;MxUgVB*X1`fTEn3m^i=3tDQDdk<$Ar zFpclGwlrPlG>kHQZs{u`w}V#-u7|Q2pXJJb)mI zUHz5*Gg}=@G|}dS!s54IhydLfNkGdGm2F)ad^Rt&wZj|*hKJvmRb&8X`Mtdz)Q^hSRkZpurBV)GBP&XmtT+UZSLbRT z_)vrOfTI(3{Ha-zJg-@KsQbI8fIFxPd}`67!|PzW+#p(xd|~RW|_zL!V&%o zy4as6vCvbQkbS=D@|;_NX&#?#;KQjt>qX=|c-`IIYl-S&xWSzPEIB?8Xnp??Lvm|s z9xyO4C`>hV&smL(j0~GGljJwL?;Fv`1vkk9e6R94w$>GnZ26|jyf%G&p3sS$ZctQX? zfX9!M%Tm+6|ulVHs}` ztoJgMlx?OVn zF0QVf_6`S3{InzgFKjmCUG^nI94``jUyg(yC*Z_8NckO(T=KCseNK7p zV0}LV1{Zt-}pVtrYH^a!<=*I<;4XzH+RRTpqrc9 zT|1vS5f?BlK;1+#JbZ{se{$&pFKqKoP2e^FB>~`e7-uY?4&c;8$)dRV+cXQdkrXD( zK`QG7p9rH0byQW|ZEKthYmI`cez$kSE~&8~5kQaw74_Gv_4n3R=h2vW+}4&AfZDL| zA(K^#%#4gP)@%=KaS{d_2Ut6!z7}4DuIh$*S!Lzs)a&-;vFWSt^)dMBF(vFu%mop! z#fqQVqw3j;{jg0<8bR&Xe1cgjtr2#1cDM);!7R158fd1+@Y?Jr0Vnjgqn{)N9;I0H zgnYkB$mF+^0wM%BFphVQOd-75OGe{Y@DFFweAof%F~z0#H=F3iqC@2jqS}uKm73AL zeY81S&`y=nWFuCo`&{SeH6~5Ea-dUp4_s<3x&p9vqryL+K+)m&m~m6LaAXk-n@qjt zUynTgv;-CqkTnZjPwNtZ!U641K>K%jD>P3(e&s0m+1pOJoEU%JesfjkTe@X_H1t|) zti6=eGCLxih&Bwg`MXzFo*a3#{yq1(0wOA>Y!0Z0mqteSznN z0;9m%5pDIob$~dgoOcF>PZD%nHwl8JbC6X~n@!{D}E;=Add z3tx3i3*T?hVQ+c-Lbw(~t%$_FLD+4j%v=l@7od+1R5t>FKQ%S=W6LG&)2CmkmxTqk zU~kD?hXH6wP(nY6`x||es@eAY-I6fh&CV`cq>x?V>%?hS!bPVZ5q|%1S2vOPaFMKH zs)6}3NOd1E+PICWrKQoL7m6Gu{is!CO!#){Cyt>Q`QJs&v{QP0=i7mynVlx%_tw^UlarJGsS5J)NTu)R z?8>fDJpM#SuhQkU#P>_v8VR7MyYqMQ%{>1LNx?twE3urheu^eEGafrk$(5rAg?@_6 zJz!sqciy0e0qlUunV$6KDBl{d)v*`&fHA#kYQ?|{?*~RuS#VKpZDNsYlL4;Zz&-Zv zLI-0Wg@|aWyvv87&YPp1JI8B4xqvJeiKup|&O93%FjDeU+>#PBG&EGaP8cG8u$Hg! zJCwabzu`V;`lsBO?%mtiPtgj;4W(zT7#>5%oQ#(uimc6K&4!IN8n;2W|_K41%x zI(Z&NB=Q$RWN%<#5W|w~5mbkIsjoluRvmb25w*dw>1Usp3v)m%r8qd=nL%T`VA8Ei zp*vK}yFo+)ZW#)w8@O+pWYj;fv zG0}YlvPLXXJ3{1+NaAO*%|9tVVyu00-ErKR<^aOrPIirC@HM(@J!reRu%S6t1v@qV zyQAlh*@0a>AOf@=De;=7u!(z)N%aq7<(6*XtAdsVlgI3?lF*@OsVjF1@D$@RUpSb7 zURjIR;KBo1zcYG>$$Y(?h>SlgY1fP89`aAXIU5~N!a_$oyY_3j*hYlv*@p~1?Fm=H zG+Vt12Rf#QME!4`HMj?`YY4o)sW4DIXbN+rUIA_UHK!*4d?> z`T0*oz;=|iZ-%1T69jg?J_R+6_V!F3(gEo8IeJmv%Lqc86>Xj+E>Jy_C+-3V7Tc!z zhbNMsKfk2qbOLvG_HS}F=ty1kn6x3t|9Zzbak1d61A}N~x?F#@#sVLh2Xs+S8p_xu zs*$!SS{h*MO5G3hm$>K>tJ<$a)y1zheKykHI^N#+UTvxSqeFMTB7sEz^yDj|MwH@E8?8M39SEb1Q#ni3uhNo ZJIDY19Kq&_3UCfYQC3Z+LdqoQe*ix4>ZJex literal 11016 zcmd6NWmHsQyY`SGAPkbyBHazrjkKh64Ba6h-AH%0lt@d1bPPyKODNqa(hcX~{l0b9 zIzP_;v)IhcnwdR&KX+c&bw3erm1Uoy6Qe^QkY{plq}0IkI{4o~Lj{jya_Vv5iPH3q zni2%!MGJuhgg_wI;H`ii2*iyY0@*W$Km^hu5JIQyZ>mDz15}uTtQ6$o@$XZ6NfHFY za3d!ruHmupC&$(aZ*G43LAbExrL{w5LLZ#AA0Zkej5#*PgQ?2Lsa>-*rA*1ZiE+^H zEff(M4LLEC#g*czLHsiW5=>sA#itZ%gK5(aGkS+l()c!&{s`<7ZPUbsIljl2wa4y)FA}@%d(C_b=Do;db^(_6cbKC0fw`sY9CzEy@=WIU%6= zCtW;}^o+_p%;=do^~=-%^3b(Kj!~Eqt~k{BO*C@;^Z)-4l1U%fzjiB5#vh^!ee&dq zs-a=*tmh7C#*;|DL~0oc9w{oE>Dk$yO_%OX7lb1cL%e0{RqK%Jql zk3$!t-)~%pXlQyDO5y0~>KgNA9gXrWckQ2z?RQfppo!d_szU;PIfTvI$tWmbDCY_> zNT57y7vu%VLj?r|^Czr;vkr3FL*~glVq>u?j5-b5-2Y@k7&|4PSy@>o4Z0?E^Z($4 zMk~{$>XUaBcH70o^Gi$7vgDq~B6-+;oq1&5st+o)(RC`8NrT8?z1{GV85?uhv=#S1 zuXZ9LA~8qD>d6?1o{@w%)IpJv=*_tAlor?`iN&EmA82H#aKLBU zm0F65ip=h+^hTGQl6H1>A-^03Ha3b1%r$D`iDOWMgM+Oc9m6K9LME)FWM!WWb7gVj zzkkz;hx6gj0!kDdv3w>ni_dZG_UdGJNOFX}5$`4giXcWMZa`P@BcR@cxZOl+t|q4_OAznh>Q##i1fsmGXtcbn_IKT5$yAM7(XXx zkY1C+>PQCHWPRE03{yY_xzu8lqb&9Fz=3se=+r00NKrNW-3dH&_};j;-JLH+&HCwA zsaR01Zc)5=F?bzDMn-1k;Gk@`ZlCiexRi)JaFBt_!X9wP@nM}j; zoGu9NuCB%|E}Ztdt-oT+${0O_$X&rZW@gB*UcK7c+3EWCj~!M+B&E7>$eM;BEG%4W zU!#o)VHXfUhj`pyZC`b~GxVfkm2y{4E1*|6%04mwyZY+<>@2^c0@K{w9Q?v}z4T$- zXf;lqe&3sOaVRocP**5Pj0^%KCnqPe6GWTG>4aXVQe;pXD0FAY9Aw10xeYHhZVOIKdF;I z4rHw-Syzd6cQ=^StEpch$7^-p7M<2#_>ZgQ2VR<*Q#h ztQ}ISTYWIyLd5~rH6^2w_rKdb-}jrntI{82Y<1#~HfB%f<}WHMlUGfT7|oMPZ6_+6 zpg#;Zp+-+?*lo0%4;oHmTlZeRA&0CK#)%BwG>>GW2SJAw;uSHYUVdkeGkEt7tk~nI zpa8A5eK*Q&Y&Rr*yrt-Q;i-Au{E8DlI|oOC6-yGTAG0?{KdgqDgRvMPpthFN0Vf0c zzOsP!bDHj8@yB}k)TV!tRwi6I!KbSU&+^~W7Zdr4P_!AcaT7nwR;DW}F9&I!KV!3c zRcYb8#FL52$!M)W(M|ND&9Qv z%Ba>wrewC{pdyIswrTiWAFUWNc{j-m6A6NKniOOU$67Gx%9avUa}O-%d62PBkNH~o z)XLr)MCKE)PmlQKWuLJ>{dU=*(V28SnCsznlDgr`EV_GTA<0kLe|gDIOGoE?Zg=Z1 z?6d+w77xc>OKWc=9K{;g!YeJmHs?H|M8=I7NeQt}u} zPOZN@_A8qLbXME1_sU`F>gs9>AO>n`I7mhPNFh#_|4cyj=g(1&j*A-@Hx;=Lc`jz> z=(w$w5EEmqx& ze)*Tlv8>KJpToqa$bh9u_LqnO#_@Xe-JjZo@!`tj=i4?f)Dxn_g8y?moW8+B?7ED8 z@giqAC#B)cg(ju9^UFwB`KxiEVlpZ<4x7`ijb+N4s(OP+XSdswbP*B`3wgGNXt#n6aI#5|dX%D~J zxf6RyihcgA3tYm*e6Kbq?K`g zxWCia&yZQBzJ8H`R%}0@SYXzfF}KHH+TpGF9?!gh=y0heI3WSY=g^%K43RSL2N#R^TrS@y$9(Q>KmgrbFs??qJ2cKdW($oS+3z9U%2 zuNbp`7afoY&|ITA_AhD^#<7^$8s^+$?APes{@JF@PIpE&0ozDy5Wl zUwd|$3+umWAJ|w{?VdD5m%e?TtF|3)SRK}Fyt12?MCAN;>Gk}FQuC4i@$_NRK9mo8 z7>K-inIuTMS5nTkIoH(p9anfxGy`Q{Pq+L|M)?r>1`_rTx`MOBoD_3K2oP@{*k0%L z)s(6^Gi)YB!al5g6`PAFdTywvM-odR%8Gcj>Vy@Bgc=-JVx$GLv$Bf!jf2D5BICmo z`Mtfp^XK+)ON3a)G`vwTXh^JKjAJH6o}UF9pQ~|j+Om8M%+Na;Kj`khG>dZ)$x<1; zlhH!1^Q75Is{P(0MmZXirO#3bmNIJ5`@7xS`TRf!C!K^oH(a?SxOWwzClmAx@4~CS ztRebj0f|HK6Q3h0Dk{NwwtB;OIvTZoGfQXgVkHM;fht1PG~Ijo*mlJQE1$ZU?}L1| z*^n$$?Ov;~J-~;krAoedYWJg+M6C=$hYQ5A&#R!}x1W+rGE331f=6kl2DX{NaQYzj|xh70#)SX^5Q zmZk&CnQ#-=z~JZ=hV8n%EkCWe3rb34d0WyeSJ#d_JpM6SJ2B2gB+PV6tMenp&>s!Hg3~!93WLne@=|68+=3*nKjx#$U@w;BoAW*PWbXEK@`dp zZ1Rm|+~s0T+47kogXea6bNiul`j!ie|Gz;_~FZb2&j4g3v?x*R~>0p}Xoj34N;~EoKTF{OcRcoine$ zso!bBof)U8WpLv4`uFFmOAe&u=5`VL2+L{~|LBK{Hqnw(@C?ys)h81i6Yl$als_e$n^EZPQdT6aQgU&cm12`#MrDEEtjm*@OBh@0K^h2}b)=Q2p$HwZiZ_478_po!qp3X%GuUw(MjnwV? zE-T8;!OP2g?8R>jts9^GP@G%w`?ulmE#xh!9@KLzZ0y3yN+n(+R^k{JjG?mH$-pk) zA^@lZ=pz|eiheoBs;FQu=MJH~-}sJm-wLq%46~`yMs&ai&Fb?D%NU!!@BOT`Ha7Hl zJxv{FEUbNYzZ-N}L>_M6L*64MHEwFZ^9J>6#Dc4Ooom%gi2M;f$i|Y2tEj{s+%7CG zasVCzYJh_@E=$pj&F0Ph)wn+*#P8u|na;qLnV{D+PPpGct+cMhOnb#m6nRAE<#*Td z@nz4!)DVRl(f#0Zt>|uJ=vKhqp=Fzhk22XRUbGu6^NPZs-k_JGrc!Q0W;V4(>TM;_{@xxsalZv` zmU-2)y7_2rW>o6{ol+>m_dcQssjm*d1jw7^7w(g{%FSM8kZkTu6hbJoXdivy`r*T{ zK(IV*zcTGsAs^4or_*^5+NB?{Qh&(*u)!((m$iKRv6a`$+gttF&{$@U;0J(Bk9bL; zP4OU){JM~rDa*%r`S?sdJc!sjE~x-}X~7o+07Mti?iy{UKMOp+O?sE;)Krxf6<3PW z40}KxI^ExTW|-SKIP|ZqP=W9dA%NMx)ZEN|t#8ND^C2VZtj{PstM!K|-tmq8 z5RWr_H>CZ0Ev~E*3>jMec@}6IyROIN6WYulRYdRb#BMDNJN<;0$zx) znZoWE5T#pYgWYgOCk}!A2r*HC zSn*?OD)^ObEF>J86MVgvW((l`^Mm=`DQ-T#lh=NeHBFwH>KQ}?lJT!ev#xA#O)$Q& zUfN-azwuO#*iK`)8o7KcVGqLty|E7fw2TImF<(gSj1g`E)=xKn(y#M&a#}7o=YM<{ znq5s*+6~#Tr)n(6$wjEFF8=;v&rk#hxa`i}UJyV6! z7;D9g>3dWZ7Jd6h%$laq2urRX{f^Ab!xI`2@pN7!MkW~eL;_D*zu5`l?CcD59RU3! z?FR=36*w$#&@2cJ>u&eHF!LMS+Oqg*$4koZ1gY-0E<0G$ z)zfQn8~bUYj|dn>a#|XlJrZTqeBICOB3Hk8svLav?`L0Bqr2?xGIa*Q)ipFVR{=9m zWBEnPJep+JgezVCv;X3^6N5K?xR* zj)}(4F1gK;;riM@P2v!)0u7=#QnPk(1Ohp@j1_R&&w9L9?D;tsjya z5fb@vF_xa1b7o9NCIB;`nIB1O&li+m75HrrAH){|&w(2|nqZ0u%1%%3>gz)WIi+f3 z#72@)$Q>zLII;4s^BUjpYS;)7(v;Zb@T*7gur2u8Hvx@z?|QAc*Y59bd_KJ{tg6BS z0CHw##;3oj+qi3b8V@YO6YU0orf!QmnzLqk(dB06SGoSMYJGu(vdYmfuH-MI8aI2E zwuc2bmbnrfuZIQKl2AA&mY4Is>El+}4x@D48WU8H?R}ct zpO~0Hu%IaxPMf@nEG#ViQeG};ZcYQR5n<7!_AKyaePiP>&g%+QHnIU-APuzs!V2yV z0RCeYXg9=88x95cf9WGaz8<182vWGCLuAKQ093ug($a_~n)$MKle{+KGt;32X0Zd; ze;w5hxvG#cnF6~8>U8!Y!?Pov1c~Hg{Y3IDhH1{`LdI#kCRgYF55*f#jvg57tIIOs z^ql*>1&%d1M<9~gSO%AnDr9+xV+sliBzRM~CuSfcE$kqAfTrkld+AJ`>g(hL4Wj&1 zULF-y4}9Fv(7;X{lb)NKdRFAH*!ZkQTaorn*67F5QieuDLCB}lQaN6z$!pB8sU67h z1!sxLVJ35rH(sKjZE7L2=>1`fQQEHF5n;RtwHf0yvy4@P?xVBJI88t_0eOL)2y^G) zAf%pUu!0iWWH%Cu@EuMsjVGNx`WWBHhzJD61V~6oK9SR)5`SxLMd)L(1S+hO(lfvm zL8k%5c}jQi_}HZn#?h?L`e-^gH)TGgd?DjMF`>cuuKvT4Ao|m|h<*NU zrHZ-o;e*2J9L+`zTCFae{&8W-B}rkt#_egKAb<*xs3QkyYns_~StabeL_rJ`TX-E8 z!6lr&A997RGaz4(a_ZH-B%e9DMa`sRWRy24FAoQa>EJ*UMJpq25LJvguTvdbAKg;K zw(+fY@D&bEq-wHz?AKVFSuL)tQTD7+e%BqSL_V}Bal#6Zhlgk9@Nm2=uu2M`kOOzY zM-mPJvdhn}CP;0Dj>=jti;edB_27G)Ot0D5AvwxnK=$S41!Hjtw9z|I5;m}Y~MWxrK!DXK)3J%3Y1u|g7(2zVxU6bVw-z9mhXV09)X|E}9 zI~4}nas}Mbfj7P`{sE<6X{d%=wPb3rk{SZy(9)cSgqYY&tG2BzTW=63cEG?0;j%pR z#Ejswl*8#5Wq9k?XZw$2id4WA&B*VHMyuK|2KZ!TWP}nA-NeogbA5fC-}{^yG`s*p zBOe@~8i1=2k&}PaD&G{YD)mVmA?sO7qpf-~Gdl(*ewVBGsEy*mP8T!c0 z2fwyYUP94UHU^V~lKUTvkc`Y%V9x33=}+zLIeM~b!zikFCyj}qmx?hHNP<{=M7oE+ zg-M0IlJ&-ebkHtj$YF$%87Pz=YgP2Dybd2&l~sK%^R`4p&qM=vNsh+-uh_1(OL;jY zN~Vr@Fmrv+bwFYOsTiak2B`U)o0~q=(OTu9Q@bHr<f}8@$^24S9bTSEm?ZAB)JZ_Hnt2_IFdVaaaS0SrG9ILwE&G;;# zTZ@2`2=l9MC1|eAZuJ-|8zZEd7rRM2m9|NO(L(9J>J(z6=t zDO%)U@oZrdqtvX*zlAe4p2=HpsCx*-QZ(*DzzD|~+&Q2;fP{eI2hbA%&kh7|Om#Ig zGqV}0bI7vKUiRfn7nmLZ1FyQYG^e=olX~jN@upKk(eNrW%NpTofv009hxe#I-mz4e zBd?i8@i{D|bKY6z`KC_s)ZR|sv)+GVj#+gwH8llg=g0opC7@Gim0D33%l;H#0I?Zd z@3_<)c(y;czR+L`JalFLG==7ek@xgx}t} zEk|2VFKgPH1U>Yvs%jumCm%fkMjT7>U^F0(Ck+ZJlGvCQXI6__WO5g*6p|=m$Qeue z8qrxxajoJ_A2VF@jTa?rF5tgKifjhQLL}OLFZ|vKBt^|t>J8j^j|*Rr0%`wI+Kv;A z#b!1;89((BZgluHR6^UL&kAzr6EHfcQw~jnnmdvR5KxDujUCLe_Jz%7)OR_JDlSsp zh~?5UEU5Ml4`l%g5F(Eok(W2Ewy>p18t3oDbV*?Y?pW_QnQQlLmAPd>aQ7)%j#g$!?+kDG1-%F*49K zySv4Ix2(IjI&Y1B!Bdk`fUG$P}v9KbGE$!(|mC`d!oVkz$b&ZiLSy zlJn7%CwhpvFT0umZ)pVZHh=N2?NdM@kzF$|R(!B4O~ za-|u>@L5yQiwI5Eq?YvQwzjhF0ht&+gsHu)xCLYz0u{MjLBfFm??ftP@q#Xz872n8 z?SqrCE5!M?B ziXl*^9BAehpOvQIAtQi+l#hG(^bkSh9)Us*4IX;&-=A+!?C^`l)Jxw~bW=aDmPbzu zwD9j5E!11%f(8s+l`!3ci;1ce(ri~P3kH81NPVFB4&Ozjq@>WZu?>JlIbHlU09~iJ zB3GB0;O8HAa$HMLr-0#spa|xSY(`VRR-L+bU3=D#9=S)peB~NwU{flrW3bvI?B7w< zg_pq>kVSuFp9j8s;dk!_QnogPw0~REEp73)XwSfyQFTr~$*U%rCmVd+s7trsR!$8E z*&*~(!_@TEBZokloS%=tXVU620UcRD3E{zyNIL`MUElD(TC)AZ%Opk30v}e#LPtVW6UE;*V#DKYtkd_VX z2}V@ZEByRvzSq3G{b}@;NnwBj0i7LS>o`!s;jH6VCLPQsW#>E3am`A@anc+7DEx10 zzSIk&6mZ7?WORkABZv)gSnh}cB1VS~e_f(u+Y#z`MO77RX-@i1R@?jSv1|$@yvMQg z)pp)GAn-!&`v4KKzkZ$JNu*z@d9vmG!g)6!7#ROH0$p2pfRmg$3OT z{g%XwfYg)}6AO!v7`wpSXsE%DtdZge3mPH?YRTMw(lG#{U>w!#d&Bz|2=Tx^`IVK= zfS~obN*9BzI{ZyOeFl!aI%$g&Ld(2LM2(JVJ(sMSA_Ee*7%4IF8Y>EKW(PQh>0MPH z&|tx+_}@x5()@nixXAjL$82ej)S#C!7{`Bg*_5x)ZHRo*=KF62p-R6cXktS35ypEa z15NEplq-b?!=&lwW-0{``v`iy?7WVf3KH>A-GU#LY>(xv+slbVA5}7u&f3OC0#M#S8CmZ%R~-WFqI<2@ z;^Bw-dQt~;S~q88fK6bWS(9T(;+~6Q4ZvaGz$>AF++1={p+Rh$`1p_l;3SKyav+{^ zO+!LLa&;@u`_>o0FFNJy6@?^kpQyq?r}KH!NnEKWjXfG=>_vG3@KhTYQx>M+gIt^1TWv$H#%;=I ztAk4kYwGH_tW)R!)O<$(!;RA+&BCQqUIC+e;N{xrbZCZ=OYg^LU#hBPEG_BA@=Wf^x&^w08_(jsWz@Jfaa)M+G`0F72~qB~O@e38+Z}fGu7q$X6DP zS_I1!f`RCF{uriTJVkcH^lnFNeHR*L57TTT3nf`1TH3i~-ySsGI8ms`0qg}~2qx0{ zX24z`M*JyANs~483|I-loEA)I&8D(h4co$j&TqHWth&`>++Nb;xZDp|amz3aNF)Fy zp&=uV*bt~S!WQ;2i2KrSMk{jnn$Sbhm~*g5YZ@9-s(pb{=5grJV_PD~kH(I|a z3^a~gGeY4zcnp&*Y$K&C=TGsT9<6i-Kkgp5s;A#gv^{7Y-wqz%UY}_D_U+r{DQzju znTL>1M1b90Vx4)$8QPuVT%qo;_T^}sN03GhRMQvsni5o?JhnHP^5F-Y7dKbe1i&Vo zFFCt`9D3glGQii@7j&v6wkwcyfEuiTBqySvuw;5kSjRlW(7*O;B+8sz)3>wydZSis zsr3UJz@BjtnR3yShY>em_-nL*8a_~ugB&=nkbF&(0bTamue@TEb)M);8w!1UeGyg0 zaMptl;=Yc+lr|rTU}Rv|MJ-k?$dKIGO&6Lgn(Z1)!cJc}yCPfHFqH z=Kyxz98>mB!X2KAmUuB-(G+8B0$YAQRbbV56OJKMN?7{{i=MI>gsU8T-&hvLq4(`Gp_vnIQ?VA7ixC)^n9J`cWpfz z+Z#(JczN&?4CbBPzjEN_owlCV!C|XZ9bn^1fLSMX`RsEk4u+YMZ_Qq3Hb9Q^If4^< ztVPg)okgH;HNW}o|KQ8b&F#cw-JtuvG10G+0&D^rF!fyxCA@^3&L{8{>-vSDGt6Yk z>9@MG3=I#1{J6ir=v=>9eh`TpA;3h%K|}WFS_cs<;vqCgJ}XAq6*e{h$GxM<^l2Jd zzFIxluH{KtrBjCrbeW*uRWWI46s=0#P%zYm8u^~#$6bG(umXasaf9yBZ|_4BfO&x6 z1zF3dnAexwMdX)X1Z>{XzxE$#-Nf!SVJl^Lu{49oFL;CP+!_$qeztjXRp)Xx_1zqH zVnZHR<`I7XmOiAqGnS1Xw6VOj6ij49@QWUsDevSPme5kvBl%L$`g-q-9=VL@9XCZ8 zSj6hZ%_Eq+I^NWnV+5=}2AfJ{CRGt{E6vDnkbs{7&iP6{An}h93lmdsl8Q*g8p+Qi_j=Ip0|E+9#WuK)k|(P zDognz2DaKaYZX(U!S)^h+jR;Ah+d=JDn|B4iI=>T0eWz$PBTD*b(vnEA%i}t6a6|8 zIU!Z8y`_&X*8?%n=ed#7{k&z~rq;h||2x|!XX#V$$3dj7%Kw95bnGBPo}j4ZH2*?3EjEDmJ{>Lzdt*tI41Dv~XQlS*UErFjDV zSb;SOyzY8@eWvidFX$_&13yl^I z^Ay&t&B|vW;wKlR{Wf(fX5cQ-|NbNoq3EDqN7-Bg8ubxPOuxzDks~qH9wrisGZPQb zpwmBfY)M4{`=kDE9yJ?R56^Y!C$A23QNYGf8dqs;S2Gh=a{*HqbMOS=Was2zVdr9D z=hNWe6<}u<;ACe4kL>IgZnOOV;{^|8QUNg8KKu6$zCFv;S>PG@W^NYhTZ7-9q*GY+1G)3*58W>o0 zpO)H$39Nj)&_e0?o$5YObHVymk5q;2O4<$P6=+TPaHr*CPnH7v=9fp;t}1u+`&hWz z?cC1?`=+c;S#_WD{MLD?-Bs^uFFFH<>6VDuw+gi$_hxu9GB8XQX3n2@fSsqI{;~PI{H?XyH#8Ja?qik` zH`O&T4ly#cGBU6-HPbdQure@^|7?DC@_y`cdF%QMCx2j;RmP&va`(D*3_#%N>gTe~ HDWM4fs^be3 delta 762 zcmeBU-@q{;(U)1-)5S5Q;?~<+hW$d05^N9h^^UkmCnqLlC!H0Id91&1@3E$Hw~j^J zz7Z%PeEYY4`O%NYI=T8rVoZlNZQy1%+HwB!!FM@qM)~_@-t3&X(Xjr(gi9-}8LCh4 zUO!(HGe33t%Q;g&JbnK@TyNQHeeL^8U+Z7}mTq{idigsBlM}p-tMj+qQadim^6AkP zS%!ZCZW=Bhm(D(yeQQnT>K_~9YS>@y*=m|Rn|BWH>obdv@6ObkYry?{;i@-*9Lge2 z5(@+8SDsWxBppL}WA*t`7vVVB5zxM;EVpsCKPONBEdj{bsMNHv-@G+q<|NnSB0!pO9CF zz_Dv;@9o_F{Mq>b)?5mB|4)6N>j)9O<0h zu|KqMKCk>PXNm1M#5^oa5_1B0Q~syz`5tmLYGUr5JF6xZ$Ni3fwmfCkd(PR*=6%-8 zx?FY9u`uVs788EGz^^Z&wtD4pFJE=S?9h(I%N%sWFYMa9Vnb(UR`0INSL;@ZZgK7K z4Yu}6wGj#qnq0_~Kk)z;&x89vc>nai?eVzsao^-OOj6>;x(4PUhGtd<23AG}+Cb94 oAg%P8#bjA#ta9QSc`cLum}Ql*=yS03k7fV@Pgg&ebxsLQ0A68gWB>pF diff --git a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/234b02f3-1afc-4539-ad33-93955d6e0288.png b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/234b02f3-1afc-4539-ad33-93955d6e0288.png new file mode 100644 index 0000000000000000000000000000000000000000..efc82ffa18ece5b9b8bd080942736341e5b1640f GIT binary patch literal 10701 zcmd5?Wl)t-yFD~WcXukC0@6}~bT=GIx;q7tmhKV|ke2RHICO|~3kXOzNZ-wOXYS1X zasS`(l{3RRFYi8kuf3kN*0Up3mE|y>kv)SzAee9DrPaaf2KfIM6&d`be4`NuUTDna z)s-L+UnU47_yYuT1AZ0!7XtC%fYw~R8<{=r*ZY0h|uqSrtu<~ zS%`^Ne7qghvfE$%inq%Wrszex%APBEMwnotdbH~LW{Y#y+aJ4!} zpFTQ2kJh$~)wbOEoB8b8|M=QJy`i^kBG{JWgKkX(XV)FizUM1@fvo-R2D{lP&qQ{E z#(~EBKyiOD>Q9ufkiSZ!Xeu$LX20W$8X8g<85w~MaAi9_Aoc$*>uyYi?7J$4CHmw1S>va+r}o@b*w zSB2=FqN}1o{rq0>kzpcA#@|~~OUe_ZEFSdr#gfDJW~Doc#jx3Z2QR+G5SE`$yVMy#ZatoxQfxFb!Hh1W%vrFV z7bIr6-FDQOwRaR9re76WR{&#KCLtpmx(;`2B3DvU8g$6cwz0SG?d?Uxcl@Q5@|7u! z@S26Np{2H9G3ISB_|V422I=I2y};ao=Rbcj@J%oIq4)WOTno;|iC|w}-_NBb3^f8Z zJw3F#`55w-jwAOGqCZ(De)b0wnRjB~;&FEW{Sy?s zKi8Ol0I1B(%_S%wU^C?-g8=|r^v^L<#r5o6K;7MwOH}fc*w( zAR$o|VPO*0jpo`c{>JQ6TA^0@jC1yMXzhV60Tocv3t3jFR)`Zao)i_#HNqleV>3+=Z#)?b^9*sZjB*v(kzR2z>zZ_CIa{m`?P z{GHab%}6bMa5T?CyPd?mhU6&1i~*h3A=~dXIjya4=HT2y&EpNY^n9B36We`n+(YbQ75(<>qm_*;a(psdG%S} z{#jJVXb8@?a`f|`>0$Vb*Z=EYdC2+}Z>PMmgv$K-P4!D+D=RB5Vd1Eg6PN5)URV(4 zzdvbFL*hw#x$RDnk&%1BMg?>Q*umLu$6c74m$!$BI^qeLk0y=o(hu^~hs$kV2#}SP zD}lx?1kHPt?s_p7`@8DMF0ueo-H0q-ierR}P zxzxOJITcK+U$EvP`R5f&^;1EbmN0E5U33*%V%>k%5TlS2Bq8-h;dU%r2w^1Za<0aF zJ%L_MRZ9ytS*^(}MIe(tx>cd2szy+nsZXP>NKaU38gIbz{d2oGB}{qz)3zPy1pd3i(aW~(F%Cm4pxS*$tPds9=1#NI91HoRa?6!B*?Cq;sz>y?g(hoZSs z`6y63hJJ^D;u6=7Fs>pRwexs7dF~^6;S@XrA(<^L$;=!>DyR?g%>9Bfv(uv+3GE$B zVupi^j*fmUD;vr*o_3IZ4owIX92ZG~{X6c#?y=x8b9Uyk{Mqhq&`K?z{8$qt^pV;a zSzENxIhA|Wb~i5Q&K%N>LhT=4D?S?#gDv*Y)G{hT31h6GOkaI^Dy(@1{w!I0^v4=k z=fjO1U^Z`&-1aly-BrkIew;ky^}5k&Z-$zjSo@uMmm<$)Xzj0F7Ag_%_-NL}zgdZA zyd3ABPef!g*!tSMj-Y@JS09f`Z5~fGSPrfK<^+$y^(OX`3~R*HU_do(XD#XGe_1Z% z4R@w6^${pG+uy}RudNJd>?cMzp@#R|`H8^mc8aHQ{3G7HALJ@;R88eJ;Vvc@V~z~# z^?A77)>w$Wy*k>48v~17R|`uYQ%Pp)O#BvuPDv|4uxTdgDxrUn6s3kSEJOP-<*KA3 znGRqiT1&~Yqfk9rINV*BQowQPsea>i57ov%U%!66lB%|l@LAytk&8Bq0eW;&3X#~Q z#)|=p3TLKamP!tywuKC*8!2{k;p7h`Q$k;6_sqCRyl+w%WV6MCj2qb-VuWr;r^$~r zalT!gFOmEla)1qbuGjUhR+hXk_t6e3!oFH`>cXVq{-kM*Q0xe|hU;_VjfncNI_00( zU#tKtN>&k$T7KUHZ^WFW>|I$|Dd@8P0hQrnj}QeG2?la*piE>H^@>+0FUx;nQV`bbt?mU(%64HsqlQQpaxl=!FwJv$fV^v;}rW5yIQ%gd- zEM&N{bX>)3qV17U?-`r+Mv*#6%08W$+67xURfzoq|=)P#K>GG*3Qb zG7t-izig_#KN|?At<>HQQ7(C{q=XqGOP`sQWvTIXVPSzwM1&1K^10?)|Gk;YBz9tM zZtnMohmI1l8eez!_D;rL9er+T$>=iEjgW?bnLxyjP5YFaOQrWudgrLfiM>(W$E4U? z;ac9MZCN!+v$FT8pbIgC{z6FgU(u7aW#p%??DU3OTq~T7HYYWxpmX&$8d1T&BH5Qc#rhu}uDTE)KweP=oKM8eGDoNABYv5dx8e7= z$?9dM{<0xKSY9eb7tl=1-}@1-AflX9%1Qoe+qbd;LDr`DF_Yh}nQ+Rs0SG5WVo~J| zvzNMGk%`WAZhqH!E|phzX7W?dptq_@X(|j?jYDgWgQa&sk%6(l483ccL43OkXVn)R z_ox^Mc%wR!JG;-r?b`N?u#haEt}cX)NH|AXE#}uJN*mPvFAH%uulZj@;>wGh1F02` zO}(`^7*wPs7Y+Migtwo*dKA8Tw7n>hg^3kj_--aChm!JkIV45XQx@DAqgH^0v)T37h&ERBf@w;%9PI26Aae(o_16sB89Rb)D-txp zK)liuJbS)UIB&1)XD@cQ)AB(pS_Pr=QK+l^i;u`fb)A%<{TJ;D9Nf{XE4`n47fb93 zDmWYNU*E*g(KN-pbX<~Oj7%(@M3QIIG_RX)#zA-wIl2SlDMFf#go;Ymz<_-HL=Y(V z$Byys*EBfsn@7%q7Br^GD>G!huicoorP&tyW`tydfye1X&|HlQiH=<gvBcfT*3XK1Wei-J;oYg^mee6sM<@zKcVUI_|D%*<%d`?u(_^|7;*4=JF) zV`E|cIPiQ;0IMhZWmT77ULJj$8qgF_Ek2sRN3@bBgLMrlY@hdmKI_42JhO9zgV`Q3%pz$l?>Qj z`!`Sfo{#SXkQR(6#=D>+v9XNZ?i5YSEIN2vz?^ocLH!T4h~{h3+2@al{c> z+JVav&Lxk*)DMboBHKyj+A(X+B(v2fI`#g8L_9v!G+qwrqgE6m-Z<7{*^-Ki=)j(| z8*_rP&{JNgu1FRQ`#Cw;gFb)YIo$VcYn`V?zw+YX1$5dqAEUrFy8ehMGX=!O8sS&vR?uMgs zMUWr)XDwPk2(6#Df9K>B&JqQ5;B#$)fqmqJVqUUX|GRv5%>F-(ObOIN27P#v4N&(M z!!xozZ7nTEHwR5EEn2F$*JP&JFQg$n+_Hsg_H*Cfqf{j}iWgnK(39Vi74qCCfeaK6 zQi%EzFsoqNj8w^U5K5x3!y-mc_ zGavSS$$!e0zDYVUwAe`Hw<;XKpd1tn@90BJF_4 z*rk3wrSBBrq(lDFMks_|9CD6E!t%z1NX(`dcP&0dwK*?k-U>`F-Q$b7^U0mpm4= zSj?=kAEt+g$6TE?HXyX~b3P8k=3u}jhst`|4zfsZneb<-(>U=x_GZ{2iZ3e_b~2Nz zICY{tsBQ7-xme|CXhmk!)QyZV>`O#J)_shh_D5d}aj(0{{siNLUb)2|eC|BLfv zDCS2S>g%2NvKvO5F}TQLSvWaW=20Yw>a0tv-|XDD$_TSsiCq=Sa>LhM*jX|5_w|`J zEuQq^t2n=ZvlwHaH@hc8gVVh;nX!%0akb(H3C?-tRb0>5-`~$ICib7D0~;tQDG5Sj zz|KN}Wo}`C2sj!Te%%IJLTNRiA&7yp1bpjq{96(=B)GVkDYwaeE3%&0OX!wVi3uN= zrnFk@_}&cNKgujggUMX|?E?${fg;QW+Vt#jQI-6h}451(=?*X;r zV|ciljt(<C6T;as;*{%ovz>9JdI7m}slhbM+$U{)lhQoGuZ9%dk;(Z*9&1cbD&}L53bcm@oM4-- zl0Z%!c!uh|u^BIN?_57V<}&0Ue!r;Q8-7YYlqIXe7Wu;?QA zZm(69ppj-Wt_ozSyb-HPgppUZ+d_HgklH@gp{vfAa(uY9x7fp1kGItf;_`QSJeOr< zdNFi$Vr(}=~%dpCW!NZm1jq*Bz1r}Nc7JoD@;35DUu8g~6|Zk&y<{ec>HdD=WPd>NWn$ZlxxMTgKzdkpzjc7{CplC0)UdqNI~rOGZ3Z14!j;V zp(A)^nSGWnG8x*UoL(L8QNdvFrfYS)(gF-KDy5>lT+xoPXnm#4i?bf>xV*TK1PpcHS(u+MDUfdZz*qtv z2zR0P-%m@8wQL75;N{V399T9`a~vr_WCmCSz!KzTkqHU76oSrxgWtc0;~21@wm5Bc zAKBZPESZ>?fCK2Po*k~F*u(V@&RJ4`m$0_BR@SZs_RETKczC!a1!P(hVBLbHHA4&X z3&3M*W3E3da62wF<8F`T^nldicv{EA>|mh*Fi=0>N)U5_h~p`5aoZkS1Lf|i1e-h%FHUH0d=9YwcC zq0KL!;k1zqazMBf{T8l^uO6${31BIYd{_5_k8p2S-ugeD1#yU|G(_SG=X|O*J09U3 zmjFrvEGfvnzz_kT{TX7k%flvjK4_QAI5@C_>fPGfih~v2l44#@&ORak_Cgn$k6 zg1(nJ*Jw%vq@HX%>VK&apj1u)r^J{U<2`1_j$NJvX;6NkuFY z00t6Sl(y=-$G*SXMU536Dz^zhwQ(@))On4Jf<^H=di5KXnvI~W%~2_zG_rx-fGJlu zw5HpFXYKM}5y-^tv2_d9!GexWTSh%{ZldV?+FI8@xL87~x^l}JO&YUU_(y~5bTdp- z!@A~F+yRmK;QVGBHL@?)n`dnnQ*^R5jg3TLZsuA&SRd}TKNN0fSm&-eMu64>4F%Sd zkB4;YTusQE`>( zL87Ip`5S-}1TcU`mK203K7~{;kiW%w78a$gq_qewm9W~r_F6?bzl1f!NI>mRwnnoi ziy!aK#?M;iQce0+8I6;RxG5Y#T?9(Tw}VRjW+LwMwC%}SI5o8Y6QzIr&L|K!YX$7lbnvdZA@yFQg0A9!SZ_%?m7Fasv4gA@M^2*eMX~N1&ffm1?x-=o%Pg z{qiG^lvY(!dk-?g_KO(Zu>0Aj#imSZCdo!wI+zEK5pOld{$rhD|fJXay@8rsoRF)80V z!iTR0)Cy1lYiHLM+UjI}{5q@|zA!zj_;P=+wz!X;K$6x500V=<)mGu9+sWpwoa#um z^PUmkTw9Y~7F0#>NK=qZH2Yukc<#@=muCpM*qfyXD?3wZFjs4d{#3MbUV$Oq-`}^p z_3vG*@6Xpse0-^9ZcZO(?Y1>S3fvHvWiTA8p@7j4czYcd4d%&zjZ7dt8)+P>o!G#5 zdvo&{B+E~<+Y^d{%|ooPHTS~J2GN5f^%+9}C4=~v3IydC`20A=c_s(z!uY3&`^C?* zrC4*S5ls>Xh&fV4{GJaKuH3*I8-LJ}fCMir=*Psw&}eL9*_AXjHu6MgC`YV=BIHei zxkXi4TKau=y4>@7ZLTlLzmwzg5*ddcvbYfnhy zW>V=L^@2L)?*JPS`@@k56E>v64n>5l6~>9-!I=U)JxvD_GqVpWBFL8;+_rlo@%2 zv8p>s7X%{G`}j8;m_UG)>&!!}a0C$Zi{)X9<;9_E*%ERZwI=(xx?m;626+qBd|C%F z%giGx;)4qGm5EOObn%pk?g}aM(w0z*?lhDQS?K(;f?ASg^76+&ZRvK~%AX=Q(xOqa zY~Q_mk^#*UKwi|?PQOThTb%3(Wi@y;t4!2{iVMJt!$C{ya$A96gWM7qz4t z;j8=e?_|S&sT@dX6O%mXD>b$BYvf->yD)W-%nzp+3a=2bAaPqAEJ;#LYY3>+0uBQ^ z@re!H=rUM}aF>5+sZe6cMWJRmodT6iLP-e&J<{tR6~@&%R)o~Pe`z1?0e#w338<9U zW>=~Tyd3BGOwfyJv9mOoknEEPdWYClBHi8H5NHhvm{VXCg26z63!`G?ZwU>9!4jfW zce5x+N!JvU>jry3^9DHKujS>hEiE_I)3$$nQ%&VE@^jBXtJUm99ntSn5xbVwT*yOK z%LI*^!Mn(c92AJx;gTfCj!eX|^#+?(e50+mTwBx^A_qGMfq@yjo{+``v}fXff&{8< zpLx?tR}eMuF!SNxQ}p?r^3!nBump9>2E5VbBk!BeWGyDkfZG8oK-It?db(WajOu4? zEzesO6*pSYTfqhukeJi>4?-)FC z;{lKPYVBlk=b~PzF`|r7lk9+|XR6ogPNfcgiJlGw2rj0k!EFR{?{0u)t1#{$1F>u9 zpv8}=spS2$>+L)@Ymq%ovjPjzZ=k=R+u_R(Sh)vbMOjH{4Q$(|%nU>;d2*zvi0O~K z26}Zko{C0}VF?@`ZMiGbq$B)^qmrB^s`UmL8?t>h&?WZw_CiOkHbgVn+6xyCWI+)I z+6b7>A!ar?5FLRuAZkNpJWqUlF)@VZH=uX_Kub{H0kv`Q@calGE=XQ&_ep|Tj@}oQ z^u4_ISGDt~#p(JBUuOtoLBAgNj{w|90uXpc(bn1u>H!?si4zlQpu0q+B+`PSwVU>o zft|6=OI!e@mo4Ix$fOx3?EsFW$%Z9yTmL32PqE^ez1LA)_x#m6j{{x zN~`?|{fSOcz%#f(N$mG(v4QbWt^yf{anb(a;YS)&e<&AuJ9`esh$+~Rn~@jUVn6``o4CaJyde?b7?`1a zRhB)zs<&71jqHU}ur89toq_vGadEpmo13}2Q_bnK>ayqz=BF+j@X?@s+B^Uh8vJ|6 z>fzB*n%0wXC@U|2s)Uo-97e4lZf<<-SK9TqewcQYJb}2w@2YtiI-V;EQZwLkMr_AQ z>|rs}y!;W|kKuZv(@uoXaCOBf1)%_YCbz)PpB~=>?rPewvi9uWasRP*!4xRCmmb%@ z0oEvt2KDdZp{$V+C9vS2C|nC_?yzKmQx|XFzWrQNgZs3dI1J;f;wxH%+|{1%n-QfJ zXnc{M?G#LFoFZ0b=qF7aP07MdSq=h~n?(WAsO6rQcXV?Gm;971N zt%rHGac|}i~rma=sBKfmt0FDP_;AEHvh*7T| z?(9f{O>pijdZh^Vl$ozD+1254&)>f+252qmmZi$vL`P=EFV4R1ZW~P#ry;BZr48J( z&)X?`XtEE1e#ODb!-+>X-x& zLXJ;|IbY)-uB=VY&kqJf)k#JWx86;ek}2MkJ||V^_zVN`#jU9a5ZqG&*je?_y(Y`B zy!vgt{VHp9J6(BWV^dQPSk0p=&QzL6LaFDsq_A)*-w2eK9KbwjsEEQAT;>|=i1S4A zC*IMFVF_5RCpjv1WsO>Ktb;QT5cvzmT3dEWf+Y2T@@Sw;!i=l?(@X**9Tpq&%gUZ1 zhrW;g(}OK89S|Ve1j+=X6DuhOGA;(PkH`$jtrM^%@+f^Y$~NV`#;XUU_kzI|wzpFN zR&oluB@a9fr9K|82iVD1jX)8ps;=G+?LRv(!wi%17t8?+wxiWT{JaKM>F}GT{oXSHB+fBlnN)hLGg#y{65_ro@@8v4f#$JEd5tbU{MxIHbaYg+Pjnq}Q&xL%VEK_G`Af|5s@m+{4F(20QQF(vp9w4bFlwz$$^CPr_}v zBkGmc;h)ff$p*%xuxnseYmk%`YDOaPK3n){3=a(*cN_&^>r@%SK}2r%>pH*EYVBOa0 z#_`a{#Lq@}m!3UbR0k<}#jU@_7X7f;@&rBs|G zBPyiGK#5T7cAxj8Wjpst*dBu<7+0cT(h4M9&vOLQFBDT#7#*7`DlovPxJWR(FXye{ zM#AR7AtS?NP^$kdF%!kA2Q5ZJzM1tPzg1SQm2pl!_ri+H14T7FL0Mvf!APmzn&gZD`#U&*^gj!&iqFKKF8j*6`J=)Lt1}C~t z!RPO@6GgnI4FuC)>u?%vVLZ0 zPthkrl*IY}dG*$AKO*qx@_v=DLc#&38yVeYblok?+%1L8T`j>2golfVpPdU_yqY}R z!aQ8U`~s|8T*6#j)Mqb8|JMx;P8K#+KL7U(j#Y6k;0Bied4ju*gQc6hnS=BHeUDIE SRTa1g@ie^1!F)0CdY8A}dh5L( z@Bf338P?2v^WE>>bN1PLpBtg7EQ^gnh5>;?KS^fJeri^Uj5_S}wm9D+|K>Dx|K;7mM#f3T2}J-ETG0QiLz@9j(GL+hHst3h z;}=xvF_kHGLu~O}s-ytQ(B&EKesx0vaXfUnXyk8C|LY+njVZ8exlQ~ze~2y~Dhi6K zfx+jbCz}*HkVyYHGg9<1yciiZJw43&nSMTWY2QD49xKfk^Q_Q&>97vDLWHW45=^3~ zC$VzKLso9${&Zw9G*2Ubn^b)TudC|RrgX@$@h->G${JN^8}X$ROGjJOkb=+4ex^Xs zpp$z_TeT{cqox6cg0t8nNoZrySXfz!cReve1)SFZUZCqdZN_4ewR3RzG-cOSzu=FV zJy`!$lqg2#Xv#7h0kZ2M*k|!FEj`_Ndz2ZUL%EYh?HiQ?2ecaAtHgM3&MU*}wHg zpjg1&dE9-r8L4IV07E=FPFQf1O37GHN8ymw;>p#&g#}nv7Ug+?d>J$POO@|KOe`!c zi$`9$nq8r6viGghIci=)l-gy`Xc&ysU5)KBG#SxEQW6Oan1O+TkUb|Zbkyn<2?>dq zo*sF$3@tdOXJ&M=8WM_9WT)4{e}1@d&}Jh7UohL~j!Dd+uf2PW=Xo$61MYzq4~>ch zi=*?+U+tpTNRV)jf>9b+UxBE{Xvpv_$e&RRiv`H z`MHvk65Ku`!`jZSV|A5|z+qS?v5-O0boA{|h0l32Q-9*KISVsHJ4eUvjt;4=A0AE5 zH8nL4eVVPnD~E?%;CqJV=Rbe@M%}UE9RB_9!kokF#-=9ondKvXh>@8YGUTuglk?E8 zqUG8~B78TWLs~6q`3-T;Y`g64-k!9M4rxzM&%gP3gGw$fFfOy2=$ng!Fe)@W+5R>-G1;DnyYkFY(%7v!1#K+TNgwQ&E3QVG28bz!tTQ>GHFLg$4E^xA}+F+<>^}6 zYQNoQu5Of4)>{utr?G5VsV#!H5c7znvw^z`tcA&Y6-a+Amza!O7b z+%Rpi!4Ig6>kRi2!YLU`8|UG{x2VYo;Zf%{uvhpcdW2$Bn0eE8=~i*uL@3E_RG4}r z!o6es)Gfkq>vR0^*1VL@N!_R)o9Ncnx&+n`mi zr=TF5nV!arkXpRBX{dD*$PAaFu{#d@`Ms0r?7>`7b`^HIK3{7~3|TB|b~K)u3Ahr4 z2}@hB1w*vNEM178Z1sG5fC0{SNp_ zeeRe@@SoqJwxcJ*Gcje+fVDR31Fvuq7SAkC0NY%OkL2 zB3$0mDkU+kO6glRFOE#o;B}`iH4F5%sE#Ihz^y(|n8_oVU@(Ahx#FAFordamxiO99 zCLohVNIC6I^IE-%P}N{ni#AbI#C-9?zGf3x9$dF1S zxhYlmbhSurGwOktgJ#?!w}@{|p+k1b0#ai79DE;b?iURCQkO58-5cR;6g>B&VrM zQsVaJ*n-JC@gT`>cn=h~NaHX1@-S~Ty+82u6|*Op_i06MeHxTEp?1#tcz>1PvC`sq z;}uZz(sH2GjywN^fIg~%j%`Ik77b6@Tl)*e7wAo{38AEmS~&IEp0!He->s>86U}!z z2Ze-r1Js$yVKL;dmwP!|kt?g&awh-%`%-V7;6YdTv`9MRS@ER=2bDDg z&ZAHg)miSbp5CI`n}S2X#O#i>5Yg_7k@AA!Fyn4RpGtlLF#7rh#)0MW@{GSgbpxp&f&8?6i2?@|3k6A~^?Qf5p&{oDC9K=~88s=r^ZDtiSj9w6 zNr~+iZ3L?})07;+J7<5HG|T)2s053QMOh~rm#g4WsxUuE_P*wT<<3@vshKoax|WNG zbrc&S@Gkps@92bFoR$K)^%@;)IyzRc`F=n3+IkmduQH!xovkjS4w%F@!Xn)W&v|b~ zS2>hCa<(f^%O^#NqtQREmm^}=So=jMii>}&lq{y+OYc$-@QsL0$ai8j8{p;)g=>~T zjrXQ&tKpqsXmfLO;2%3|;);phU@iIJcSXw4r8pdsG?d<}_^C|VzC)lITlO;&MH!Fe zD={M~FxI&(oJ?K7KHefhi~zsd%z;@5iRzS&(omJjD3lbvT%a?!qI!;6tgY0Kzt!Jd zNX?gkC#~O)=OfuDJmG5ooJ-;5-9)KQd)ZfLN$2IISL3GhHg?k=3Es-Dt;6KmwJQeR zYl)>-l?MMppMF=@_3($5B%;zOgiY+QJ2a54X4f(pt>fU4qKaH|UabMdVCZrpo9JIF z>DP+3Iqe_7sMg+e6OiUs5cJ5Uriix@-Nqd&q?4g?9?@eXq7ZNk|ES`h41Hb(W%ZP= z^b^U(70HHute@F);-`?V$=ba@3=G(1E|j9eV>0*_K~s)~=4ex#+b zF+_DDMs>#3&_{Ke+`h!bqpK|j(Etf328(n>w~=ZsDrnfc0Na_Upe4a#G05pOk#BMo zxxH!#(To~|%s;$o{gvx2bXHL#p>LN9Eycs{zqn-EJoDL4`pX#ZEHFwZga1XZ3-F-a zJt_F;79t%{an;P8ez<>Yw&y*d-y!YB(b3Ug%gV5iyeI%mxb>=-z-(RM>|I!L`a8^Y zmp{sbf{1Xtg!@tT*T3wC+YL-rpNP*HtfESDiMA81gn7O$TUBh=yyiWxiL2NT|I&@C zKvoH*GqM}h4Q%jpHa(h_JenHJeOF>AzGIm${`)3bsauAJi~#rqzxy^}KtmQZz5i2E z5)l~1Vkfa-NWVqArn!z8r}a|TinBr46ZIEZrTt9LmN@;7Fh@s6zcx0KE%@KCD`$(a z&u~^VD@ZeU(w9qcbQ~0%SPl%-WZV>gQQpRVAAmjq7hViSQ;pQ^_$w>Q#m)EX)u9i+ zEndywuxDOYDIoCk>&WX;Z7AnB*x27{Yc=@{If$a1F?))uhXa30N=gC}8^#oA&7M2w zAnWP*dLe7ziRc?( z(XdVJu^*UaQ3Ocq!`;EVa$ZWw-IO1JsWE;A{S_Z%)ljT&0@+zF8(`mA~ zx3?BLJ3r4s-kuiK+hI}j4QMtbB&5qV&X4HL1~9+`ztz_h^Q9}T*D*)vP&ZVnj*YsB zzGm$x4bty9lRFl3H!&LQsD|BSa$;ek3FS*Ev*UEfw3fZvG=oXciDoM@|6QAAWZzL`Gne1WTL^e9t911}XEQr~N*=I`O$ntUy9m_Ap1y*bA5~un3 z`hCgvk6Sq^Cr~CRKF)T=3U_ zi)(<$0VJVKk+V6Zs*2m8Q#ng0Vtw5LC@}q2|4h$Gu8Rnb1Q4!XS8K^tK$_|QbP~59 z1u~M0i!0#sXB_|CYWx+6knoIygEj8T=FJ2f-e)z!??40q-N-rEU+i9`jYUgK%kO(x zX(xDdd%aU(I+!Iaw5R9T9GWTUNrQ*>+osm#wQPP}R;S6**i^EizmA6sDlTP6r%B+% zj`3AV?PBk~_& zO&LF@b)ZqHDV3F#g^p~k3V#R5o$Yr{8qm@I%XvknMVKh+h*F~r8Wr}!p9COXlgHjN zfv)HNEPTd4;#gr}+;mS7nwbc7^%HpkGOhnk-p|j^3Mlc3oi!-W(L#8&XOX#?MB@2* zY6by=(KgWD`HQNoFz?(_n6F0bKq|F=5W&M!e>ONfk*w6Il$(YsdKn z9oafq!|Tbzy16D#S`gpMol%7q6=4ep8&DoKnVvn7@fI`5@yX-&Z10%}gZeEbLHdE^ z#-QT_XEy5!dul_F1C%5O4lZtQDYolA(wDOPv}m{Ap0|}$v_v*G3hd4|lLt{5 z0igoKx|ppkt7idQ311E(unu-6dXpm>-FJur^3tJsZpsQ9$*i4?IJFV@DbMJ>;8E@{ z6_uBNn%P??qHpN`i_G`tO~lcW^OQ)8Oz`_A4{<_i{a;@A?(Xhr$cUBNY?1cxhzN88 zceC+|iVECss%VceWn~or;skCM)M@hP?&iYWAD*AjFlom}A>@Tu(R`k^yR56L`_p}3 z+Cm?NBt|A7Ik~_Ni7INUW^^Oh&A)*r^V!Sn9km>iz^QBAnm7>Xg~i2fD=^W4Ck*y4 ztL*`9086Am#WL&V>3-7zBE(~NGIlsABPHc`M+Y*8!LM*|xwlG62myArUjYmO&7z^D z1(wxxtXLByKcEr+w%j(iw*CYnp;DnCrlqBM%@3zC4jas_?OMJ{ef!h%z@Udu?5U+m ztl+n|4DV#Pt515LePgRaW7Tu3RUJL>O?~e2N=PWWxR^!6hhFCk7$V7w7u|pVqHS+) zo6))^$Q%LV<97XZ>z|5`ceap4=<)g9jMv4S=aNf$ku!92H?WiVQO4q{+%f$RLFO6;mue)|?6b13Yuag5IvKNO6tX$~j&PXL%r4go;N z>SwUQYpn}|rWstUq_FOxnHfw#(gEbX;^RB6qtiQ6n3l=Z;??Yo%0v8p;h*fE?aXVW zjg2gt)vt@HU1vGyDzb%O7V|CPz@1c!5z!-+GRg7b!cY-M?pB5LgXS2UOsvieBEP7Z z@E2rc%l7i?lt#kE0IHrndsbbQ3ol188VDU49!3PANWiFkSh)+z11Q{?nVI^zV`F25 z09uBuIz~qmN*UdOrVQ_1;Sry<<9n;DTzxi;0Evl-sSZSAHRjKdLDlyEB8>fEVij-R zRAj4ugTLo^L^?V_`iSj$&;tGC691A^bMu`D69!drl5* zP9hs8r>qcV*v#H1R(CWM~5lfZ+4OOjX4_X4`xzUR?fN(Y&r+4g8UDlxpn_+!MilF_}I zO4;Y$<{MgSNnOIsw>%GEq&`lXAm?j&r+VOQ>4b@Hm+$c4 zMxzUymXtSAEy3e+{xa#A;TJZAnZtm>#76q0|0Sp8NV)^?f z6o`{R=Hw4+0$&kB1E>p_di@{Zb3Ck53k$d)Le9@UUcGwt7loj&b#=5>o8_xWZ;HzG zmHtF^Rdh1P`!*nLxOjP=06((~I61ORgc9cF^dK;~1q31iez>x};phMRBy~6V?LEiy z6QAo-Yc~%MPv^X;WG1pNhV4I4mHV7u^tIARuVXfkF6zL5a)<;qK<|@SF2F663kbktZEfx0mG9>Mz6@|?pm8zIiH!uH z(gKt0^9#`d+V(00qz~u2OZLr0Ma-uc7m_7o-)m|Jnwy&efO1YMj89CQXod}Bya@(X zOhZG%$i&3t{z*Ywr#ix!P8aOnHnt~-8m$PC?eJS619#-kcv*X`?Zn|~yb29b)E|o) zV^H!`M6T#iP*D-+k_`M$`d?Q$E{O0`;7}%(l$J)oWO z4C9g7nNtVY=(X5XRB_6az@S5IC+Q~Jx3K+c5l z9zQs)`F-LIaPD8$m7zK@L;AEVA!Yq#J$cX>UML-HVsHN#S5@vi(AzamblJg|gF@|d zczShq;!K2XAOIl&75h13Hr@&AR^VRE<90LT5%m1T;IUS!5z*&E%tJA zzU84z_EJsia{38k9Ta6y6>cxPMLz+7i~7PhU~i`WM0^^Y z(a{w{?tFLcZdI%MpJ`HKfeo4)ptbNZ1_paMR2@YO=!Z0wF+H%*aVUlUhI)af$GmbW zumQK4vBTOyIEw+}GTpHSJ-N5D%*@e|Q%X$=04ikFp58T8uRso+EeV5)ewBV@b0`PT zvXgEgQmRi)|3n^_uH&V!a3)`~8~jAy=*s*}xf=tq<78#v%|+IS{WpLx+s)KrzxbFz zqWyP08@N1n3oV%{N-j-vkJt3}egonS7{ZPJ!Vn=X+g#+S?LI0xXBv%t#5>LAnKHxX z`KjT+cmFpsf&@(9nz-S~k_KJ)=*t0~VEr{vx*{&?0Y)U)H~HTQ1WcJXOCFp5ajkYc zk;7$6C8_yN#!ZHW0xtQy1X|X%)|*`AcjEyxYpG!?CCJ!%hq<;Sc0E-!HR_#N=cYN( zR9Vave3UwaSxy^i5Uq?d#QR$9lTAM~9 zl>HGsV`Ory=uN9gD22SfG^p})LsJ!L3tg);sPOlwt{BXpJDCuo`P0Gqwm$G-JWd?# zds@>LLRQh*aJ8Qvduf-aBP#7iT#H);*7T=TO@I@!l&cXUpp$>(iapIcxOp7i#_8= z!Z0H;J(imFWn3ppyFZ&S&Y6y& zC(xR)XR`BNE7-eJHDS2of&k#Ar>D8zyn!>`@!)>~@;@d9KAw+CRTBw%bHM2b(+XUv zS%vCUGIdsFG(^y`x!T1mO3dUe)?;%|a^lZuF_rAE(M&*8%A;*SiTBZ0CM|MzaqemT zVctuW@|K}gx0WT(m5~sm3eCB}00ykY->Bi)f}Wpm2v}KJ)j*GNYs-4J$rBgky>&?e zxT;4}W_L$wT3TB$Dy|V135b>U2{%uE3Q*`kHwhg2h3X|y^(>D*?Y6(6O^-evMd61SL;S4U>bTuvma!DD|leAA`D ztFq|RCzMBWkC~g3g9KtK2yUie&B$O{tLr@mwYESfZyp&L2?kVi%1Mx_70s-nay2TC zCBm@*lj8$vg2Su^z01}t{46N2<8P+$hx6ZHxoam301rp1Xaq)r^T+Q$E(qnyvOohO zO~(aP7m@w3m7}k%t%g;Zg-m_ENLw6dCPi1eU26&)&mA!mf=FsS_Nido%;}6edU{b{ zX58G|4&TJSO&AV$*eWi-38R$`>3i*cvH$+DR9+sf_!>iD-Ly54xWcD+5570&d#^0h z3p8~GpiJrMmZYi}Cdk!p`>S$2Lh>bJk%0Fa0gMAwLReTBNCh!4&{t&Gu*9_4KW)p) za?(s^N}oS}KBn)PS~bod3 z5)lxUl`6f1g;rQZM8t0UqC#0({lDIDMN|qlO|xH5ay#z#e&J93C@KcdFkB(P2 z;Ap4k=gR=}E2r#y+g$i59vj>x{P(A~S0}&NLDnf}3UqF0jgOCi|Nb2jB+9KeQQqx( ze>xk7?LMwBugKO$ux?3w=%qAq${LG|&fkygk`yE)zyJNi%iaJTwwTCB43LT-Wd48# zq}4K9xKO>-3@m=OAsnR`_WASjDm>oT+NEM5-BC!xgE73g$@zp{C!hh1Cm!a)$CPBk z%R5uG<(o$u;Uas-DO+F4sK z<#@$CzkM5B+6=#qv(sdzGUiPct*WYu)lxwUgy@~nF7R*&b6Zq1HAK_&xHqYPXyo_K zf8MLF>P@JvG)8!8x-GrCxhbc!2H$c!P7IywFeU0<2LpX%W#5Mi*=QN0){|!e^(`(b z85$Z21kLfkZ1hoMw2?F~LJYp*CCXDC{G42<$<$jGNHiSwO$mMLZ?4P6cXg>BhPHmJ zHx)`lco_F!K*{#Hm#MC{_R+ZZ9nu7fza#a(U-}?`LEr2DNtwg%e2riJe3x*G9Lkr`tO_Ro*8SshGiMS@R99 zs36Q&IHExAwA<9ukYMqYyveS9_7XZcO4W7iXmO^|s>vi}bmg`f&d$#6yVnlbO#6ji z8Fc=0dgjz)yBO9T&+jzO{Q@Y)i3wD3JOHMT><&2JK%^fz7Y?iOB_<|5wif`Q28}Ha z{hw6tsdd~xx~VbmS`a0Df0rw_(ZXL)H_E6=*C82(vos|8Vr}Gmu3~xB0bohMIF>!x z-rZdtNzY9h-8nm^M|3$;97r-Bpgpa553^xkxpiF6Bgl;mE!-yPMLGh7*H?VlO~R}~ zjOzD9JxI+s^jP$9aN+^rp}>a>HK^F|hl8Z+>+4&bZ~j0+PHxIdOh(obG4om5GjcLA7a~)>Z}UH$kpQ2s#>v{>cgPyw^C-BaC$7XwZt?4+qUONJ z+qWbf$QH!~I0%Yw+s4TeRo8H*L!4;A2j(mKJj}Jz)6?8DMGif=@FRdJ=k8;M#52oQ=lF33Sthd9}QW$wSrz?S&+Z><1jM0@)}4z9ZW zguUFbHLK})xj}OzfUaYA-rT6URb4;xAhQ_*|0{Ey+FDSa0LK@}cC12{FU3=s8e|eV z{U<5((-}~%ET3)W@z3o8nSxil=wPFOvqvR2LH23WX$>$CX(pFEB8@mLnL!UL0dClAm%Smy1ZF6BDki*0s7Pb#Z}W5U}y3+tlxQ9#w627S-crN*h%iF&uu!~zuUudIhvgM z{S6zL+Vf~BH$_i={!RS{*pBpss$8!gr`~blQ~Q#bwDgnlQk`H{t@6d4iq>_t1yG8B zQC$jUWAWU_xr7W3;4-sajTQ?R4A9YmExoOkI)JW*i? z)2nwd26E(=PtWYr7ruuGki`hbtVQbU_9d>CD~75?srT>Si$i%xuzX!;n43rhdY~Q$j-OlHN9*5$qThnpyw%hHJib+Jq zJZ%dpbk*wSB6D-|OK|rvFnS0i%kNwV(9nd$L~61a6R^Q(mSw)l6ZV|p@oro1>`l1a z!B+vdlJ)$jf+%Y6A74o;JgNDF<#z^Vu^l=EN?>!#JrDwjkUIOBE@FN_;qAmA^^tIY z`Q+ZjAqA9R@wac^5}JOd5jV@#aO5}wxA(gsn}I0fBannYpWV(Z+$Zgmb%s&;pn=Kl z0wfqLEAZg!OWDM#I!$6V)f^XEn*W)qq9clJLEnX{h~8=V?l){4F8)Ef-BS68_+|6Q z)Gu#Wg#v7gyEt?6h+cM9R!J}_&{}=GIf$zMZ`26QS*gO>jnRSv;Ba{`Qy_%i zld1VOB;bE@fwsl)akj2vFw;srDGedFZ}FE8(k6tqVKV}!r(j~|2p|qZ%84RIP(W%b zseyFjCB2r!6dsES{jAf;k>b;i?^Ws!jS{zU$W?`Q3I_WsBAL6fPI2ZTgEwTYxmr&O@>k={*O z+s(|_&0N6L#T-0Ac({0Y*|}b_bG_E!<`dxJ65!!t1&>@@7VhKx|LX*MM>A^+@BjM* qVkQT$?-IiF-&b(6wl{ZmGq!j7zt0g9R?!3JK;)&BrOG9Yg8l=gZI8qN diff --git a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png new file mode 100644 index 0000000000000000000000000000000000000000..1b7c35222a4dc465aa688950f2d7bc92cf4ba1f9 GIT binary patch literal 641 zcmeAS@N?(olHy`uVBq!ia0vp^kAe6F2OE%-^$hL@QVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^3o8Z1bJH*>FCA!lyC6<3*{qp1OtE>muE0r@&Pd{b7bG6EZzgJlq^bc`3hJ5_B zEHe7^ti7vVeAen(61jP1;d!R?)N?%dU)u%$tbSi0_jQ_WuYr>QP%Vcti(uV~rJ3&M zDj!zgmA7ayyF1TMH#Z{vx#f4w*7HgvI-0i1Kde^IX3^F>U$epyXpw4(YeY#(Vo9o1 za#1RfVlXl=GSxKzBI6JvLn|W#D^oLV0|P4q1NqP9XHhid=BH$)RpQo=x30ess6hj6 fLrG?CYH>+oZUJsRmb=%j19{)m)z4*}Q$iB} Date: Sun, 4 May 2025 06:42:13 +0300 Subject: [PATCH 014/155] ci: Add debugging to old release deletion (#800) --- .github/workflows/release_dev.yml | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index fe36d8329a..aa32251903 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -90,6 +90,44 @@ jobs: echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT echo "build_date=$DATE_TAG" >> $GITHUB_OUTPUT + - name: Cleanup old releases (debug mode) + run: | + set -euo pipefail + + #— Produce TAG_NAME earlier in your workflow: + TAG_NAME="${{ steps.tag_info.outputs.tag_name }}" + echo "DEBUG: TAG_NAME='${TAG_NAME}'" + + BRANCH_SUFFIX="${TAG_NAME%%/*}" + PREFIX="${BRANCH_SUFFIX}/" + echo "DEBUG: PREFIX='${PREFIX}'" + + echo "All releases:" + gh release list --limit 100 | awk '{print $1}' + + echo "Releases matching prefix:" + MATCHING=$(gh release list --limit 100 | awk '{print $1}' | grep "^${PREFIX}" || true) + echo "$MATCHING" | cat -n + + # Only delete if we actually matched anything + if [ -n "$MATCHING" ]; then + COUNT=0 + KEEP=10 + IFS=$'\n' + for TAG in $MATCHING; do + COUNT=$((COUNT+1)) + if [ "$COUNT" -gt "$KEEP" ]; then + echo "Deleting: $TAG" + # gh release delete "$TAG" --cleanup-tag -y + fi + done + unset IFS + else + echo "No releases to delete for prefix '$PREFIX'" + fi + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Cleanup old releases run: | # tag_name looks like: branch-name/date From 2ec1292b2a7538995e620db4a3883fea274d3baf Mon Sep 17 00:00:00 2001 From: Luke Van Epen Date: Sun, 4 May 2025 22:16:01 +1000 Subject: [PATCH 015/155] fix: Elite guard trait not working (#801) --- scripts/scr_initialize_custom/scr_initialize_custom.gml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 94a2757051..36cd928254 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -2798,8 +2798,13 @@ function scr_initialize_custom() { switch (_role) { // MAINLINE case "tacticals": - _rolename = roles.tactical; - _erole = eROLE.Tactical; + if(scr_has_adv("Elite Guard")){ + _rolename = roles.veteran; + _erole = eROLE.Veteran; + } else { + _rolename = roles.tactical; + _erole = eROLE.Tactical; + } break; case "assaults": _rolename = roles.assault; From df306e9b3e767030233210654f904ead92404508 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Sun, 4 May 2025 19:52:16 +0100 Subject: [PATCH 016/155] fix: Universal charisma tweak (#802) --- scripts/scr_marine_struct/scr_marine_struct.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index dbf3e81ea3..c79dc37087 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -71,7 +71,7 @@ global.base_stats = { dexterity: [40, 3], intelligence: [40, 3], wisdom: [40, 3], - charisma: [30, 5], + charisma: [32, 6], religion: "imperial_cult", piety: [30, 3], luck: 10, From 55e1cc5d833fa72e21511d918acbceebfcad084e Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 5 May 2025 01:56:10 +0100 Subject: [PATCH 017/155] fix: Train forces missionName print error (#804) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .../scr_mission_functions.gml | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 495f973e98..2aab02cdd7 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -257,6 +257,7 @@ function complete_train_forces_mission(targ_planet, problem_index){ var _mission_string = ""; var _trainer = collect_role_group("all",[name,targ_planet,0], false, man_conditions); if (array_length(_trainer)){ + var _unit_report_string = ""; var _tester = global.character_tester; var _wis_test_difficulty = -20; _trainer = _trainer[0]; @@ -284,10 +285,20 @@ function complete_train_forces_mission(targ_planet, problem_index){ var _new_pdf = planet.recruit_pdf((_unit_pass[1]/10));//this will approximate podf improvement for the time being _mission_string += $"Training of the Pdf went well and improved the quality of the pdf as well as providing sizeable big recruitment improvement for the planet {_new_pdf} new pdf were recruited"; if (_siege_master){ - _mission_string += "{_trainer.name()}s trained eye as a Siege Master also allowed him to make several improvements to the planets fortifications (fortification +1)"; - + _mission_string += $"{_trainer.name()}s trained eye as a Siege Master also allowed him to make several improvements to the planets fortifications (fortification +1)"; planet.alter_fortification(1); - } + } else { + if (roll_dice(1, 100) > 75 && _trainer.intelligence > 45){ + _mission_string += $"{_trainer.name()} has proven themselves a great strategist when it comes to defensive structures beyond previousy known "; + var _start_stats = variable_clone(_trainer.get_stat_line()); + _trainer.add_trait("siege_master"); + var end_stat = _trainer.get_stat_line(); + var _stat_diff = compare_stats(end_stat,_start_stats); + _unit_report_string += $"{_trainer.name_role()} Has gained the trait {global.trait_list.siege_master.display_name}, {(print_stat_diffs(_stat_diff))}\n"; + _mission_string += "The new insights have allowed for minor improvements to planetary fortifications (fortification +1)"; + planet.alter_fortification(1); + } + } } else { disp_loss = -5; _mission_string += "The orgional training mission was a failiure" @@ -314,7 +325,8 @@ function complete_train_forces_mission(targ_planet, problem_index){ } planet.add_disposition(disp_loss); } - scr_popup($"Training Forces on {planet_numeral_name(i)}",_mission_string,"",""); + _mission_string += $"\n{_unit_report_string}"; + scr_popup($"Training Forces on {planet.name()}",_mission_string,"",""); remove_planet_problem(targ_planet, "train_forces"); _trainer.job = "none"; } From 37222577116733a7484533af856757aa198b8283 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Mon, 5 May 2025 02:10:56 +0100 Subject: [PATCH 018/155] fix: Issue in cleanup with ships becoming dissociated from fleets (#805) --- .../scr_ini_ship_cleanup.gml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml index 63c5c47135..8cab32875a 100644 --- a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml +++ b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml @@ -52,7 +52,25 @@ function scr_kill_ship(index){ array_delete(_units_on_ship, 0, 1); } } - } + } + var _index = index; + with (obj_p_fleet){ + for (var i=0;i_index ){ + escort_num[i]--; + } + } + for (var i=0;i_index ){ + capital_num[i]--; + } + } + for (var i=0;i_index ){ + frigate_num[i]--; + } + } + } array_delete(ship,index,1); array_delete(ship_uid,index,1); array_delete(ship_owner,index,1); From 3126e9d6d22d4ec99ead919469a1a08cfb8dd30a Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 2 Jun 2024 19:19:36 +0100 Subject: [PATCH 019/155] tyranid fleet init --- scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml | 54 +++++++++++++++++++ .../scr_khornate_fleet_functions.gml | 2 + .../scr_planetary_feature.gml | 6 ++- .../scr_tyranid_fleet_functions.gml | 30 +++++++++++ .../scr_tyranid_fleet_functions.yy | 11 ++++ 5 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml create mode 100644 scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy diff --git a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml index 3ee0b01044..7f29e4c7a4 100644 --- a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml +++ b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml @@ -288,6 +288,60 @@ function scr_enemy_ai_b() { scr_alert("red", "owner", $"Massive heretic uprising on {n_name}.", x, y); scr_event_log("purple", $"Massive heretic uprising on {n_name}.", name); } // Huge uprising + } + // Genestealer cults grow in number + if (planet_feature_bool(p_feature[i], P_features.Gene_Stealer_Cult)){ + var cult = return_planet_features(p_feature[i], P_features.Gene_Stealer_Cult)[0]; + cult.cult_age++; + adjust_influence(eFACTION.Tyranids, cult.cult_age/100, i) + var planet_garrison = system_garrison[i-1]; + if (cult.hiding){ + var find_nid_chance = 50 - planet_garrison.total_garrison; + if (p_influence[i][eFACTION.Tyranids]>50){ + var find_cult_chance = irandom(50); + var alert_text = $"A hidden Genestealer Cult in {name} Has suddenly burst forth from hiding!" + if (planet_garrison.garrison_force){ + var alert_text = $"A hidden Genestealer Cult in {name} Has been discovered by marine garrison!" + find_cult_chance-=25; + } + if(find_cult_chance<1){ + cult.hiding=false; + scr_popup("System Lost",alert_text,"Genestealer Cult",""); + owner = eFACTION.Tyranids; + scr_event_log("red",$"A hidden Genestealer Cult in {name} {i} has Started a revolt.", name); + p_tyranids[i]+=1; + } + } + } + if (!cult.hiding) and (p_tyranids[i]<=3) and (p_type[i]!="Space Hulk") && (p_influence[i][eFACTION.Tyranids]>10){ + var spread=0; + rando=irandom(150); + rando-=p_influence[i][eFACTION.Tyranids]; + if (rando<=15) then spread=1; + + if (p_type[i]="Lava") and (p_tyranids[i]=2) then spread=0; + if ((p_type[i]="Ice") or (p_type[i]="Desert")) and (p_tyranids[i]=3) then spread=0; + + if (spread=1) then p_tyranids[i]+=1; + } + if (p_influence[i][eFACTION.Tyranids]>55){ + p_owner[i] = eFACTION.Tyranids; + } + if (p_influence[i][eFACTION.Tyranids]>90){ + if (!cult.hive_summoned){ + if (obj_controller.turn>30){ + if (irandom(20)==0){ + summon_new_hive_fleet(); + } + } + } + } + } else if (p_influence[i][eFACTION.Tyranids]>5){ + adjust_influence(eFACTION.Tyranids, -1, i); + if ((irandom(200)+(p_influence[i][eFACTION.Tyranids]/10)) > 195){ + array_push(p_feature[i], new new_planet_feature(P_features.Gene_Stealer_Cult)); + } + } if ((rando >= 100) && (p_traitors[i] < 5)) { p_traitors[i] = 6; diff --git a/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml b/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml index f28e62c35f..7336e8db71 100644 --- a/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml +++ b/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml @@ -220,6 +220,7 @@ function spawn_chaos_fleet_at_system(system){ } function spawn_chaos_warlord(){ with (obj_controller){ + with(obj_turn_end){ audiences+=1; audien[audiences]=10; @@ -255,6 +256,7 @@ function spawn_chaos_warlord(){ frigate_number=20; escort_number=40; } + var rep, filtered_array, candidate_systems; candidate_systems = []; with(obj_star){ diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 1fc2f626a3..47d2b2b56f 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -51,15 +51,17 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ } } switch(f_type){ - case P_features.Gene_Stealer_Cult: + case P_features.Gene_Stealer_Cult: PDF_control = 0; sealed = 0; - player_hidden = 1; + player_hidden = true; + hive_summoned=false; planet_display = "Genestealer Cult"; cult_age = 0; hiding=true; name = global.name_generator.generate_genestealer_cult_name(); break; + case P_features.Necron_Tomb: awake = 0; sealed = 0; diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml new file mode 100644 index 0000000000..7b96981666 --- /dev/null +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -0,0 +1,30 @@ +function find_nearest_edge_coords(x, y){ + function segment_nearest_point(a, b, point){ + var v = [a[0]-b[0], a[1]-b[1]]; + var u = [a[0] - point[0], a[1] - point[1]]; + + var vu = v[0] * u[0] + v[1] * u[1]; + + var vv = sqr(v[0]) + sqr(v[1]); + + var t = -vu / vv + + + } +} + + +summon_new_hive_fleet(){ + var _x_edge_distance; + var x_edge = x-(room_width/2); + y_edge = y-(room_height/2); + + fleet=instance_create(xx+32,yy,obj_en_fleet); + fleet.owner = eFACTION.Tyranids; + fleet.sprite_index=spr_fleet_tyranid; + fleet.image_index=1; + fleet.capital_number=5; + with (fleet){ + set_fleet_movement(); + } +} \ No newline at end of file diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy new file mode 100644 index 0000000000..5640056f1f --- /dev/null +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_tyranid_fleet_functions", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file From 5c953d738e5d101da33795f086bc35f57acb3073 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 2 Jun 2024 20:15:55 +0100 Subject: [PATCH 020/155] nid fleets added yay --- scripts/scr_cheatcode/scr_cheatcode.gml | 7 +++ .../scr_planetary_feature.gml | 22 ++++++++- .../scr_tyranid_fleet_functions.gml | 48 +++++++++++++------ 3 files changed, 61 insertions(+), 16 deletions(-) diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index af8412705b..f8ae71834c 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -343,6 +343,13 @@ function scr_cheatcode(argument0) { var _fleet = get_nearest_player_fleet(0,0); add_ship_to_fleet(new_player_ship("Gloriana"),_fleet); break; + if (cheatcode_string=="nidinvasion"){ + with (obj_star){ + if (system_feature_bool(p_feature,P_features.Gene_Stealer_Cult)){ + summon_new_hive_fleet(); + } + } + } } } diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 47d2b2b56f..46bb6b3da6 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -45,6 +45,7 @@ function PlayerForge() constructor{ // Function creates a new struct planet feature of a specified type function NewPlanetFeature(feature_type, other_data={}) constructor{ f_type = feature_type; + player_hidden=false; static reveal_to_player = function(){ if (player_hidden == 1){ player_hidden = 0; @@ -54,7 +55,7 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ case P_features.Gene_Stealer_Cult: PDF_control = 0; sealed = 0; - player_hidden = true; + player_hidden = false; hive_summoned=false; planet_display = "Genestealer Cult"; cult_age = 0; @@ -251,7 +252,7 @@ function delete_features(planet, del_feature){ // returns 1 if an awake necron tomb iin system function awake_necron_Star(star){ - for(var i = 1; i <= star.planets; i++){ + for(var i = 1; i <= star.planets; i++){ if(awake_tomb_world(star.p_feature[i]) == 1) { return i; @@ -260,6 +261,23 @@ function awake_necron_Star(star){ return 0 } +function planet_player_hidden_feature(planet){ + for (var i=0;i Date: Sun, 2 Jun 2024 23:32:52 +0100 Subject: [PATCH 021/155] build basic hive fleet infrustructure --- objects/obj_en_fleet/Alarm_1.gml | 8 +- objects/obj_en_fleet/Step_0.gml | 6 +- objects/obj_en_ship/Step_0.gml | 8 +- .../scr_tyranid_fleet_functions.gml | 194 +++++++++++++++++- 4 files changed, 205 insertions(+), 11 deletions(-) diff --git a/objects/obj_en_fleet/Alarm_1.gml b/objects/obj_en_fleet/Alarm_1.gml index 3816de9b42..a4c9bb74cd 100644 --- a/objects/obj_en_fleet/Alarm_1.gml +++ b/objects/obj_en_fleet/Alarm_1.gml @@ -841,7 +841,8 @@ if (action=="" && _is_orbiting){ if (owner == eFACTION.Tyranids) {// Juggle bio-resources if (capital_number*2>frigate_number){ - capital_number-=1;frigate_number+=2; + capital_number-=1; + frigate_number+=2; } if (capital_number*4>escort_number){ @@ -854,9 +855,10 @@ if (action=="" && _is_orbiting){ if (capital_number>0){ var capitals_engaged=0; + var caps = capital_number; with (orbiting){ for (var i=1;ix) and (bundy.y0) and (instance_exists(obj_p_ship)){ if ((string_count("Claws",wep)=1) or (string_count("endrils",wep)=1)) and (ok=3){ - if (target.shields<=0) then target.hp-=weapon_dam[wep]; - if (target.shields>0) then target.shields-=weapon_dam[wep]; + if (target.shields<=0) then target.hp-=weapon_dam[gg]; + if (target.shields>0) then target.shields-=weapon_dam[gg]; } if ((string_count("Interceptor",wep)=1) or (string_count("ommerz",wep)=1) or (string_count("Manta",wep)=1) or (string_count("Glands",wep)=1) or (string_count("Eldar Launch",wep)=1)) and (ok=3){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_in);bull.direction=self.direction;bull.owner=self.owner; + bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_in); + bull.direction=self.direction; + bull.owner=self.owner; } } } diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index eaff41f391..1a994904ef 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -34,8 +34,24 @@ function plus_or_minus_clamp(figure, variation, bottom,top){ function summon_new_hive_fleet(){ var start_coords = find_nearest_edge_coords(x,y); - if (start_coords[0] != 0) then start_coords[0] = plus_or_minus_clamp(start_coords[0], 50, 0, room_width); - if (start_coords[1] != 0) then start_coords[1] = plus_or_minus_clamp(start_coords[1], 50, 0, room_height); + if (start_coords[0] != 0 && start_coords[0]!= room_width){ + start_coords[0] = plus_or_minus_clamp(start_coords[0], 200, 0, room_width); + } else { + if (start_coords[0]==0){ + start_coords[0]+=100 + } else { + start_coords[0]-=100 + } + } + if (start_coords[1] != 0 && start_coords[1]!= room_height){ + start_coords[1] = plus_or_minus_clamp(start_coords[1], 200, 0, room_height); + } else { + if (start_coords[1]==0){ + start_coords[1]+=100 + } else { + start_coords[1]-=100 + } + } fleet=instance_create(start_coords[0],start_coords[1],obj_en_fleet); fleet.owner = eFACTION.Tyranids; @@ -44,7 +60,181 @@ function summon_new_hive_fleet(){ fleet.capital_number=5; fleet.action_x=x; fleet.action_y=y; + fleet.action=""; with (fleet){ set_fleet_movement(); } +} + + + +function nid_ship_weapons_set(weapon,slot){ + var weapons = { + "Feeder Tendrils":{ + weapon_facing : "most", + weapon_dam : 12, + weapon_range : 160, + weapon_cooldown : 30, + }, + "Bio-Plasma Discharge":{ + weapon_facing : "most", + weapon_dam : 10, + weapon_range : 260, + weapon_cooldown : 30, + }, + "Pyro-Acid Battery":{ + weapon_facing : "front", + weapon_dam : 18, + weapon_range : 500, + weapon_cooldown : 40, + }, + "Launch Glands":{ + weapon_facing : "special", + weapon_dam : 9999, + weapon_range : 6, + weapon_cooldown : 120, + }, + } + if (struct_exists(weapons, weapon)){ + var wep_choice = weapons[$ weapon]; + weapon[slot]=weapon; + weapon_facing[slot]=wep_choice.weapon_facing; + weapon_dam[slot]=wep_choice.weapon_dam; + weapon_range[slot]=wep_choice.weapon_range; + weapon_cooldown[slot]=wep_choice.weapon_cooldown; + } +} + + + +function set_nid_ships(){ + if (class="Leviathan"){ + sprite_index=spr_ship_leviathan; + ship_size=3; + name=""; + hp=1000; + maxhp=1000; + conditions=""; + shields=300; + maxshields=300; + leadership=100; + armour_front=7; + armour_other=5; + weapons=5; + turrets=3; + capacity=0; + carrying=0; + nid_ship_weapons_set("Feeder Tendrils", 1); + nid_ship_weapons_set("Bio-Plasma Discharge", 2); + nid_ship_weapons_set("Pyro-Acid Battery", 3); + nid_ship_weapons_set("Launch Glands", 4); + } + + else if (class="Razorfiend"){ + sprite_index=spr_ship_razorfiend; + ship_size=2; + name=""; + hp=600; + maxhp=600; + conditions=""; + shields=200; + maxshields=200; + leadership=100; + armour_front=5; + armour_other=4; + weapons=3; + turrets=2;capacity=0;carrying=0; + weapon[1]="Pyro-Acid Battery"; + weapon_facing[1]="front"; + weapon_dam[1]=12; + weapon_range[1]=300; + weapon_cooldown[1]=30; + weapon[2]="Feeder Tendrils"; + weapon_facing[2]="most"; + weapon_dam[2]=8; + weapon_range[2]=100; + weapon_cooldown[2]=30; + weapon[3]="Massive Claws"; + weapon_facing[3]="most"; + weapon_dam[3]=20; + weapon_range[3]=64; + weapon_cooldown[3]=60; + } + + if (class="Stalker"){ + sprite_index=spr_ship_stalker; + ship_size=1; + name=""; + hp=100; + maxhp=100; + conditions=""; + shields=100; + maxshields=100; + leadership=100; + armour_front=5; + armour_other=4; + weapons=1; + turrets=0;capacity=0;carrying=0; + weapon[1]="Pyro-Acid Battery"; + weapon_facing[1]="front"; + weapon_dam[1]=8; + weapon_range[1]=300; + weapon_cooldown[1]=60; + weapon[2]="Feeder Tendrils"; + weapon_facing[2]="most"; + weapon_dam[2]=8; + weapon_range[2]=100; + weapon_cooldown[2]=30; + weapon[3]="Bio-Plasma Discharge"; + weapon_facing[3]="front"; + weapon_dam[3]=6; + weapon_range[3]=200; + weapon_cooldown[3]=60; + } + + else if (class="Prowler"){ + sprite_index=spr_ship_prowler; + ship_size=1; + name=""; + hp=100; + maxhp=100; + conditions=""; + shields=100; + maxshields=100; + leadership=100; + armour_front=5; + armour_other=4; + weapons=1; + turrets=0;capacity=0;carrying=0; + weapon[1]="Pyro-acid Battery"; + weapon_facing[1]="most"; + weapon_dam[1]=8; + weapon_range[1]=300; + weapon_cooldown[1]=30; + weapon[2]="Feeder Tendrils"; + weapon_facing[2]="most"; + weapon_dam[2]=8; + weapon_range[2]=100; + weapon_cooldown[1]=30; + } + + + + + if (owner = eFACTION.Tyranids){ + var i=0; + repeat(2){ + i+=1; + if (obj_fleet.en_mutation[i]="Spore Clouds") then shields=shields+100; + if (obj_fleet.en_mutation[i]="Health"){ + hp=floor(hp*1.1); + maxhp=hp; + } + if (obj_fleet.en_mutation[i]="Armour") then armour_front+=1; + if (obj_fleet.en_mutation[i]="Speed") then speed_bonus=speed_bonus*1.1; + if (obj_fleet.en_mutation[i]="Turn") then turn_bonus=1.2; + if (obj_fleet.en_mutation[i]="Turret") then turrets+=1; + } + } + } \ No newline at end of file From 85172f2da0657fad6c33af44457cc830c92b6205 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 3 Jun 2024 00:24:36 +0100 Subject: [PATCH 022/155] more tweaks for hive fleet intergration --- objects/obj_en_fleet/Alarm_1.gml | 111 +++-------- objects/obj_en_ship/Alarm_0.gml | 182 +----------------- scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml | 53 +++-- .../scr_tyranid_fleet_functions.gml | 131 ++++++++++--- 4 files changed, 158 insertions(+), 319 deletions(-) diff --git a/objects/obj_en_fleet/Alarm_1.gml b/objects/obj_en_fleet/Alarm_1.gml index a4c9bb74cd..e74b8afe7f 100644 --- a/objects/obj_en_fleet/Alarm_1.gml +++ b/objects/obj_en_fleet/Alarm_1.gml @@ -839,93 +839,30 @@ if (action=="" && _is_orbiting){ }*/ } - if (owner == eFACTION.Tyranids) {// Juggle bio-resources - if (capital_number*2>frigate_number){ - capital_number-=1; - frigate_number+=2; - } - - if (capital_number*4>escort_number){ - var rand; - rand=choose(1,2,3,4); - if (rand=4) then escort_number+=1; - } - - - - if (capital_number>0){ - var capitals_engaged=0; - var caps = capital_number; - with (orbiting){ - for (var i=1;i5) then n=5; - - instance_deactivate_object(orbiting); - - repeat(100){ - if (good!=5){ - xx=self.x+random_range(-300,300); - yy=self.y+random_range(-300,300); - if (good=0) then plin=instance_nearest(xx,yy,obj_star); - if (good=1) and (n=5) then plin2=instance_nearest(xx,yy,obj_star); - - good = !array_contains(plin.p_type, "dead"); - - if (good=1) and (n=5){ - if (!instance_exists(plin2)) then break; - if (!array_contains(plin.p_type, "dead")) then good++ - - var new_fleet; - new_fleet=instance_create(x,y,obj_en_fleet); - new_fleet.capital_number=floor(capital_number*0.4); - new_fleet.frigate_number=floor(frigate_number*0.4); - new_fleet.escort_number=floor(escort_number*0.4); - - capital_number-=new_fleet.capital_number; - frigate_number-=new_fleet.frigate_number; - escort_number-=new_fleet.escort_number; - - new_fleet.owner=eFACTION.Tyranids; - new_fleet.sprite_index=spr_fleet_tyranid; - new_fleet.image_index=1; - - /*with(new_fleet){ - var ii;ii=0;ii+=capital_number;ii+=round((frigate_number/2));ii+=round((escort_number/4)); - if (ii<=1) then ii=1;image_index=ii; - }*/ - - new_fleet.action_x=plin2.x; - new_fleet.action_y=plin2.y; - new_fleet.alarm[4]=1; - break; - } - - - if (good=1) and (instance_exists(plin)){action_x=plin.x;action_y=plin.y;alarm[4]=1;if (n!=5) then good=5;} - } - } - instance_activate_object(obj_star); - } + if (owner = eFACTION.Tyranids) {// Juggle sbio-resources + orbiting = instance_nearest(x,y,obj_star); + if (point_distance(orbiting.x,orbiting.y,x,y)<100){ + var is_dead=false; + with (orbiting){ + is_dead = is_dead_star(); + if (!is_dead) { + for (var i=1;i50){ + var alert = $"The Genestealer Cult on {planet_numeral_name(i)} is exceedingly thorough, there is almost no resistance as the swarm descends and what little resistance remains is quickly quelled by infiltrators, most of the populations willingly offer themselves to their new gods jumping into acid vats to form biomass for their newly arrived gods or otherwise allowing themselves to be devoured by the teaming ripper swarms"; + scr_popup("Tyranids",alert,"",""); + scr_alert("red","owner",$"Tyranid swarms begin the process of stripping {planet_numeral_name(i)} for biomass",x,y); + } else { + scr_alert("red","owner",$"The pdf of {planet_numeral_name(i)} is badly degraded by genestealer cult forces as the hive fleet decends",x,y); + p_pdf[i]*=(p_influence[i][eFACTION.Tyranids]/100); + } + delete_features(p_feature[i], P_features.Gene_Stealer_Cult); + } + } + } + } + } + organise_tyranid_fleet_bio(); } } diff --git a/objects/obj_en_ship/Alarm_0.gml b/objects/obj_en_ship/Alarm_0.gml index ce2ca6378e..9437f214f4 100644 --- a/objects/obj_en_ship/Alarm_0.gml +++ b/objects/obj_en_ship/Alarm_0.gml @@ -899,190 +899,10 @@ if (class="Iconoclast"){sprite_index=spr_ship_icono; } // Tyranids - -if (class="Leviathan"){sprite_index=spr_ship_leviathan; - ship_size=3; - - name=""; - hp=1000; - maxhp=1000; - conditions=""; - shields=300; - maxshields=300; - leadership=100; - - armour_front=7; - armour_other=5; - weapons=5; - turrets=3; - capacity=0; - carrying=0; - - weapon[1]="Feeder Tendrils"; - weapon_facing[1]="most"; - weapon_dam[1]=12; - weapon_range[1]=160; - weapon_cooldown[1]=30; - - weapon[2]="Bio-Plasma Discharge"; - weapon_facing[2]="most"; - weapon_dam[2]=10; - weapon_range[2]=260; - weapon_cooldown[2]=30; - - weapon[3]="Pyro-Acid Battery"; - weapon_facing[3]="front"; - weapon_dam[3]=18; - weapon_range[3]=500; - weapon_cooldown[3]=40; - - weapon[4]="Launch Glands"; - weapon_facing[4]="special"; - weapon_range[4]=9999; - weapon_ammo[4]=6; - weapon_cooldown[4]=120; - -} - -if (class="Razorfiend"){sprite_index=spr_ship_razorfiend; - ship_size=2; - - name=""; - hp=600; - maxhp=600; - conditions=""; - shields=200; - maxshields=200; - leadership=100; - - armour_front=5; - armour_other=4; - weapons=3; - turrets=2; - capacity=0; - carrying=0; - - weapon[1]="Pyro-Acid Battery"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=300; - weapon_cooldown[1]=30; - - weapon[2]="Feeder Tendrils"; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=100; - weapon_cooldown[2]=30; - - weapon[3]="Massive Claws"; - weapon_facing[3]="most"; - weapon_dam[3]=20; - weapon_range[3]=64; - weapon_cooldown[3]=60; - -} - -if (class="Stalker"){sprite_index=spr_ship_stalker; - ship_size=1; - - name=""; - hp=100; - maxhp=100; - conditions=""; - shields=100; - maxshields=100; - leadership=100; - - armour_front=5; - armour_other=4; - weapons=1; - turrets=0; - capacity=0; - carrying=0; - - weapon[1]="Pyro-Acid Battery"; - weapon_facing[1]="front"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=60; - - weapon[2]="Feeder Tendrils"; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=100; - weapon_cooldown[2]=30; - - weapon[3]="Bio-Plasma Discharge"; - weapon_facing[3]="front"; - weapon_dam[3]=6; - weapon_range[3]=200; - weapon_cooldown[3]=60; - -} - -if (class="Prowler"){sprite_index=spr_ship_prowler; - ship_size=1; - - name=""; - hp=100; - maxhp=100; - conditions=""; - shields=100; - maxshields=100; - leadership=100; - - armour_front=5; - armour_other=4; - weapons=1; - turrets=0; - capacity=0; - carrying=0; - - weapon[1]="Pyro-acid Battery"; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=30; - - weapon[2]="Feeder Tendrils"; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=100; - weapon_cooldown[1]=30; - -} - - - - if (owner = eFACTION.Tyranids){ - var i; - i=0; - - repeat(2){ - i+=1; - - if (obj_fleet.en_mutation[i]="Spore Clouds") then shields=shields+100; - - if (obj_fleet.en_mutation[i]="Health"){hp=floor(hp*1.1); - maxhp=hp; - } - if (obj_fleet.en_mutation[i]="Armour") then armour_front+=1; - - if (obj_fleet.en_mutation[i]="Speed") then speed_bonus=speed_bonus*1.1; - - if (obj_fleet.en_mutation[i]="Turn") then turn_bonus=1.2; - - if (obj_fleet.en_mutation[i]="Turret") then turrets+=1; - - } + set_nid_ships(); } - - - - - // Necrons if (class="Cairn Class"){sprite_index=spr_ship_cairn; ship_size=3; diff --git a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml index 62cdffeac2..38ccd75012 100644 --- a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml +++ b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml @@ -333,35 +333,30 @@ function scr_enemy_ai_c() { var ship=scr_orbiting_fleet(eFACTION.Tyranids); if (ship!="none") and (p_type[i]!="Dead") and (array_length(p_feature[i])!=0){ if (ship.capital_number>0){ - if (planet_feature_bool(p_feature[i], P_features.Reclamation_pools) ==1){ - p_tyranids[i]=0; - if (p_type[i]="Death") or (p_type[i]="Hive") then ship.capital_number+=choose(0,1,1); - ship.capital_number+=1; - ship.escort_number+=3; - ship.image_index=floor((ship.capital_number)+(ship.frigate_number/2)+(ship.escort_number/4)); - p_type[i]="Dead"; - delete_features(p_feature[i], P_features.Reclamation_pools);// show_message("D"); - if (planets=1) and (p_type[1]="Dead") then image_alpha=0.33; - if (planets=2) and (p_type[1]="Dead") and (p_type[2]="Dead") then image_alpha=0.33; - if (planets=3) and (p_type[1]="Dead") and (p_type[2]="Dead") and (p_type[3]="Dead") then image_alpha=0.33; - if (planets=4) and (p_type[1]="Dead") and (p_type[2]="Dead") and (p_type[3]="Dead") and (p_type[4]="Dead") then image_alpha=0.33; - - - // if image_alpha = 0.33 then send the ship somewhere new - - } - if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ - p_population[i]=floor(p_population[i]*0.3); - } - if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ - p_feature[i]=[]; - array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers), new NewPlanetFeature(P_features.Reclamation_pools)); - p_population[i]=0;// show_message("C"); - } - if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==0) and (planet_feature_bool(p_feature[i], P_features.Reclamation_pools)==0) and (p_type[i]!="Dead"){ - array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers));// show_message("B"); - } - } + if (planet_feature_bool(p_feature[i], P_features.Reclamation_pools) ==1){ + p_tyranids[i]=0; + if (p_type[i]="Death") or (p_type[i]="Hive") then ship.capital_number+=choose(0,1,1); + ship.capital_number+=1; + ship.escort_number+=3; + ship.image_index=floor((ship.capital_number)+(ship.frigate_number/2)+(ship.escort_number/4)); + p_type[i]="Dead"; + delete_features(p_feature[i], P_features.Reclamation_pools);// show_message("D"); + if (is_dead_star()) then image_alpha=0.33; + + // if image_alpha = 0.33 then send the ship somewhere new + + } + if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ + p_population[i]=floor(p_population[i]*0.3); + } + if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ + p_feature[i]=[]; + array_push(p_feature[i], new new_planet_feature(P_features.Capillary_Towers), new new_planet_feature(P_features.Reclamation_pools)); + p_population[i]=0;// show_message("C"); + } + if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==0) and (planet_feature_bool(p_feature[i], P_features.Reclamation_pools)==0) and (p_type[i]!="Dead"){ + array_push(p_feature[i], new new_planet_feature(P_features.Capillary_Towers));// show_message("B"); + } } } } diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index 1a994904ef..1bf7a4c84a 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -54,19 +54,108 @@ function summon_new_hive_fleet(){ } fleet=instance_create(start_coords[0],start_coords[1],obj_en_fleet); - fleet.owner = eFACTION.Tyranids; - fleet.sprite_index=spr_fleet_tyranid; - fleet.image_index=1; - fleet.capital_number=5; - fleet.action_x=x; - fleet.action_y=y; - fleet.action=""; + fleet.action_x=x; + fleet.action_y=y; with (fleet){ + owner = eFACTION.Tyranids; + sprite_index=spr_fleet_tyranid; + image_index=1; + capital_number=5; + action=""; + action_spd = 10; set_fleet_movement(); } } +function organise_tyranid_fleet_bio(){ + if (capital_number*2>frigate_number){ + capital_number-=1; + frigate_number+=2; + } + + if (capital_number*4>escort_number){ + var rand=choose(1,2,3,4); + if (rand=4) then escort_number+=1; + } + + + + if (capital_number>0){ + var capitals_engaged=0; + var caps = capital_number; + with (orbiting){ + for (var i=1;i5) then n=5; + + instance_deactivate_object(orbiting); + + repeat(100){ + if (good!=5){ + xx=self.x+random_range(-300,300); + yy=self.y+random_range(-300,300); + if (good=0) then plin=instance_nearest(xx,yy,obj_star); + if (good=1) and (n=5) then plin2=instance_nearest(xx,yy,obj_star); + + good = !array_contains(plin.p_type, "dead"); + + if (good=1) and (n=5){ + if (!instance_exists(plin2)) then break; + if (!array_contains(plin.p_type, "dead")) then good++ + + var new_fleet; + new_fleet=instance_create(x,y,obj_en_fleet); + new_fleet.capital_number=floor(capital_number*0.4); + new_fleet.frigate_number=floor(frigate_number*0.4); + new_fleet.escort_number=floor(escort_number*0.4); + + capital_number-=new_fleet.capital_number; + frigate_number-=new_fleet.frigate_number; + escort_number-=new_fleet.escort_number; + + new_fleet.owner=eFACTION.Tyranids; + new_fleet.sprite_index=spr_fleet_tyranid; + new_fleet.image_index=1; + + /*with(new_fleet){ + var ii;ii=0;ii+=capital_number;ii+=round((frigate_number/2));ii+=round((escort_number/4)); + if (ii<=1) then ii=1;image_index=ii; + }*/ + + new_fleet.action_x=plin2.x; + new_fleet.action_y=plin2.y; + with (new_fleet){ + set_fleet_movement(); + } + break; + } + + + if (good=1) and (instance_exists(plin)){action_x=plin.x;action_y=plin.y;alarm[4]=1;if (n!=5) then good=5;} + } + } + instance_activate_object(obj_star); + } + } function nid_ship_weapons_set(weapon,slot){ var weapons = { @@ -221,20 +310,18 @@ function set_nid_ships(){ - if (owner = eFACTION.Tyranids){ - var i=0; - repeat(2){ - i+=1; - if (obj_fleet.en_mutation[i]="Spore Clouds") then shields=shields+100; - if (obj_fleet.en_mutation[i]="Health"){ - hp=floor(hp*1.1); - maxhp=hp; - } - if (obj_fleet.en_mutation[i]="Armour") then armour_front+=1; - if (obj_fleet.en_mutation[i]="Speed") then speed_bonus=speed_bonus*1.1; - if (obj_fleet.en_mutation[i]="Turn") then turn_bonus=1.2; - if (obj_fleet.en_mutation[i]="Turret") then turrets+=1; - } - } + var i=0; + repeat(2){ + i+=1; + if (obj_fleet.en_mutation[i]=="Spore Clouds") then shields=shields+100; + if (obj_fleet.en_mutation[i]=="Health"){ + hp=floor(hp*1.1); + maxhp=hp; + } + if (obj_fleet.en_mutation[i]=="Armour") then armour_front+=1; + if (obj_fleet.en_mutation[i]=="Speed") then speed_bonus=speed_bonus*1.1; + if (obj_fleet.en_mutation[i]=="Turn") then turn_bonus=1.2; + if (obj_fleet.en_mutation[i]=="Turret") then turrets+=1; + } } \ No newline at end of file From 08cb4c17de873e2efcea8c76bff12c0d08265477 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 29 Apr 2025 22:17:44 +0100 Subject: [PATCH 023/155] merge issues --- ChapterMaster.yyp | 1 + scripts/scr_cheatcode/scr_cheatcode.gml | 17 +++-- scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml | 71 +++---------------- scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml | 10 +-- .../scr_tyranid_fleet_functions.yy | 16 ++--- sprites/spr_bionics_hand/spr_bionics_hand.yy | 2 + .../spr_weapon_powmace/spr_weapon_powmace.yy | 2 + 7 files changed, 34 insertions(+), 85 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index fc43a26f14..954c9c0081 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -720,6 +720,7 @@ {"id":{"name":"object_get_depth","path":"scripts/object_get_depth/object_get_depth.yy",},}, {"id":{"name":"relative_direction","path":"scripts/relative_direction/relative_direction.yy",},}, {"id":{"name":"scr_add_artifact","path":"scripts/scr_add_artifact/scr_add_artifact.yy",},}, + {"id":{"name":"scr_tyranid_fleet_functions","path":"scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy",},}, {"id":{"name":"scr_add_corruption","path":"scripts/scr_add_corruption/scr_add_corruption.yy",},}, {"id":{"name":"scr_add_item","path":"scripts/scr_add_item/scr_add_item.yy",},}, {"id":{"name":"scr_add_man","path":"scripts/scr_add_man/scr_add_man.yy",},}, diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index f8ae71834c..3e61314b70 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -142,7 +142,7 @@ function scr_cheatcode(argument0) { case "mechmission": show_debug_message("mech_mission"); spawn_mechanicus_mission(); - break; + break; case "inquismission": var mission = cheat_arguments[0]; @@ -343,16 +343,15 @@ function scr_cheatcode(argument0) { var _fleet = get_nearest_player_fleet(0,0); add_ship_to_fleet(new_player_ship("Gloriana"),_fleet); break; - if (cheatcode_string=="nidinvasion"){ - with (obj_star){ - if (system_feature_bool(p_feature,P_features.Gene_Stealer_Cult)){ - summon_new_hive_fleet(); - } + case "nidinvasion": + with (obj_star){ + if (system_feature_bool(p_feature,P_features.Gene_Stealer_Cult)){ + summon_new_hive_fleet(); + } + } + break; } } - - } - } } catch(_exception) { show_debug_message(_exception.longMessage); } diff --git a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml index 7f29e4c7a4..aa12a9ff08 100644 --- a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml +++ b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml @@ -18,7 +18,7 @@ function scr_enemy_ai_b() { total_garrison = cur_garrison.total_garrison; is_garrison_force = cur_garrison.garrison_force; - var planet_string = $"{string(name)} {scr_roman_numerals()[i - 1]}"; + var planet_string = planet_numeral_name(i); // Orks grow in number var ork_growth = floor(random(100)) + 1; success = false; // This part handles the increasing in numbers @@ -288,61 +288,6 @@ function scr_enemy_ai_b() { scr_alert("red", "owner", $"Massive heretic uprising on {n_name}.", x, y); scr_event_log("purple", $"Massive heretic uprising on {n_name}.", name); } // Huge uprising - } - // Genestealer cults grow in number - if (planet_feature_bool(p_feature[i], P_features.Gene_Stealer_Cult)){ - var cult = return_planet_features(p_feature[i], P_features.Gene_Stealer_Cult)[0]; - cult.cult_age++; - adjust_influence(eFACTION.Tyranids, cult.cult_age/100, i) - var planet_garrison = system_garrison[i-1]; - if (cult.hiding){ - var find_nid_chance = 50 - planet_garrison.total_garrison; - if (p_influence[i][eFACTION.Tyranids]>50){ - var find_cult_chance = irandom(50); - var alert_text = $"A hidden Genestealer Cult in {name} Has suddenly burst forth from hiding!" - if (planet_garrison.garrison_force){ - var alert_text = $"A hidden Genestealer Cult in {name} Has been discovered by marine garrison!" - find_cult_chance-=25; - } - if(find_cult_chance<1){ - cult.hiding=false; - scr_popup("System Lost",alert_text,"Genestealer Cult",""); - owner = eFACTION.Tyranids; - scr_event_log("red",$"A hidden Genestealer Cult in {name} {i} has Started a revolt.", name); - p_tyranids[i]+=1; - } - } - } - if (!cult.hiding) and (p_tyranids[i]<=3) and (p_type[i]!="Space Hulk") && (p_influence[i][eFACTION.Tyranids]>10){ - var spread=0; - rando=irandom(150); - rando-=p_influence[i][eFACTION.Tyranids]; - if (rando<=15) then spread=1; - - if (p_type[i]="Lava") and (p_tyranids[i]=2) then spread=0; - if ((p_type[i]="Ice") or (p_type[i]="Desert")) and (p_tyranids[i]=3) then spread=0; - - if (spread=1) then p_tyranids[i]+=1; - } - if (p_influence[i][eFACTION.Tyranids]>55){ - p_owner[i] = eFACTION.Tyranids; - } - if (p_influence[i][eFACTION.Tyranids]>90){ - if (!cult.hive_summoned){ - if (obj_controller.turn>30){ - if (irandom(20)==0){ - summon_new_hive_fleet(); - } - } - } - } - } else if (p_influence[i][eFACTION.Tyranids]>5){ - adjust_influence(eFACTION.Tyranids, -1, i); - if ((irandom(200)+(p_influence[i][eFACTION.Tyranids]/10)) > 195){ - array_push(p_feature[i], new new_planet_feature(P_features.Gene_Stealer_Cult)); - } - } - if ((rando >= 100) && (p_traitors[i] < 5)) { p_traitors[i] = 6; p_owner[i] = 10; @@ -361,11 +306,10 @@ function scr_enemy_ai_b() { scr_alert("red", "owner", tixt, x, y); scr_event_log("purple", tixt, name); } - // if (p_traitors[i]>2){obj_controller.x=self.x;obj_controller.y=self.y;} - } // End traitors cult - } - // Genestealer cults grow in number - if (planet_feature_bool(p_feature[i], P_features.Gene_Stealer_Cult)) { + } + } + // Genestealer cults grow in number + if (planet_feature_bool(p_feature[i], P_features.Gene_Stealer_Cult)) { var cult = return_planet_features(p_feature[i], P_features.Gene_Stealer_Cult)[0]; cult.cult_age++; adjust_influence(eFACTION.Tyranids, cult.cult_age / 100, i); @@ -387,7 +331,7 @@ function scr_enemy_ai_b() { p_tyranids[i] += 1; } } - } + } if ((!cult.hiding) && (p_tyranids[i] <= 3) && (p_type[i] != "Space Hulk") && (p_influence[i][eFACTION.Tyranids] > 10)) { var spread = 0; rando = irandom(150); @@ -402,7 +346,7 @@ function scr_enemy_ai_b() { if (((p_type[i] == "Ice") || (p_type[i] == "Desert")) && (p_tyranids[i] == 3)) { spread = 0; } - + if (spread == 1) { p_tyranids[i] += 1; } @@ -417,6 +361,7 @@ function scr_enemy_ai_b() { } } + // Spread influence on controlled sector if ((p_type[i] != "Space Hulk") && (p_type[i] != "Dead")) { if ((p_heresy[i] < 70) && (owner == 10)) { diff --git a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml index 38ccd75012..f21ffc8b38 100644 --- a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml +++ b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml @@ -328,11 +328,10 @@ function scr_enemy_ai_c() { // Tyranids here var i=0; - repeat(planets){i+=1; + for (var i=1;i=5) and (planets>=i) and (p_player[i]+p_orks[i]+p_guardsmen[i]+p_pdf[i]+p_chaos[i]=0){ var ship=scr_orbiting_fleet(eFACTION.Tyranids); - if (ship!="none") and (p_type[i]!="Dead") and (array_length(p_feature[i])!=0){ - if (ship.capital_number>0){ + if (ship!="none") and (p_type[i]!="Dead") and (array_length(p_feature[i])!=0 && ship.capital_number){ if (planet_feature_bool(p_feature[i], P_features.Reclamation_pools) ==1){ p_tyranids[i]=0; if (p_type[i]="Death") or (p_type[i]="Hive") then ship.capital_number+=choose(0,1,1); @@ -351,12 +350,13 @@ function scr_enemy_ai_c() { } if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ p_feature[i]=[]; - array_push(p_feature[i], new new_planet_feature(P_features.Capillary_Towers), new new_planet_feature(P_features.Reclamation_pools)); + array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers), new NewPlanetFeature(P_features.Reclamation_pools)); p_population[i]=0;// show_message("C"); } if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==0) and (planet_feature_bool(p_feature[i], P_features.Reclamation_pools)==0) and (p_type[i]!="Dead"){ - array_push(p_feature[i], new new_planet_feature(P_features.Capillary_Towers));// show_message("B"); + array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers));// show_message("B"); } + } } } diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy index 5640056f1f..2292a75a38 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy @@ -1,11 +1,11 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_tyranid_fleet_functions", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", + "isCompatibility":false, + "isDnD":false, + "name":"scr_tyranid_fleet_functions", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", }, + "resourceType":"GMScript", + "resourceVersion":"1.0", } \ No newline at end of file diff --git a/sprites/spr_bionics_hand/spr_bionics_hand.yy b/sprites/spr_bionics_hand/spr_bionics_hand.yy index 1c02cba130..3ec05afc04 100644 --- a/sprites/spr_bionics_hand/spr_bionics_hand.yy +++ b/sprites/spr_bionics_hand/spr_bionics_hand.yy @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy index 643716c4fe..2655b390b1 100644 --- a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy +++ b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, From 299036afe07b524425079d508ca0e774b18da164 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 30 Apr 2025 20:02:32 +0100 Subject: [PATCH 024/155] tyranid planet functions --- ChapterMaster.yyp | 3 +- objects/obj_en_fleet/Alarm_1.gml | 24 +---------- objects/obj_garbage_collector/Step_0.gml | 2 +- scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml | 41 ++----------------- .../scr_tyranid_fleet_functions.gml | 25 +++++++++++ .../scr_tyranid_fleet_functions.yy | 4 +- .../scr_tyranid_planet_functions.gml | 36 ++++++++++++++++ .../scr_tyranid_planet_functions.yy | 13 ++++++ 8 files changed, 84 insertions(+), 64 deletions(-) create mode 100644 scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml create mode 100644 scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 954c9c0081..558dba7204 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -720,7 +720,6 @@ {"id":{"name":"object_get_depth","path":"scripts/object_get_depth/object_get_depth.yy",},}, {"id":{"name":"relative_direction","path":"scripts/relative_direction/relative_direction.yy",},}, {"id":{"name":"scr_add_artifact","path":"scripts/scr_add_artifact/scr_add_artifact.yy",},}, - {"id":{"name":"scr_tyranid_fleet_functions","path":"scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy",},}, {"id":{"name":"scr_add_corruption","path":"scripts/scr_add_corruption/scr_add_corruption.yy",},}, {"id":{"name":"scr_add_item","path":"scripts/scr_add_item/scr_add_item.yy",},}, {"id":{"name":"scr_add_man","path":"scripts/scr_add_man/scr_add_man.yy",},}, @@ -910,6 +909,8 @@ {"id":{"name":"scr_trade_dep","path":"scripts/scr_trade_dep/scr_trade_dep.yy",},}, {"id":{"name":"scr_trade","path":"scripts/scr_trade/scr_trade.yy",},}, {"id":{"name":"scr_turn_first","path":"scripts/scr_turn_first/scr_turn_first.yy",},}, + {"id":{"name":"scr_tyranid_fleet_functions","path":"scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy",},}, + {"id":{"name":"scr_tyranid_planet_functions","path":"scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.yy",},}, {"id":{"name":"scr_ui_advisors","path":"scripts/scr_ui_advisors/scr_ui_advisors.yy",},}, {"id":{"name":"scr_ui_diplomacy","path":"scripts/scr_ui_diplomacy/scr_ui_diplomacy.yy",},}, {"id":{"name":"scr_ui_display_weapons","path":"scripts/scr_ui_display_weapons/scr_ui_display_weapons.yy",},}, diff --git a/objects/obj_en_fleet/Alarm_1.gml b/objects/obj_en_fleet/Alarm_1.gml index e74b8afe7f..24e1b427ae 100644 --- a/objects/obj_en_fleet/Alarm_1.gml +++ b/objects/obj_en_fleet/Alarm_1.gml @@ -840,29 +840,7 @@ if (action=="" && _is_orbiting){ } if (owner = eFACTION.Tyranids) {// Juggle sbio-resources - orbiting = instance_nearest(x,y,obj_star); - if (point_distance(orbiting.x,orbiting.y,x,y)<100){ - var is_dead=false; - with (orbiting){ - is_dead = is_dead_star(); - if (!is_dead) { - for (var i=1;i50){ - var alert = $"The Genestealer Cult on {planet_numeral_name(i)} is exceedingly thorough, there is almost no resistance as the swarm descends and what little resistance remains is quickly quelled by infiltrators, most of the populations willingly offer themselves to their new gods jumping into acid vats to form biomass for their newly arrived gods or otherwise allowing themselves to be devoured by the teaming ripper swarms"; - scr_popup("Tyranids",alert,"",""); - scr_alert("red","owner",$"Tyranid swarms begin the process of stripping {planet_numeral_name(i)} for biomass",x,y); - } else { - scr_alert("red","owner",$"The pdf of {planet_numeral_name(i)} is badly degraded by genestealer cult forces as the hive fleet decends",x,y); - p_pdf[i]*=(p_influence[i][eFACTION.Tyranids]/100); - } - delete_features(p_feature[i], P_features.Gene_Stealer_Cult); - } - } - } - } - } - organise_tyranid_fleet_bio(); + tyranid_fleet_planet_action(); } } diff --git a/objects/obj_garbage_collector/Step_0.gml b/objects/obj_garbage_collector/Step_0.gml index 88117f46f7..973cb5e1fc 100644 --- a/objects/obj_garbage_collector/Step_0.gml +++ b/objects/obj_garbage_collector/Step_0.gml @@ -4,7 +4,7 @@ if (gc_timer > 0) { } else { - gc_timer = 50; // Default is every frame, so de-facto 1; + gc_timer = 50000; // Default is every frame, so de-facto 1; gc_collect(); wait_and_execute(0, function(){ diff --git a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml index f21ffc8b38..6a505b0cf3 100644 --- a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml +++ b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml @@ -221,7 +221,8 @@ function scr_enemy_ai_c() { - contin=0;rando=floor(random(100))+1;// This part handles the ship building + contin=0; + rando=floor(random(100))+1;// This part handles the ship building if (planets=1) and (p_owner[1]=8) then contin=1; if (planets=2) and (p_owner[1]=8) and (p_owner[2]=8) then contin=1; @@ -324,43 +325,7 @@ function scr_enemy_ai_c() { } } - - - // Tyranids here - var i=0; - for (var i=1;i=5) and (planets>=i) and (p_player[i]+p_orks[i]+p_guardsmen[i]+p_pdf[i]+p_chaos[i]=0){ - var ship=scr_orbiting_fleet(eFACTION.Tyranids); - if (ship!="none") and (p_type[i]!="Dead") and (array_length(p_feature[i])!=0 && ship.capital_number){ - if (planet_feature_bool(p_feature[i], P_features.Reclamation_pools) ==1){ - p_tyranids[i]=0; - if (p_type[i]="Death") or (p_type[i]="Hive") then ship.capital_number+=choose(0,1,1); - ship.capital_number+=1; - ship.escort_number+=3; - ship.image_index=floor((ship.capital_number)+(ship.frigate_number/2)+(ship.escort_number/4)); - p_type[i]="Dead"; - delete_features(p_feature[i], P_features.Reclamation_pools);// show_message("D"); - if (is_dead_star()) then image_alpha=0.33; - - // if image_alpha = 0.33 then send the ship somewhere new - - } - if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ - p_population[i]=floor(p_population[i]*0.3); - } - if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ - p_feature[i]=[]; - array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers), new NewPlanetFeature(P_features.Reclamation_pools)); - p_population[i]=0;// show_message("C"); - } - if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==0) and (planet_feature_bool(p_feature[i], P_features.Reclamation_pools)==0) and (p_type[i]!="Dead"){ - array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers));// show_message("B"); - } - - } - } - } - + tyranids_planet_biomass_extraction(); with(obj_star){ diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index 1bf7a4c84a..4e2e30e215 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -31,6 +31,31 @@ function plus_or_minus_clamp(figure, variation, bottom,top){ return clamp(plus_or_minus_rand(figure, variation), bottom,top); } +function tyranid_fleet_planet_action(){ + + var is_dead=false; + with (orbiting){ + is_dead = is_dead_star(); + if (!is_dead) { + for (var i=1;i50){ + var alert = $"The Genestealer Cult on {planet_numeral_name(i)} is exceedingly thorough, there is almost no resistance as the swarm descends and what little resistance remains is quickly quelled by infiltrators, most of the populations willingly offer themselves to their new gods jumping into acid vats to form biomass for their newly arrived gods or otherwise allowing themselves to be devoured by the teaming ripper swarms"; + scr_popup("Tyranids",alert,"",""); + scr_alert("red","owner",$"Tyranid swarms begin the process of stripping {planet_numeral_name(i)} for biomass",x,y); + } else { + scr_alert("red","owner",$"The pdf of {planet_numeral_name(i)} is badly degraded by genestealer cult forces as the hive fleet decends",x,y); + scr_popup("Tyranids",scr_alert,"",""); + p_pdf[i]*=(p_influence[i][eFACTION.Tyranids]/100); + } + delete_features(p_feature[i], P_features.Gene_Stealer_Cult); + } + } + } + } + organise_tyranid_fleet_bio(); +} + function summon_new_hive_fleet(){ var start_coords = find_nearest_edge_coords(x,y); diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy index 2292a75a38..5b82ba2b58 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy @@ -1,4 +1,6 @@ { + "$GMScript":"v1", + "%Name":"scr_tyranid_fleet_functions", "isCompatibility":false, "isDnD":false, "name":"scr_tyranid_fleet_functions", @@ -7,5 +9,5 @@ "path":"folders/Scripts.yy", }, "resourceType":"GMScript", - "resourceVersion":"1.0", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml new file mode 100644 index 0000000000..a6aa1f54fe --- /dev/null +++ b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml @@ -0,0 +1,36 @@ +function tyranids_planet_biomass_extraction(){ + // Tyranids here + var i=0; + for (var i=1;i=5) and (planets>=i) and (p_player[i]+p_orks[i]+p_guardsmen[i]+p_pdf[i]+p_chaos[i]=0){ + var ship=scr_orbiting_fleet(eFACTION.Tyranids); + if (ship!="none") and (p_type[i]!="Dead") and (array_length(p_feature[i])!=0 && ship.capital_number){ + if (planet_feature_bool(p_feature[i], P_features.Reclamation_pools) ==1){ + p_tyranids[i]=0; + if (p_type[i]="Death") or (p_type[i]="Hive") then ship.capital_number+=choose(0,1,1); + ship.capital_number+=1; + ship.escort_number+=3; + ship.image_index=floor((ship.capital_number)+(ship.frigate_number/2)+(ship.escort_number/4)); + p_type[i]="Dead"; + delete_features(p_feature[i], P_features.Reclamation_pools);// show_message("D"); + if (is_dead_star()) then image_alpha=0.33; + + // if image_alpha = 0.33 then send the ship somewhere new + + } + if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ + p_population[i]=floor(p_population[i]*0.3); + } + if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ + p_feature[i]=[]; + array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers), new NewPlanetFeature(P_features.Reclamation_pools)); + p_population[i]=0;// show_message("C"); + } + if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==0) and (planet_feature_bool(p_feature[i], P_features.Reclamation_pools)==0) and (p_type[i]!="Dead"){ + array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers));// show_message("B"); + } + + } + } + } +} \ No newline at end of file diff --git a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.yy b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.yy new file mode 100644 index 0000000000..c1e1f6f569 --- /dev/null +++ b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_tyranid_planet_functions", + "isCompatibility":false, + "isDnD":false, + "name":"scr_tyranid_planet_functions", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file From d9b7b3ff37eab4109c709d113e606822a38b1b20 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 1 May 2025 21:22:22 +0100 Subject: [PATCH 025/155] seriouslystart to sort fleet combat the fuck out --- ChapterMaster.yyp | 1 + objects/obj_al_ship/Step_0.gml | 328 +---------------- objects/obj_en_ship/Step_0.gml | 268 ++------------ objects/obj_p_ship/Step_0.gml | 43 +-- .../scr_automated_ship_combat_functions.gml | 329 ++++++++++++++++++ .../scr_automated_ship_combat_functions.yy | 13 + scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml | 53 +-- .../scr_tyranid_fleet_functions.gml | 73 +++- .../scr_tyranid_planet_functions.gml | 106 +++++- 9 files changed, 551 insertions(+), 663 deletions(-) create mode 100644 scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml create mode 100644 scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 558dba7204..bd53096c96 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -735,6 +735,7 @@ {"id":{"name":"scr_array_functions","path":"scripts/scr_array_functions/scr_array_functions.yy",},}, {"id":{"name":"scr_arti_descr","path":"scripts/scr_arti_descr/scr_arti_descr.yy",},}, {"id":{"name":"scr_audience","path":"scripts/scr_audience/scr_audience.yy",},}, + {"id":{"name":"scr_automated_ship_combat_functions","path":"scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.yy",},}, {"id":{"name":"scr_battle_allies","path":"scripts/scr_battle_allies/scr_battle_allies.yy",},}, {"id":{"name":"scr_battle_roster","path":"scripts/scr_battle_roster/scr_battle_roster.yy",},}, {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},}, diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index ba28ac0751..a3f035952d 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -8,7 +8,7 @@ var o_dist=0, spid=0; var gud=0; var husk; var explo; - +turning_speed=0.2; __b__ = action_if_variable(owner, 6, 0); if (!__b__){ image_angle=direction; @@ -38,25 +38,7 @@ if (!__b__){ else if (class=="Razorfiend") then obj_fleet.en_frigate_lost[gud]+=1; else if (class=="Stalker") or (class=="Prowler") or (class=="Sword Class Frigate") then obj_fleet.en_escort_lost[gud]+=1; - image_alpha=0.5; - - if (owner != eFACTION.Tyranids){ - husk=instance_create(x,y,obj_en_husk); - husk.sprite_index=sprite_index; - husk.direction=direction; - husk.image_angle=image_angle; - husk.depth=depth; - husk.image_speed=0; - for(var i=0; i0) and (instance_exists(obj_en_ship)){ @@ -138,22 +120,17 @@ if (!__b__){ spid=20; } // if (class!="big") then flank!!!! + closing_distance = o_dist; spid=spid*speed_bonus; dist=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); + target_distance = dist; // For example here we could improve the options and how ships beheave... if (target!=0) and (action=="attack"){ direction=turn_towards_point(direction,x,y,target.x,target.y,.1); } - if (target!=0) and (action=="broadside") and (dist>o_dist){ - if (y>=target.y) then dist=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - if (ytarget.y) and (dist>o_dist) then direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2); - if (yo_dist) then direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction+90),.2); - if (turn_bonus>1){ - if (yo_dist) then direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction+90),.2); - } - } + broadside_movement(); + flank_movement(); /*if (target!=0) and (action="broadside") and (o_dist>=dist){ direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) }*/ @@ -179,20 +156,16 @@ if (!__b__){ }*/ // Controls speed based on action if (action="attack"){ - if (dist>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (dist0) then speed-=0.025; + if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; + if (target_distance0) then speed-=0.025; } if (action="broadside"){ - if (dist>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (dist0) then speed-=0.025; + if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; + if (target_distance0) then speed-=0.025; } if (speed<0) then speed=speed*0.9; // Weapon reloads - if (cooldown[1]>0) then cooldown[1]-=1; - if (cooldown[2]>0) then cooldown[2]-=1; - if (cooldown[3]>0) then cooldown[3]-=1; - if (cooldown[4]>0) then cooldown[4]-=1; - if (cooldown[5]>0) then cooldown[5]-=1; + cooldown_ship_weapons(); if (turret_cool>0) then turret_cool-=1; targe=0; @@ -243,144 +216,9 @@ if (!__b__){ wep=""; dam=0; - for(var gg=1; gg<=weapons; gg++){ - // Resets - ok=0; - f+=1; - facing=""; - ammo=0; - range=0; - wep=""; - - if (cooldown[gg]<=0) and (weapon[gg]!="") and (weapon_ammo[gg]>0) then ok=1; - if (ok==1){ - facing=weapon_facing[gg]; - ammo=weapon_ammo[gg]; - range=weapon_range[gg]; - } - - targe=target; - if (facing=="front") and (front==1) then ok=2; - if (facing=="most") then ok=2; - /* - if (facing="right") then targe=target_r; - if (facing="left") then targe=target_l; - if ((facing="front") or (facing="most")) and (front=1) then ok=2; - if (facing="right") or (facing="most") and (right=1) then ok=2; - if (facing="left") or (facing="most") and (left=1) then ok=2; - */ - if (facing=="special") then ok=2; - if (!instance_exists(targe)) then exit; - dist=point_distance(x,y,targe.x,targe.y); - if (facing=="right") and (point_direction(x,y,target_r.x,target_r.y)<337) and (point_direction(x,y,target_r.x,target_r.y)>203) then ok=2; - if (facing=="left") and (point_direction(x,y,target_r.x,target_r.y)>22) and (point_direction(x,y,target_r.x,target_r.y)<157) then ok=2; - /*var re_deh;re_deh=relative_direction(direction,target.direction); - if (re_deh<45) or (re_deh>315) or ((re_deh>135) and (re_deh<225)) then direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) - */ - if (ok==2) and (dist<(range+(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))))){ - if (ammo>0) and (ammo<900) then ammo-=1; - weapon_ammo[gg]=ammo; - cooldown[gg]=weapon_cooldown[gg]; - wep=weapon[gg]; - dam=weapon_dam[gg]; - // if (f=3) and (ship_id=2) then show_message("ammo: "+string(ammo)+" | range: "+string(range)); - if (ammo<0) then ok=0; - ok=3; - // Weapons fire - if (string_count("orpedo",wep)==0) and (string_count("Interceptor",wep)==0) and (string_count("ommerz",wep)==0) and (string_count("Claws",wep)==0) and (string_count("endrils",wep)==0) and (ok==3){ - bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_al_round); - bull.speed=20; - bull.dam=dam; - if (targe==target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - if (facing!="front"){bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y);} - if (string_count("ova",wep)==1){ - bull.image_xscale=2; - bull.image_yscale=2; - } - if (string_count("eavy Gunz",wep)==1){ - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - if (string_count("Lance",wep)==1){ - bull.sprite_index=spr_ground_las; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - if (string_count("Ion",wep)==1){ - bull.sprite_index=spr_pulse; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - if (string_count("Rail",wep)==1){ - bull.sprite_index=spr_railgun; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - if (string_count("Gravitic",wep)==1){ - bull.image_xscale=2; - bull.image_yscale=2; - } - if (string_count("Plasma",wep)==1){ - bull.sprite_index=spr_ground_plasma; - bull.image_xscale=2; - bullimage_yscale=2; - bull.speed=15; - } - if (string_count("Pyro-Acid",wep)==1){ - bull.sprite_index=spr_glob; - bull.image_xscale=2; - bullimage_yscale=2; - } - if (string_count("Weapons",wep)==1) and (owner == eFACTION.Eldar){ - bull.sprite_index=spr_ground_las; - bull.image_xscale=2; - bull.image_yscale=2; - } - if (string_count("Pulse",wep)==1) and (owner == eFACTION.Eldar){ - bull.sprite_index=spr_pulse; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - } - // Torpedo weapons - if (string_count("orpedo",wep)==1) and (ok==3){ - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_al_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - } - bull=instance_create(x,y+lengthdir_y(-10,direction+90),obj_al_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - bull=instance_create(x,y+lengthdir_y(10,direction+90),obj_al_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(30,direction+90),obj_al_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - } - } - // Melee ship weapons (nids) - if ((string_count("Claws",wep)==1) or (string_count("endrils",wep)==1)) and (ok==3){ - if (target.shields<=0) then target.hp-=weapon_dam[wep]; - if (target.shields>0) then target.shields-=weapon_dam[wep]; - } - // Special weapons - if ((string_count("Interceptor",wep)==1) or (string_count("ommerz",wep)==1) or (string_count("Manta",wep)==1) or (string_count("Glands",wep)==1) or (string_count("Eldar Launch",wep)==1)) and (ok==3){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_al_in); - bull.direction=self.direction; - bull.owner=self.owner; - } - } + + for (var i=0;i0) then ok=1; - if (ok==1){ - facing=weapon_facing[gg]; - ammo=weapon_ammo[gg]; - range=weapon_range[gg]; - } - - targe=target; - if (facing=="front") and (front==1) then ok=2; - if (facing=="most") then ok=2; - /* - if (facing="right") then targe=target_r; - if (facing="left") then targe=target_l; - if ((facing="front") or (facing="most")) and (front=1) then ok=2; - if (facing="right") or (facing="most") and (right=1) then ok=2; - if (facing="left") or (facing="most") and (left=1) then ok=2; - */ - if (facing=="special") then ok=2; - if (!instance_exists(targe)) then exit; - dist=point_distance(x,y,targe.x,targe.y); - - if (facing=="right") and (point_direction(x,y,target_r.x,target_r.y)<337) and (point_direction(x,y,target_r.x,target_r.y)>203) then ok=2; - if (facing=="left") and (point_direction(x,y,target_r.x,target_r.y)>22) and (point_direction(x,y,target_r.x,target_r.y)<157) then ok=2; - /* - var re_deh;re_deh=relative_direction(direction,target.direction); - if (re_deh<45) or (re_deh>315) or ((re_deh>135) and (re_deh<225)) then direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) - */ - if (ok==2) and (dist<(range+(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))))){ - if (ammo>0) and (ammo<900) then ammo-=1; - weapon_ammo[gg]=ammo; - cooldown[gg]=weapon_cooldown[gg]; - wep=weapon[gg]; - dam=weapon_dam[gg]; - // if (f=3) and (ship_id=2) then show_message("ammo: "+string(ammo)+" | range: "+string(range)); - if (ammo<0) then ok=0; - ok=3; - // Weapon types - if (string_count("orpedo",wep)==0) and (string_count("Interceptor",wep)==0) and (string_count("ommerz",wep)==0) and (string_count("Claws",wep)==0) and (string_count("endrils",wep)==0) and (ok==3){ - bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_al_round); - bull.speed=20; - bull.dam=dam; - if (targe==target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - if (facing!="front"){bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y);} - if (string_count("ova",wep)==1){ - bull.image_xscale=2; - bull.image_yscale=2; - } - if (string_count("eavy Gunz",wep)==1){ - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - if (string_count("Lance",wep)==1){ - bull.sprite_index=spr_ground_las; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - if (string_count("Ion",wep)==1){ - bull.sprite_index=spr_pulse; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - if (string_count("Rail",wep)==1){ - bull.sprite_index=spr_railgun; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - if (string_count("Gravitic",wep)==1){ - bull.image_xscale=2; - bull.image_yscale=2; - } - if (string_count("Plasma",wep)==1){ - bull.sprite_index=spr_ground_plasma; - bull.image_xscale=2; - bullimage_yscale=2; - bull.speed=15; - } - if (string_count("Pyro-Acid",wep)==1){ - bull.sprite_index=spr_glob; - bull.image_xscale=2; - bullimage_yscale=2; - } - if (string_count("Weapons",wep)==1) and (owner = eFACTION.Eldar){ - bull.sprite_index=spr_ground_las; - bull.image_xscale=2; - bull.image_yscale=2; - } - if (string_count("Pulse",wep)==1) and (owner = eFACTION.Eldar){ - bull.sprite_index=spr_pulse; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - } - if (string_count("orpedo",wep)==1) and (ok==3){ - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_al_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - } - bull=instance_create(x,y+lengthdir_y(-10,direction+90),obj_al_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - bull=instance_create(x,y+lengthdir_y(10,direction+90),obj_al_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(30,direction+90),obj_al_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - } - } - if ((string_count("Claws",wep)==1) or (string_count("endrils",wep)==1)) and (ok==3){ - if (target.shields<=0) then target.hp-=weapon_dam[wep]; - if (target.shields>0) then target.shields-=weapon_dam[wep]; - } - if ((string_count("Interceptor",wep)==1) or (string_count("ommerz",wep)==1) or (string_count("Manta",wep)==1) or (string_count("Glands",wep)==1) or (string_count("Eldar Launch",wep)==1)) and (ok==3){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_al_in); - bull.direction=self.direction; - bull.owner=self.owner; - } - } + for (var i=0;i0) and (instance_exists(obj_p_ship)){ @@ -82,24 +65,17 @@ if (hp>0) and (instance_exists(obj_p_ship)){ // if (class!="big") then flank!!!! - + closing_distance = o_dist; spid=spid*speed_bonus; dist=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - + target_distance = dist; if (target!=0) and (action="attack"){ direction=turn_towards_point(direction,x,y,target.x,target.y,.1); } - if (target!=0) and (action="broadside") and (dist>o_dist){ - if (y>=target.y) then dist=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - if (ytarget.y) and (dist>o_dist) then direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2); - if (yo_dist) then direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction+90),.2); - if (turn_bonus>1){ - if (yo_dist) then direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction+90),.2); - } - } + broadside_movement(); + flank_movement(); /*if (target!=0) and (action="broadside") and (o_dist>=dist){ @@ -151,18 +127,12 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (speed<0) then speed=speed*0.9; - if (cooldown[1]>0) then cooldown[1]-=1; - if (cooldown[2]>0) then cooldown[2]-=1; - if (cooldown[3]>0) then cooldown[3]-=1; - if (cooldown[4]>0) then cooldown[4]-=1; - if (cooldown[5]>0) then cooldown[5]-=1; + cooldown_ship_weapons(); + if (turret_cool>0) then turret_cool-=1; - - - var bull, targe, rdir, dirr, dist, xx, yy, ok; - targe=0;rdir=0;dirr="";dist=9999;xx=x;yy=y; + var targe=0,rdir=0,dirr="",dist=9999,xx=x,yy=y; if (turrets>0) and (instance_exists(obj_p_small)) and (turret_cool=0){ @@ -170,10 +140,16 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (instance_exists(targe)) then dist=point_distance(x,y,targe.x,targe.y); if (dist>64) and (dist<300){ - bull=instance_create(x,y,obj_en_round);bull.direction=point_direction(x,y,targe.x,targe.y); + bull=instance_create(x,y,obj_en_round); + bull.direction=point_direction(x,y,targe.x,targe.y); if (owner = eFACTION.Tyranids) then bull.sprite_index=spr_glob; - bull.speed=20;bull.dam=3;bull.image_xscale=0.5;bull.image_yscale=0.5;turret_cool=floor(60/turrets); - if (owner = eFACTION.Necrons){bull.sprite_index=spr_green_las;bull.image_yscale=1;} + bull.speed=20;bull.dam=3; + bull.image_xscale=0.5; + bull.image_yscale=0.5;turret_cool=floor(60/turrets); + if (owner = eFACTION.Necrons){ + bull.sprite_index=spr_green_las; + bull.image_yscale=1; + } bull.direction+=choose(random(10),1*-(random(10))); } } @@ -200,124 +176,10 @@ if (hp>0) and (instance_exists(obj_p_ship)){ lightning=0; - repeat(weapons){ - gg+=1; - - ok=0;f+=1;facing="";ammo=0;range=0;wep=""; - - //weapon[gg]=0;weapon_ammo[gg]=0;weapon_range[gg]=0; - - - if (cooldown[gg]<=0) and (weapon[gg]!="") and (weapon_ammo[gg]>0) then ok=1; - if (ok=1){ - facing=weapon_facing[gg];ammo=weapon_ammo[gg];range=weapon_range[gg];} - - targe=target; - if (facing="front") and (front=1) then ok=2; - if (facing="most") then ok=2; - - - /* - if (facing="right") then targe=target_r; - if (facing="left") then targe=target_l; - if ((facing="front") or (facing="most")) and (front=1) then ok=2; - if (facing="right") or (facing="most") and (right=1) then ok=2; - if (facing="left") or (facing="most") and (left=1) then ok=2; - */ - if (facing="special") then ok=2; - if (!instance_exists(targe)) then exit; - dist=point_distance(x,y,targe.x,targe.y); - - if (facing="right") and (point_direction(x,y,target_r.x,target_r.y)<337) and (point_direction(x,y,target_r.x,target_r.y)>203) then ok=2; - if (facing="left") and (point_direction(x,y,target_r.x,target_r.y)>22) and (point_direction(x,y,target_r.x,target_r.y)<157) then ok=2; - - /*var re_deh;re_deh=relative_direction(direction,target.direction); - if (re_deh<45) or (re_deh>315) or ((re_deh>135) and (re_deh<225)) then direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) - */ - - - - if (ok=2) and (dist<(range+(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))))){ - if (ammo>0) and (ammo<900) then ammo-=1; - weapon_ammo[gg]=ammo;cooldown[gg]=weapon_cooldown[gg];wep=weapon[gg];dam=weapon_dam[gg]; - - // if (f=3) and (ship_id=2) then show_message("ammo: "+string(ammo)+" | range: "+string(range)); - - if (ammo<0) then ok=0; - ok=3; - - if (string_count("orpedo",wep)=0) and (string_count("Interceptor",wep)=0) and (string_count("ommerz",wep)=0) and (string_count("Claws",wep)=0) and (string_count("endrils",wep)=0) and (ok=3) and (owner != eFACTION.Necrons){ - bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_en_round); - bull.speed=20;bull.dam=dam; - if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - if (facing!="front"){bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y);} - if (string_count("ova",wep)=1){bull.image_xscale=2;bull.image_yscale=2;} - if (string_count("eavy Gunz",wep)=1){bull.image_xscale=1.5;bull.image_yscale=1.5;} - if (string_count("Lance",wep)=1){bull.sprite_index=spr_ground_las;bull.image_xscale=1.5;bull.image_yscale=1.5;} - if (string_count("Ion",wep)=1){bull.sprite_index=spr_pulse;bull.image_xscale=1.5;bull.image_yscale=1.5;} - if (string_count("Rail",wep)=1){bull.sprite_index=spr_railgun;bull.image_xscale=1.5;bull.image_yscale=1.5;} - if (string_count("Gravitic",wep)=1){bull.image_xscale=2;bull.image_yscale=2;} - if (string_count("Plasma",wep)=1){bull.sprite_index=spr_ground_plasma;bull.image_xscale=2;bullimage_yscale=2;bull.speed=15;} - if (string_count("Pyro-Acid",wep)=1){bull.sprite_index=spr_glob;bull.image_xscale=2;bullimage_yscale=2;} - - if (string_count("Weapons",wep)=1) and (owner = eFACTION.Eldar){bull.sprite_index=spr_ground_las;bull.image_xscale=2;bull.image_yscale=2;} - if (string_count("Pulse",wep)=1) and (owner = eFACTION.Eldar){bull.sprite_index=spr_pulse;bull.image_xscale=1.5;bull.image_yscale=1.5;} - - } - if (string_count("orpedo",wep)=1) and (ok=3) and (owner != eFACTION.Necrons){ - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_round); - bull.speed=10;bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - } - bull=instance_create(x,y+lengthdir_y(-10,direction+90),obj_en_round); - bull.speed=10;bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - bull=instance_create(x,y+lengthdir_y(10,direction+90),obj_en_round); - bull.speed=10;bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(30,direction+90),obj_en_round); - bull.speed=10;bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - } - - } - - if (wep="Lightning Arc"){lightning=10; - if (target.shields>0){ - if (class="Cairn Class") or (class="Reaper Class") then target.shields-=20; - else{target.shields-=20;} - } - if (target.shields<=0){ - if (class="Cairn Class") or (class="Reaper Class") then target.hp-=10; - else{target.hp-=10;} - } - } - if (wep="Gauss Particle Whip"){whip=15; - if (target.shields>0) then target.shields-=dam; - if (target.shields<=0) then target.hp-=dam; - } - if (wep="Star Pulse Generator") and (ok=3) and (instance_exists(target)){ - bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_en_pulse); - bull.speed=20; - if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - if (facing!="front"){bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y);} - bull.target_x=target.x;bull.target_y=target.y; - } - - - - if ((string_count("Claws",wep)=1) or (string_count("endrils",wep)=1)) and (ok=3){ - if (target.shields<=0) then target.hp-=weapon_dam[gg]; - if (target.shields>0) then target.shields-=weapon_dam[gg]; - } - if ((string_count("Interceptor",wep)=1) or (string_count("ommerz",wep)=1) or (string_count("Manta",wep)=1) or (string_count("Glands",wep)=1) or (string_count("Eldar Launch",wep)=1)) and (ok=3){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_in); - bull.direction=self.direction; - bull.owner=self.owner; - } - } + for (var i=0;i0) and (instance_exists(obj_p_ship)){ var f, facing, ammo, range, wep, dam, gg;f=0;facing="";ammo=0;range=0;wep="";dam=0;gg=0; - repeat(weapons){ - gg+=1; - - ok=0;f+=1;facing="";ammo=0;range=0;wep=""; - - //weapon[gg]=0;weapon_ammo[gg]=0;weapon_range[gg]=0; - - - if (cooldown[gg]<=0) and (weapon[gg]!="") and (weapon_ammo[gg]>0) then ok=1; - if (ok=1){ - facing=weapon_facing[gg];ammo=weapon_ammo[gg];range=weapon_range[gg];} - - targe=target; - if (facing="front") and (front=1) then ok=2; - if (facing="most") then ok=2; - - - /* - if (facing="right") then targe=target_r; - if (facing="left") then targe=target_l; - if ((facing="front") or (facing="most")) and (front=1) then ok=2; - if (facing="right") or (facing="most") and (right=1) then ok=2; - if (facing="left") or (facing="most") and (left=1) then ok=2; - */ - if (facing="special") then ok=2; - if (!instance_exists(targe)) then exit; - dist=point_distance(x,y,targe.x,targe.y); - - if (facing="right") and (point_direction(x,y,target_r.x,target_r.y)<337) and (point_direction(x,y,target_r.x,target_r.y)>203) then ok=2; - if (facing="left") and (point_direction(x,y,target_r.x,target_r.y)>22) and (point_direction(x,y,target_r.x,target_r.y)<157) then ok=2; - - /*var re_deh;re_deh=relative_direction(direction,target.direction); - if (re_deh<45) or (re_deh>315) or ((re_deh>135) and (re_deh<225)) then direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) - */ - - - - if (ok=2) and (dist<(range+(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))))){ - if (ammo>0) and (ammo<900) then ammo-=1; - weapon_ammo[gg]=ammo;cooldown[gg]=weapon_cooldown[gg];wep=weapon[gg];dam=weapon_dam[gg]; - - // if (f=3) and (ship_id=2) then show_message("ammo: "+string(ammo)+" | range: "+string(range)); - - if (ammo<0) then ok=0; - ok=3; - - if (string_count("orpedo",wep)=0) and (string_count("Interceptor",wep)=0) and (string_count("ommerz",wep)=0) and (string_count("Claws",wep)=0) and (string_count("endrils",wep)=0) and (ok=3){ - bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_en_round); - bull.speed=20;bull.dam=dam; - if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - if (facing!="front"){bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y);} - if (string_count("ova",wep)=1){bull.image_xscale=2;bull.image_yscale=2;} - if (string_count("eavy Gunz",wep)=1){bull.image_xscale=1.5;bull.image_yscale=1.5;} - if (string_count("Lance",wep)=1){bull.sprite_index=spr_ground_las;bull.image_xscale=1.5;bull.image_yscale=1.5;} - if (string_count("Ion",wep)=1){bull.sprite_index=spr_pulse;bull.image_xscale=1.5;bull.image_yscale=1.5;} - if (string_count("Rail",wep)=1){bull.sprite_index=spr_railgun;bull.image_xscale=1.5;bull.image_yscale=1.5;} - if (string_count("Gravitic",wep)=1){bull.image_xscale=2;bull.image_yscale=2;} - if (string_count("Plasma",wep)=1){bull.sprite_index=spr_ground_plasma;bull.image_xscale=2;bullimage_yscale=2;bull.speed=15;} - if (string_count("Pyro-Acid",wep)=1){bull.sprite_index=spr_glob;bull.image_xscale=2;bullimage_yscale=2;} - - if (string_count("Weapons",wep)=1) and (owner = eFACTION.Eldar){bull.sprite_index=spr_ground_las;bull.image_xscale=2;bull.image_yscale=2;} - if (string_count("Pulse",wep)=1) and (owner = eFACTION.Eldar){bull.sprite_index=spr_pulse;bull.image_xscale=1.5;bull.image_yscale=1.5;} - - } - if (string_count("orpedo",wep)=1) and (ok=3){ - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_round); - bull.speed=10;bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - } - bull=instance_create(x,y+lengthdir_y(-10,direction+90),obj_en_round); - bull.speed=10;bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - bull=instance_create(x,y+lengthdir_y(10,direction+90),obj_en_round); - bull.speed=10;bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(30,direction+90),obj_en_round); - bull.speed=10;bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - } - - } - if ((string_count("Claws",wep)=1) or (string_count("endrils",wep)=1)) and (ok=3){ - if (target.shields<=0) then target.hp-=weapon_dam[wep]; - if (target.shields>0) then target.shields-=weapon_dam[wep]; - } - if ((string_count("Interceptor",wep)=1) or (string_count("ommerz",wep)=1) or (string_count("Manta",wep)=1) or (string_count("Glands",wep)=1) or (string_count("Eldar Launch",wep)=1)) and (ok=3){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_in);bull.direction=self.direction;bull.owner=self.owner; - } - } + for (var i=0;i-5000){ x=-7000;y=room_height/2; } if (hp>0) and (instance_exists(target)){ - for (var i=0;i0){ - cooldown[i]--; - } - } + cooldown_ship_weapons(); if (class="Apocalypse Class Battleship") or (class="Gloriana"){ o_dist=500; @@ -94,31 +90,28 @@ if (hp>0) and (instance_exists(target)){ o_dist=64; action="flank"; } + + closing_distance = o_dist; + // if (class!="big") then flank!!!! dist=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); + target_distance = dist; // STC Bonuses - var ts;ts=0.2;if (obj_controller.stc_bonus[5]=3) then ts+=0.1; + turning_speed = 0.2; + if (obj_controller.stc_bonus[5]=3){ + turning_speed+=0.1; + } if (paction!="move") and (paction!="attack_move") and (paction!="turn") and (paction!="attack_turn"){ if (target!=0) and (action="attack"){ - direction=turn_towards_point(direction,x,y,target.x,target.y,ts/2); - } - if (target!=0) and (action="broadside") and (dist>o_dist){ - if (y>=target.y) then dist=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - if (ytarget.y) and (dist>o_dist) then direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction-90),ts); - if (yo_dist) then direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction+90),ts); - } - if (target!=0) and (action="flank") and (dist>o_dist){ - if (y>=target.y) then dist=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - if (ytarget.y) and (dist>o_dist) then direction=turn_towards_point(direction,x,y,target.x,target.y,ts); - if (yo_dist) then direction=turn_towards_point(direction,x,y,target.x,target.y,ts); + direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed/2); } + broadside_movement(); + flank_movement(); } // STC Bonuses @@ -126,10 +119,10 @@ if (hp>0) and (instance_exists(target)){ if (obj_controller.stc_bonus[6]=3){speed_up=0.008;speed_down=0.037;} if (paction="turn") or (paction="attack_turn"){ - direction=turn_towards_point(direction,x,y,target_x,target_y,ts/2); + direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); dist=point_distance(x,y,target_x,target_y); - if (y>target_y) then direction=turn_towards_point(direction,x,y,target_x,target_y,ts); - if (ytarget_y) then direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed); + if (y0) then speed-=speed_down; if (direction-point_direction(x,y,target_x,target_y)<=2) and (direction-point_direction(x,y,target_x,target_y)>=-2){ @@ -153,10 +146,10 @@ if (hp>0) and (instance_exists(target)){ } } if (paction="move") or (paction="attack_move"){ - direction=turn_towards_point(direction,x,y,target_x,target_y,ts/2); + direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); var dist;dist=point_distance(x,y,target_x,target_y); - if (y>target_y) then direction=turn_towards_point(direction,x,y,target_x,target_y,ts); - if (ytarget_y) then direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed); + if (yclosing_distance){ + if (y>=target.y){ + target_distance=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); + } + if (ytarget.y) and (target_distance>closing_distance){ + direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2); + } + if (yclosing_distance){ + direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction+90),.2); + } + if (turn_bonus>1){ + if (yclosing_distance) then direction=turn_towards_point(direction,x+lengthdir_x(64,target.direction-180),y,target.x,target.y+lengthdir_y(128,target.direction+90),.2); + } + } +} + +function flank_movement(){ + if (target!=0) and (action="flank") and (target_distance>closing_distance){ + if (y>=target.y) then target_distance=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); + if (ytarget.y) and (target_distance>closing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); + if (yclosing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); + } +} + +function calculate_closing_distance_and_base_attack(){ + +} + +function cooldown_ship_weapons(){ + for (var i=0;i0){ + cooldown[i]--; + } + } +} + + +function destroy_ship_and_leave_husk(){ + image_alpha=0.5; + + if (owner != eFACTION.Tyranids){ + husk=instance_create(x,y,obj_en_husk); + husk.sprite_index=sprite_index; + husk.direction=direction; + husk.image_angle=image_angle; + husk.depth=depth; + husk.image_speed=0; + for(var i=0; i 0) r = yr/xr; + else r = 0; + a1 = point_direction(0,0,(x3-xm)*r,y3-ym); + a2 = point_direction(0,0,(x4-xm)*r,y4-ym); + if (a20){ + if (class="Cairn Class") or (class="Reaper Class") then target.shields-=20; + else{target.shields-=20; + } + } + if (target.shields<=0){ + if (class="Cairn Class") or (class="Reaper Class") then target.hp-=10; + else{target.hp-=10; + } + } + } + if (wep="Gauss Particle Whip"){whip=15; + if (target.shields>0) then target.shields-=dam; + if (target.shields<=0) then target.hp-=dam; + } + if (wep="Star Pulse Generator") and (ok=3) and (instance_exists(target)){ + bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_en_pulse); + bull.speed=20; + if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); + if (facing!="front"){ + bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); + } + bull.target_x=target.x; + bull.target_y=target.y; + } + + + + if ((string_count("Claws",wep)=1) or (string_count("endrils",wep)=1)) and (ok=3){ + if (target.shields<=0) then target.hp-=weapon_dam[wep_id]; + if (target.shields>0) then target.shields-=weapon_dam[wep_id]; + } + if ((string_count("Interceptor",wep)=1) or (string_count("ommerz",wep)=1) or (string_count("Manta",wep)=1) or (string_count("Glands",wep)=1) or (string_count("Eldar Launch",wep)=1)) and (ok=3){ + bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_in); + bull.direction=self.direction; + bull.owner=self.owner; + } +} + + +function fire_ship_weapon(wep_id){ + var wep = weapon[wep_id]; + var facing=weapon_facing[wep_id],ammo=weapon_ammo[wep_id],range=weapon_range[wep_id]; + var dam=weapon_dam[wep_id]; + + //weapon[wep_id]=0;weapon_ammo[wep_id]=0;weapon_range[wep_id]=0; + facing = weapon_facing[wep_id]; + if (cooldown[wep_id]<=0) and (weapon[wep_id]!="") and (weapon_ammo[wep_id]>0) then ok=1; + if (!ok) { + return 0; + } + targe=target; + if (facing="front") and (front=1) then ok=2; + if (facing="most") then ok=2; + + + /* + if (facing="right") then targe=target_r; + if (facing="left") then targe=target_l; + if ((facing="front") or (facing="most")) and (front=1) then ok=2; + if (facing="right") or (facing="most") and (right=1) then ok=2; + if (facing="left") or (facing="most") and (left=1) then ok=2; + */ + if (facing="special") then ok=2; + if (!instance_exists(targe)) then exit; + dist=point_distance(x,y,targe.x,targe.y); + + if (facing="right") and (point_direction(x,y,target_r.x,target_r.y)<337) and (point_direction(x,y,target_r.x,target_r.y)>203) then ok=2; + if (facing="left") and (point_direction(x,y,target_r.x,target_r.y)>22) and (point_direction(x,y,target_r.x,target_r.y)<157) then ok=2; + + /*var re_deh;re_deh=relative_direction(direction,target.direction); + if (re_deh<45) or (re_deh>315) or ((re_deh>135) and (re_deh<225)) then direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) + */ + + + + if (ok=2) and (dist<(range+(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))))){ + if (ammo>0) and (ammo<900) then ammo-=1; + weapon_ammo[wep_id]=ammo; + cooldown[wep_id]=weapon_cooldown[wep_id]; + wep=weapon[wep_id]; + dam=weapon_dam[wep_id]; + + // if (f=3) and (ship_id=2) then show_message("ammo: "+string(ammo)+" | range: "+string(range)); + + if (ammo<0) then ok=0; + ok=3; + + create_ship_projectile(wep_id); + } +} + + + + + diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.yy b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.yy new file mode 100644 index 0000000000..22126cdb43 --- /dev/null +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_automated_ship_combat_functions", + "isCompatibility":false, + "isDnD":false, + "name":"scr_automated_ship_combat_functions", + "parent":{ + "name":"fleet", + "path":"folders/Scripts/fleet.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml index aa12a9ff08..30eb003d90 100644 --- a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml +++ b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml @@ -309,58 +309,7 @@ function scr_enemy_ai_b() { } } // Genestealer cults grow in number - if (planet_feature_bool(p_feature[i], P_features.Gene_Stealer_Cult)) { - var cult = return_planet_features(p_feature[i], P_features.Gene_Stealer_Cult)[0]; - cult.cult_age++; - adjust_influence(eFACTION.Tyranids, cult.cult_age / 100, i); - var planet_garrison = system_garrison[i - 1]; - if (cult.hiding) { - var find_nid_chance = 50 - planet_garrison.total_garrison; - if (p_influence[i][eFACTION.Tyranids] > 50) { - var find_cult_chance = irandom(50); - var alert_text = $"A hidden Genestealer Cult in {name} Has suddenly burst forth from hiding!"; - if (planet_garrison.garrison_force) { - var alert_text = $"A hidden Genestealer Cult in {name} Has been discovered by marine garrison!"; - find_cult_chance -= 25; - } - if (find_cult_chance < 1) { - cult.hiding = false; - scr_popup("System Lost", alert_text, "Genestealer Cult", ""); - owner = eFACTION.Tyranids; - scr_event_log("red", $"A hidden Genestealer Cult in {name} {i} has Started a revolt.", name); - p_tyranids[i] += 1; - } - } - } - if ((!cult.hiding) && (p_tyranids[i] <= 3) && (p_type[i] != "Space Hulk") && (p_influence[i][eFACTION.Tyranids] > 10)) { - var spread = 0; - rando = irandom(150); - rando -= p_influence[i][eFACTION.Tyranids]; - if (rando <= 15) { - spread = 1; - } - - if ((p_type[i] == "Lava") && (p_tyranids[i] == 2)) { - spread = 0; - } - if (((p_type[i] == "Ice") || (p_type[i] == "Desert")) && (p_tyranids[i] == 3)) { - spread = 0; - } - - if (spread == 1) { - p_tyranids[i] += 1; - } - } - if (p_influence[i][eFACTION.Tyranids] > 55) { - p_owner[i] = eFACTION.Tyranids; - } - } else if (p_influence[i][eFACTION.Tyranids] > 5) { - adjust_influence(eFACTION.Tyranids, -1, i); - if ((irandom(200) + (p_influence[i][eFACTION.Tyranids] / 10)) > 195) { - array_push(p_feature[i], new NewPlanetFeature(P_features.Gene_Stealer_Cult)); - } - } - + genestealer_cult_end_turn_growth(i); // Spread influence on controlled sector if ((p_type[i] != "Space Hulk") && (p_type[i] != "Dead")) { diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index 4e2e30e215..073b11b1fa 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -92,6 +92,56 @@ function summon_new_hive_fleet(){ } } +function star_biomass_value(star){ + var _bio_val = 0; + for (var i=0;i_bio){ + var _temp = _star; + _stars[s] = _star2; + _stars[s + 1] = _temp; + _swaps = true; + } + } + if (!true){ + break; + } + } +} + function organise_tyranid_fleet_bio(){ if (capital_number*2>frigate_number){ capital_number-=1; @@ -121,29 +171,30 @@ function organise_tyranid_fleet_bio(){ - var n=false; + var _is_dead=false; with (orbiting){ - n = is_dead_star(); + _is_dead = is_dead_star(); } - if (n){ - var xx,yy,good, plin, plin2; - xx=0;yy=0;good=0;plin=0;plin2=0; - - if (capital_number>5) then n=5; + if (_is_dead){ + + var xx=0,yy=0,good=0,plin=0,plin2=0; + var _split_fleet = false; + if (capital_number>5){ + _split_fleet=true; + } - instance_deactivate_object(orbiting); repeat(100){ if (good!=5){ xx=self.x+random_range(-300,300); yy=self.y+random_range(-300,300); if (good=0) then plin=instance_nearest(xx,yy,obj_star); - if (good=1) and (n=5) then plin2=instance_nearest(xx,yy,obj_star); + if (good=1) and (_is_dead=5) then plin2=instance_nearest(xx,yy,obj_star); good = !array_contains(plin.p_type, "dead"); - if (good=1) and (n=5){ + if (good=1) and (_is_dead=5){ if (!instance_exists(plin2)) then break; if (!array_contains(plin.p_type, "dead")) then good++ @@ -175,7 +226,7 @@ function organise_tyranid_fleet_bio(){ } - if (good=1) and (instance_exists(plin)){action_x=plin.x;action_y=plin.y;alarm[4]=1;if (n!=5) then good=5;} + if (good=1) and (instance_exists(plin)){action_x=plin.x;action_y=plin.y;alarm[4]=1;if (_is_dead!=5) then good=5;} } } instance_activate_object(obj_star); diff --git a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml index a6aa1f54fe..e4fd09b13c 100644 --- a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml +++ b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml @@ -1,36 +1,108 @@ function tyranids_planet_biomass_extraction(){ // Tyranids here - var i=0; - for (var i=1;i=5) and (planets>=i) and (p_player[i]+p_orks[i]+p_guardsmen[i]+p_pdf[i]+p_chaos[i]=0){ + var planet=0; + for (var planet=1;planet=5) and (planets>=planet) and (p_player[planet]+p_orks[planet]+p_guardsmen[planet]+p_pdf[planet]+p_chaos[planet]=0){ var ship=scr_orbiting_fleet(eFACTION.Tyranids); - if (ship!="none") and (p_type[i]!="Dead") and (array_length(p_feature[i])!=0 && ship.capital_number){ - if (planet_feature_bool(p_feature[i], P_features.Reclamation_pools) ==1){ - p_tyranids[i]=0; - if (p_type[i]="Death") or (p_type[i]="Hive") then ship.capital_number+=choose(0,1,1); + if (ship!="none") and (p_type[planet]!="Dead") and (array_length(p_feature[planet])!=0 && ship.capital_number){ + if (planet_feature_bool(p_feature[planet], P_features.Reclamation_pools) ==1){ + p_tyranids[planet]=0; + if (p_type[planet]="Death") or (p_type[planet]="Hive") then ship.capital_number+=choose(0,1,1); ship.capital_number+=1; ship.escort_number+=3; ship.image_index=floor((ship.capital_number)+(ship.frigate_number/2)+(ship.escort_number/4)); - p_type[i]="Dead"; - delete_features(p_feature[i], P_features.Reclamation_pools);// show_message("D"); + p_type[planet]="Dead"; + delete_features(p_feature[planet], P_features.Reclamation_pools);// show_message("D"); if (is_dead_star()) then image_alpha=0.33; // if image_alpha = 0.33 then send the ship somewhere new } - if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ - p_population[i]=floor(p_population[i]*0.3); + if (planet_feature_bool(p_feature[planet], P_features.Capillary_Towers)==1) and (p_type[planet]!="Dead"){ + p_population[planet]=floor(p_population[planet]*0.3); } - if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==1) and (p_type[i]!="Dead"){ - p_feature[i]=[]; - array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers), new NewPlanetFeature(P_features.Reclamation_pools)); - p_population[i]=0;// show_message("C"); + if (planet_feature_bool(p_feature[planet], P_features.Capillary_Towers)==1) and (p_type[planet]!="Dead"){ + p_feature[planet]=[]; + array_push(p_feature[planet], new NewPlanetFeature(P_features.Capillary_Towers), new NewPlanetFeature(P_features.Reclamation_pools)); + p_population[planet]=0;// show_message("C"); } - if (planet_feature_bool(p_feature[i], P_features.Capillary_Towers)==0) and (planet_feature_bool(p_feature[i], P_features.Reclamation_pools)==0) and (p_type[i]!="Dead"){ - array_push(p_feature[i], new NewPlanetFeature(P_features.Capillary_Towers));// show_message("B"); + if (planet_feature_bool(p_feature[planet], P_features.Capillary_Towers)==0) and (planet_feature_bool(p_feature[planet], P_features.Reclamation_pools)==0) and (p_type[planet]!="Dead"){ + array_push(p_feature[planet], new NewPlanetFeature(P_features.Capillary_Towers));// show_message("B"); } } } } +} + + + +function genestealer_cult_end_turn_growth(planet){ + if (planet_feature_bool(p_feature[planet], P_features.Gene_Stealer_Cult)) { + var cult = return_planet_features(p_feature[planet], P_features.Gene_Stealer_Cult)[0]; + cult.cult_age++; + adjust_influence(eFACTION.Tyranids, cult.cult_age / 100, planet); + var planet_garrison = system_garrison[planet - 1]; + if (cult.hiding) { + var find_cult_chance = irandom(1000) - planet_garrison.total_garrison; + var alert_text = $"A hidden Genestealer Cult in {name} Has been discovered!"; + if (planet_garrison.garrison_force) { + var alert_text = $"A hidden Genestealer Cult in {name} Has been discovered by marine garrison!"; + find_cult_chance -= 25; + } + if (p_influence[planet][eFACTION.Tyranids] > 50) { + var find_cult_chance = irandom(50); + var alert_text = $"A hidden Genestealer Cult in {name} Has suddenly burst forth from hiding!"; + } + if (find_cult_chance < 1) { + cult.hiding = false; + scr_popup("System Lost", alert_text, "Genestealer Cult", ""); + owner = eFACTION.Tyranids; + scr_event_log("red", $"A hidden Genestealer Cult in {name} {planet} has Started a revolt.", name); + p_tyranids[planet] += 1; + } + } + if ((!cult.hiding) && (p_tyranids[planet] <= 3) && (p_type[planet] != "Space Hulk") && (p_influence[planet][eFACTION.Tyranids] > 10)) { + var spread = 0; + rando = irandom(150); + rando -= p_influence[planet][eFACTION.Tyranids]; + if (rando <= 15) { + spread = 1; + } + + if ((p_type[planet] == "Lava") && (p_tyranids[planet] == 2)) { + spread = 0; + } + if (((p_type[planet] == "Ice") || (p_type[planet] == "Desert")) && (p_tyranids[planet] == 3)) { + spread = 0; + } + + if (spread == 1) { + p_tyranids[planet] += 1; + } + } + if (p_influence[planet][eFACTION.Tyranids] > 55) { + p_owner[planet] = eFACTION.Tyranids; + if (obj_controller.turn > 150){ + var _cult_influence = p_influence[planet][eFACTION.Tyranids] + var _summon_fleet_chance = roll_dice(1,1000); + if (p_large[planet]){ + _summon_fleet_chance-=5; + if (_cult_influence>70){ + var _growth_extra = (_cult_influence-60)/10; + _summon_fleet_chance -= (power(2, _growth_extra)); + } + if (_summon_fleet_chance<=1){ + summon_new_hive_fleet(); + } + } + } + } + + } else if (p_influence[planet][eFACTION.Tyranids] > 5) { + adjust_influence(eFACTION.Tyranids, -1, planet); + if ((irandom(200) + (p_influence[planet][eFACTION.Tyranids] / 10)) > 195) { + array_push(p_feature[planet], new NewPlanetFeature(P_features.Gene_Stealer_Cult)); + } + } } \ No newline at end of file From 264f40cef6b8552f0182700c9be1eeb79006e128 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 3 May 2025 01:42:11 +0100 Subject: [PATCH 026/155] add some geometry to ship movement --- objects/obj_al_ship/Create_0.gml | 3 +- objects/obj_al_ship/Step_0.gml | 21 ++-- objects/obj_en_ship/Create_0.gml | 3 + objects/obj_en_ship/Step_0.gml | 22 ++-- objects/obj_p_ship/Create_0.gml | 8 +- objects/obj_p_ship/Draw_0.gml | 8 ++ objects/obj_p_ship/Step_0.gml | 43 ++++--- .../scr_automated_ship_combat_functions.gml | 112 ++++++++++++++---- .../scr_draw_planet_features.gml | 16 +-- .../turn_towards_point/turn_towards_point.gml | 14 +-- 10 files changed, 174 insertions(+), 76 deletions(-) diff --git a/objects/obj_al_ship/Create_0.gml b/objects/obj_al_ship/Create_0.gml index f7f9b76bae..092ef51cd2 100644 --- a/objects/obj_al_ship/Create_0.gml +++ b/objects/obj_al_ship/Create_0.gml @@ -5,10 +5,11 @@ action=""; direction=0; target=-50; if (instance_exists(obj_en_ship)){target=instance_nearest(x,y,obj_en_ship);} +draw_targets = false; target_l=0; target_r=0; - +bullets_for = []; turn_bonus=1; speed_bonus=1; diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index a3f035952d..447223c338 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -42,6 +42,7 @@ if (!__b__){ } // While ship is alive, attack if (hp>0) and (instance_exists(obj_en_ship)){ + is_targeted(); // TODO on another PR we need to redo how combat works, currently its just "attack" perhaps we can have more precise choise based AI with // simpler patterns? if (class=="Apocalypse Class Battleship"){ @@ -155,13 +156,19 @@ if (!__b__){ // direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) }*/ // Controls speed based on action - if (action="attack"){ - if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (target_distance0) then speed-=0.025; - } - if (action="broadside"){ - if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (target_distance0) then speed-=0.025; + var speed_down = 0.025; + var _start_slowing = start_slowing_telemetry(dist, speed_down); + if (_start_slowing){ + speed-=speed_down; + } else { + if (action="attack"){ + if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; + if (target_distance0) then speed-=0.025; + } + if (action="broadside"){ + if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; + if (target_distance0) then speed-=0.025; + } } if (speed<0) then speed=speed*0.9; // Weapon reloads diff --git a/objects/obj_en_ship/Create_0.gml b/objects/obj_en_ship/Create_0.gml index 7c83962b6c..fabf01760f 100644 --- a/objects/obj_en_ship/Create_0.gml +++ b/objects/obj_en_ship/Create_0.gml @@ -12,6 +12,9 @@ hostile=1; lightning=0; whip=0; bridge=0; +draw_targets = false; +bullets_for = []; + cooldown[0]=0; cooldown[1]=0; diff --git a/objects/obj_en_ship/Step_0.gml b/objects/obj_en_ship/Step_0.gml index 04a1dea49b..1959f52cae 100644 --- a/objects/obj_en_ship/Step_0.gml +++ b/objects/obj_en_ship/Step_0.gml @@ -39,6 +39,7 @@ if (hp<=0){ } if (hp>0) and (instance_exists(obj_p_ship)){ + is_targeted(); if (class="Apocalypse Class Battleship"){o_dist=500;action="attack";spid=20;} if (class="Nemesis Class Fleet Carrier"){o_dist=1000;action="attack";spid=20;} @@ -114,14 +115,19 @@ if (hp>0) and (instance_exists(obj_p_ship)){ }*/ - - if (action="attack"){ - if (dist>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (dist0) then speed-=0.025; - } - if (action="broadside"){ - if (dist>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (dist0) then speed-=0.025; + var speed_down = 0.025; + var _start_slowing = start_slowing_telemetry(dist, speed_down); + if (_start_slowing && owner != eFACTION.Tyranids){ + speed-=speed_down; + } else { + if (action="attack"){ + if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; + if (target_distance0) then speed-=0.025; + } + if (action="broadside"){ + if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; + if (target_distance0) then speed-=0.025; + } } diff --git a/objects/obj_p_ship/Create_0.gml b/objects/obj_p_ship/Create_0.gml index 16db031709..43bebc7276 100644 --- a/objects/obj_p_ship/Create_0.gml +++ b/objects/obj_p_ship/Create_0.gml @@ -10,8 +10,11 @@ sel_x2=0; sel_y2=0; // if (x<0) then ship_id=2; - -action="";paction=""; +location_target = new GlowDot(); +location_target.flash_modifier = 30 +draw_targets = false; +action=""; +paction=""; action_dis=0; action_dir=0; action_fac=0; @@ -21,6 +24,7 @@ if (instance_exists(obj_en_ship)){ target=instance_nearest(x,y,obj_en_ship); } +bullets_for = []; target_l=0; target_r=0; target_x=0; diff --git a/objects/obj_p_ship/Draw_0.gml b/objects/obj_p_ship/Draw_0.gml index 0a961c5e51..7b1dc9f7ce 100644 --- a/objects/obj_p_ship/Draw_0.gml +++ b/objects/obj_p_ship/Draw_0.gml @@ -29,6 +29,14 @@ if (selected=1){ } draw_set_alpha(1); + for (var i=0;i=0) then board_cooldown-=1; // Need to every couple of seconds check this // with obj_en_ship if not big then disable, check nearest, and activate once more - - +draw_targets = false; if (instance_exists(target)){if ((target.x<3) and (target.y<3)) or (target.hp<0) then target=-50;} if (!instance_exists(target)) or (target=-50){ with(obj_en_ship){if ((x<3) and (y<3)) or (hp<=0) then instance_deactivate_object(id);} @@ -54,11 +53,11 @@ if (hp<=0) and (x>-5000){ ex.image_xscale=2;ex.image_yscale=2; ex.image_speed=0.75;*/ - var husk;husk=instance_create(x,y,obj_en_husk); + var husk=instance_create(x,y,obj_en_husk); husk.sprite_index=sprite_index;husk.direction=direction; husk.image_angle=image_angle;husk.depth=depth;husk.image_speed=0; repeat(choose(4,5,6)){ - var explo;explo=instance_create(x,y,obj_explosion); + var explo=instance_create(x,y,obj_explosion); explo.image_xscale=0.5;explo.image_yscale=0.5; explo.x+=random_range(sprite_width*0.25,sprite_width*-0.25); explo.y+=random_range(sprite_width*0.25,sprite_width*-0.25); @@ -68,6 +67,7 @@ if (hp<=0) and (x>-5000){ x=-7000;y=room_height/2; } if (hp>0) and (instance_exists(target)){ + is_targeted(); cooldown_ship_weapons(); if (class="Apocalypse Class Battleship") or (class="Gloriana"){ @@ -113,10 +113,17 @@ if (hp>0) and (instance_exists(target)){ broadside_movement(); flank_movement(); } + + if (draw_targets != false;){ + dist=point_distance(x,y,draw_targets[0], draw_targets[1]);i + } // STC Bonuses var speed_up, speed_down;speed_up=0.005;speed_down=0.025; - if (obj_controller.stc_bonus[6]=3){speed_up=0.008;speed_down=0.037;} + if (obj_controller.stc_bonus[6]=3){ + speed_up=0.008; + speed_down=0.037; + } if (paction="turn") or (paction="attack_turn"){ direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); @@ -132,17 +139,18 @@ if (hp>0) and (instance_exists(target)){ } if (paction!="move") and (paction!="turn") and (paction!="attack_move") and (paction!="attack_turn"){ - if (action="attack"){ - if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; - if (dist0) then speed-=speed_down; - } - if (action="broadside"){ - if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; - if (dist0) then speed-=speed_down; - } - if (action="flank"){// flank here - if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; - if (dist0) then speed-=speed_down; + + var _start_slowing = start_slowing_telemetry(dist, speed_down); + if (_start_slowing){ + speed-=speed_down; + } else { + if (action="attack"){ + if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; + } else if (action="broadside"){ + if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; + } else if (action="flank"){// flank here + if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; + } } } if (paction="move") or (paction="attack_move"){ @@ -182,7 +190,8 @@ if (hp>0) and (instance_exists(target)){ if (dist>64) and (dist<300){ bull=instance_create(x,y,obj_p_round); bull.direction=point_direction(x,y,targe.x,targe.y); - bull.speed=20;bull.dam=3; + bull.speed=20; + bull.dam=3; bull.image_xscale=0.5; bull.image_yscale=0.5; turret_cool=floor(60/turrets); diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 3ca9d0bebf..5e59d79b89 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -20,15 +20,42 @@ function broadside_movement(){ } function flank_movement(){ - if (target!=0) and (action="flank") and (target_distance>closing_distance){ + var _normal_target = false; + if (target!=0 && action=="flank"){ + if (!under_fire){ + var _rel_direction = point_direction(target.x, target.y, x, y) - target.direction; + + if (abs(_rel_direction) < 135){ + var _target_lock = point_on_circle(target.x, target.y, 6, target.direction + _rel_direction > 0 ?135 : -135); + draw_targets = _target_lock; + direction = turn_towards_point(direction, x,y,_target_lock[0],_target_lock[1],turning_speed); + } else { + _normal_target = true; + } + } else { + _normal_target = true; + } + } + if (_normal_target ){ if (y>=target.y) then target_distance=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); if (ytarget.y) and (target_distance>closing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); - if (yclosing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); - } + if (yclosing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); + } } -function calculate_closing_distance_and_base_attack(){ +function start_slowing_telemetry(distance_to_target, deceleration){ + var _start_slowing = false; + if (speed>0){ + var _time_to_stop = (speed/deceleration); + var _distance_traveled_while_slowing = speed*_time_to_stop+ ((1/2) * deceleration * sqr(_time_to_stop)); + + if (distance_to_target - _distance_traveled_while_slowing < closing_distance){ + _start_slowing = true; + } + } + + return _start_slowing; } @@ -82,7 +109,7 @@ function destroy_ship_and_leave_husk(){ // [4..64] divisible by 4, default 24, real (optional) // /// GMLscripts.com/license -function draw_arc(x1,y1,x2,y2,x3,y3,x4,y4,precision){ +function draw_arc(x1,y1,x2,y2,x3,y3,x4,y4,precision=24){ if (precision == 0) precision = 24; var res,xm,ym,xr,yr,r,a1,a2,sx,sy,a; res = 360 / min(max(4,4*(precision div 4)),64); @@ -116,36 +143,71 @@ function facing_weapon_angle(facing){ switch (facing){ case "right": _direct_+=90; + break; case "left": _direct_-=90; + break; default: break; } + return _direct_; } function radians(deg){ return deg * pi/180; } -function + +function point_on_circle(start_x, start_y, radius, angle){ + var _angle_radians = radians(angle); + var _final_x = start_x + (radius * cos(_angle_radians)); + var _final_y = start_y + (radius * sin(_angle_radians)); + return [_final_x, _final_y]; +} + function draw_weapon_firing_arc(wep_id){ + var _tangent_direction = facing_weapon_angle(weapon_facing[wep_id]); - var max_distance = weapon_range[wep_id]; - var _angle_radians = radians(_tangent_direction); - var _final_x = x + (max_distance * cos(_angle_radians)); - var _final_y = y + (max_distance * sin(_angle_radians)); - - var _start_draw_rad = - var _start_x = - draw_arc(x, y, _final_x,_final_y ) + var _max_distance = weapon_range[wep_id]; + + var _left = x - _max_distance; + var _top = y - _max_distance; + var _right = x + _max_distance; + var _bottom = y + _max_distance; + + var _final = point_on_circle(x, y, _max_distance, _tangent_direction); + + var _start = point_on_circle(x, y, _max_distance, _tangent_direction+20); + + var _end = point_on_circle(x, y, _max_distance, _tangent_direction-20); + + draw_arc(_left, _top, _right,_bottom, _start[0], _start[1], _end[0], _end[1]); + draw_line(x, y, _start[0], _start[1]); + draw_line(x, y, _end[0], _end[1]); } + +function is_targeted(){ + var bullets = array_length(bullets_for); + under_fire = false; + for (var i=bullets-1;i>-1;i--){ + var _bullet = bullets_for[i]; + if (!instance_exists(_bullet)){ + array_delete(bullets_for, i, 1); + } else { + under_fire = true; + } + break; + } +} + function create_ship_projectile(wep_id){ var wep = weapon[wep_id]; var facing=weapon_facing[wep_id],ammo=weapon_ammo[wep_id],range=weapon_range[wep_id]; var dam=weapon_dam[wep_id]; - if (string_count("orpedo",wep)=0) and (string_count("Interceptor",wep)=0) and (string_count("ommerz",wep)=0) and (string_count("Claws",wep)=0) and (string_count("endrils",wep)=0) and (ok=3) and (owner != eFACTION.Necrons){ + if (string_count("orpedo",wep)=0) and (string_count("Interceptor",wep)=0) and (string_count("ommerz",wep)=0) and (string_count("Claws",wep)=0) and (string_count("endrils",wep)=0) && (owner != eFACTION.Necrons){ bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_en_round); bull.speed=20; bull.dam=dam; + array_push(target.bullets_for, bull.id); if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); if (facing!="front"){ bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); @@ -201,7 +263,7 @@ function create_ship_projectile(wep_id){ } } - if (string_count("orpedo",wep)=1) and (ok=3) and (owner != eFACTION.Necrons){ + if (string_count("orpedo",wep)=1) and (owner != eFACTION.Necrons){ if (class!="Ravager"){ bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_round); bull.speed=10; @@ -246,7 +308,7 @@ function create_ship_projectile(wep_id){ if (target.shields>0) then target.shields-=dam; if (target.shields<=0) then target.hp-=dam; } - if (wep="Star Pulse Generator") and (ok=3) and (instance_exists(target)){ + if (wep="Star Pulse Generator") and (instance_exists(target)){ bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_en_pulse); bull.speed=20; if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); @@ -259,11 +321,11 @@ function create_ship_projectile(wep_id){ - if ((string_count("Claws",wep)=1) or (string_count("endrils",wep)=1)) and (ok=3){ + if ((string_count("Claws",wep)=1) or (string_count("endrils",wep)=1)) { if (target.shields<=0) then target.hp-=weapon_dam[wep_id]; if (target.shields>0) then target.shields-=weapon_dam[wep_id]; } - if ((string_count("Interceptor",wep)=1) or (string_count("ommerz",wep)=1) or (string_count("Manta",wep)=1) or (string_count("Glands",wep)=1) or (string_count("Eldar Launch",wep)=1)) and (ok=3){ + if ((string_count("Interceptor",wep)=1) or (string_count("ommerz",wep)=1) or (string_count("Manta",wep)=1) or (string_count("Glands",wep)=1) or (string_count("Eldar Launch",wep)=1)){ bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_in); bull.direction=self.direction; bull.owner=self.owner; @@ -272,16 +334,21 @@ function create_ship_projectile(wep_id){ function fire_ship_weapon(wep_id){ + draw_set_alpha(1); + draw_set_color(c_red); + draw_weapon_firing_arc(wep_id); var wep = weapon[wep_id]; var facing=weapon_facing[wep_id],ammo=weapon_ammo[wep_id],range=weapon_range[wep_id]; var dam=weapon_dam[wep_id]; //weapon[wep_id]=0;weapon_ammo[wep_id]=0;weapon_range[wep_id]=0; facing = weapon_facing[wep_id]; - if (cooldown[wep_id]<=0) and (weapon[wep_id]!="") and (weapon_ammo[wep_id]>0) then ok=1; + var ok = false; + if (cooldown[wep_id]<=0 && weapon[wep_id]!="" && weapon_ammo[wep_id]>0) then ok=1; if (!ok) { return 0; } + front = true; targe=target; if (facing="front") and (front=1) then ok=2; if (facing="most") then ok=2; @@ -314,11 +381,6 @@ function fire_ship_weapon(wep_id){ wep=weapon[wep_id]; dam=weapon_dam[wep_id]; - // if (f=3) and (ship_id=2) then show_message("ammo: "+string(ammo)+" | range: "+string(range)); - - if (ammo<0) then ok=0; - ok=3; - create_ship_projectile(wep_id); } } diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index ff6b5d9205..58976c7a53 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -448,6 +448,7 @@ function SpeedingDot(XX,YY, limit) constructor{ function GlowDot() constructor{ flash = 0 flash_size = 5; + flash_modifier = 1; one_flash_finished = true; draw = function(xx, yy){ draw_set_color(c_green); @@ -456,20 +457,21 @@ function GlowDot() constructor{ draw_circle(xx, yy, (i/3), 1); } if (flash==0){ - if (flash_size<40){ - flash_size++; + if (flash_size * flash_modifier<40*flash_modifier){ + flash_size+=flash_modifier; } else { flash = 1; - flash_size--; + flash_size-=flash_modifier; } } else { - if (flash_size > 1){ - flash_size--; + if (flash_size * flash_modifier > 1*flash_modifier){ + flash_size-=flash_modifier; }else { - flash_size++; + flash_size+=flash_modifier; flash = 0; } - } + } + draw_set_alpha(1); } draw_one_flash = function(xx, yy){ if (one_flash_finished) then exit; diff --git a/scripts/turn_towards_point/turn_towards_point.gml b/scripts/turn_towards_point/turn_towards_point.gml index b878add6d0..ba9d2f4eaf 100644 --- a/scripts/turn_towards_point/turn_towards_point.gml +++ b/scripts/turn_towards_point/turn_towards_point.gml @@ -1,15 +1,11 @@ -function turn_towards_point(argument0, argument1, argument2, argument3, argument4, argument5) { +function turn_towards_point(current_angle, x1, y1, x2, y2, turn_speed) { // turn_towards_point(currentAngle, x1, y1, x2, y2, speed); - var ca, x1, y1, x2, y2, sp, a; - ca = argument0 * pi/180; - x1 = argument1; - y1 = argument2; - x2 = argument3; - y2 = argument4; - sp = argument5 * pi/180; + var ca = radians(current_angle); - a = arctan2(y1-y2, x2-x1) - ca; + var sp = radians(turn_speed); + + var a = arctan2(y1-y2, x2-x1) - ca; while (a < -pi || a > pi) a += (pi*2) * -sign(a); From 2a77a7a9c924ffd7c50c6d69b26e0bb7faae0f2b Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 3 May 2025 15:38:48 +0100 Subject: [PATCH 027/155] fix targeting and flanking --- objects/obj_al_ship/Alarm_0.gml | 100 +++--------- objects/obj_p_ship/Create_0.gml | 1 + objects/obj_p_ship/Step_0.gml | 25 +-- .../scr_automated_ship_combat_functions.gml | 152 ++++++++++++++---- .../turn_towards_point/turn_towards_point.gml | 4 +- 5 files changed, 153 insertions(+), 129 deletions(-) diff --git a/objects/obj_al_ship/Alarm_0.gml b/objects/obj_al_ship/Alarm_0.gml index e7bd72ed28..14fc704942 100644 --- a/objects/obj_al_ship/Alarm_0.gml +++ b/objects/obj_al_ship/Alarm_0.gml @@ -21,27 +21,11 @@ if (class=="Apocalypse Class Battleship"){ turrets=4; capacity=150; carrying=0; - weapon[1]="Lance Battery"; - weapon_facing[1]="left"; - weapon_dam[1]=14; - weapon_range[1]=300; - weapon_cooldown[1]=30; - weapon[2]="Lance Battery"; - weapon_facing[2]="right"; - weapon_dam[2]=14; - weapon_range[2]=300; - weapon_cooldown[2]=30; - weapon[3]="Nova Cannon"; - weapon_facing[3]="front"; - weapon_dam[3]=34; - weapon_range[3]=1500; - weapon_minrange[3]=300; - weapon_cooldown[3]=120; - weapon[4]="Weapons Battery"; - weapon_facing[4]="most"; - weapon_dam[4]=14; - weapon_range[4]=600; - weapon_cooldown[4]=20; + + add_weapon_to_ship("Lance Battery", {facing:"left"}); + add_weapon_to_ship("Lance Battery", {facing:"right"}); + add_weapon_to_ship("Nova Cannon"); + add_weapon_to_ship("Weapons Battery"); }else if (class=="Nemesis Class Fleet Carrier"){ sprite_index=spr_ship_nem; @@ -59,22 +43,10 @@ if (class=="Nemesis Class Fleet Carrier"){ turrets=5; capacity=100; carrying=24; - weapon[1]="Interceptor Launch Bays"; - weapon_facing[1]="special"; - weapon_range[1]=9999; - weapon_ammo[1]=6; - weapon_cooldown[1]=120; - weapon[2]="Interceptor Launch Bays"; - weapon_facing[2]="special"; - weapon_range[2]=9999; - weapon_ammo[2]=6; - weapon_cooldown[2]=120; - cooldown[2]=30; - weapon[3]="Lance Battery"; - weapon_facing[3]="front"; - weapon_dam[3]=14; - weapon_range[3]=300; - weapon_cooldown[3]=30; + add_weapon_to_ship("Interceptor Launch Bays"); + add_weapon_to_ship("Interceptor Launch Bays"); + add_weapon_to_ship("Lance Battery"); + }else if (class=="Avenger Class Grand Cruiser"){ sprite_index=spr_ship_aven; @@ -91,12 +63,7 @@ if (class=="Avenger Class Grand Cruiser"){ weapons=2; turrets=3; capacity=50; - carrying=0; - weapon[1]="Lance Battery"; - weapon_facing[1]="most"; - weapon_dam[1]=14; - weapon_range[1]=300; - weapon_cooldown[1]=25; + add_weapon_to_ship("Lance Battery", {cooldown:30}); }else if (class=="Sword Class Frigate"){ sprite_index=spr_ship_sword; @@ -114,11 +81,7 @@ if (class=="Sword Class Frigate"){ turrets=2; capacity=50; carrying=0; - weapon[1]="Weapons Battery"; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=20; + add_weapon_to_ship("Weapons Battery", {weapon_range:300}); } // ** Eldar ** if (class=="Void Stalker"){ @@ -136,23 +99,10 @@ if (class=="Void Stalker"){ weapons=3; turrets=4; capacity=150; - carrying=0; - weapon[1]="Eldar Launch Bay"; - weapon_facing[1]="special"; - weapon_dam[1]=0; - weapon_range[1]=9999; - weapon_cooldown[1]=90; - weapon_ammo[1]=4; - weapon[2]="Weapons Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=14; - weapon_range[2]=600; - weapon_cooldown[2]=30; - weapon[3]="Pulsar Lances"; - weapon_facing[3]="most"; - weapon_dam[3]=10; - weapon_range[3]=600; - weapon_cooldown[3]=10; + + add_weapon_to_ship("Weapons Battery"); + add_weapon_to_ship("Eldar Launch Bay"); + add_weapon_to_ship("Pulsar Lances"); }else if (class=="Shadow Class"){ sprite_index=spr_ship_shadow; @@ -816,11 +766,9 @@ if (class=="Stalker"){ turrets=0; capacity=0; carrying=0; - weapon[1]="Pyro-Acid Battery"; - weapon_facing[1]="front"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=60; + add_weapon_to_ship("Pyro-acid Battery", {cooldown : 60}); + add_weapon_to_ship("Feeder Tendrils", {cooldown : 20}); + weapon[2]="Feeder Tendrils"; weapon_facing[2]="most"; weapon_dam[2]=8; @@ -848,16 +796,8 @@ if (class=="Prowler"){ turrets=0; capacity=0; carrying=0; - weapon[1]="Pyro-acid Battery"; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=30; - weapon[2]="Feeder Tendrils"; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=100; - weapon_cooldown[1]=30; + add_weapon_to_ship("Pyro-acid Battery"); + add_weapon_to_ship("Feeder Tendrils"); } if (owner == eFACTION.Tyranids){ diff --git a/objects/obj_p_ship/Create_0.gml b/objects/obj_p_ship/Create_0.gml index 43bebc7276..e274fcbc86 100644 --- a/objects/obj_p_ship/Create_0.gml +++ b/objects/obj_p_ship/Create_0.gml @@ -23,6 +23,7 @@ target=-50; if (instance_exists(obj_en_ship)){ target=instance_nearest(x,y,obj_en_ship); } +turn_bonus = false; bullets_for = []; target_l=0; diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index 31269de355..79710403cf 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -49,20 +49,7 @@ if (hp<=0) and (x>-5000){ image_alpha=0.5; if (obj_fleet.start!=0){ - /*ex=instance_create(x,y,obj_explosion); - ex.image_xscale=2;ex.image_yscale=2; - ex.image_speed=0.75;*/ - - var husk=instance_create(x,y,obj_en_husk); - husk.sprite_index=sprite_index;husk.direction=direction; - husk.image_angle=image_angle;husk.depth=depth;husk.image_speed=0; - repeat(choose(4,5,6)){ - var explo=instance_create(x,y,obj_explosion); - explo.image_xscale=0.5;explo.image_yscale=0.5; - explo.x+=random_range(sprite_width*0.25,sprite_width*-0.25); - explo.y+=random_range(sprite_width*0.25,sprite_width*-0.25); - } - + destroy_ship_and_leave_husk(); } x=-7000;y=room_height/2; } @@ -84,7 +71,7 @@ if (hp>0) and (instance_exists(target)){ } else if (class="Battle Barge") or (class="Strike Cruiser"){ o_dist=300; - action="attack"; + action="broadside"; } else if (class="Hunter") or (class="Gladius"){ o_dist=64; @@ -114,8 +101,8 @@ if (hp>0) and (instance_exists(target)){ flank_movement(); } - if (draw_targets != false;){ - dist=point_distance(x,y,draw_targets[0], draw_targets[1]);i + if (draw_targets != false){ + dist=point_distance(x,y,draw_targets[0], draw_targets[1]); } // STC Bonuses @@ -210,7 +197,9 @@ if (hp>0) and (instance_exists(target)){ targe=instance_nearest(xx,yy,obj_en_ship); if (instance_exists(targe)){ rdir=point_direction(x,y,target.x,target.y); - if (rdir>45) and (rdir<=135) and (targe!=target){target_r=targe;right=1;} + if (rdir>45) and (rdir<=135) and (targe!=target){ + target_r=targe;right=1; + } if (rdir>225) and (rdir<=315) and (targe!=target) and (targe!=target_r){target_l=targe;left=1;} if (collision_line(x,y,x+lengthdir_x(2000,direction),y+lengthdir_y(2000,direction),obj_en_ship,0,1)) then front=1; diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 5e59d79b89..2ffbb233b0 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -2,6 +2,7 @@ function broadside_movement(){ + var _target_direction = target.direction; if (target!=0) and (action="broadside") and (target_distance>closing_distance){ if (y>=target.y){ target_distance=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); @@ -24,11 +25,18 @@ function flank_movement(){ if (target!=0 && action=="flank"){ if (!under_fire){ var _rel_direction = point_direction(target.x, target.y, x, y) - target.direction; - - if (abs(_rel_direction) < 135){ - var _target_lock = point_on_circle(target.x, target.y, 6, target.direction + _rel_direction > 0 ?135 : -135); + if (abs(_rel_direction) < 105){ + var _attack_angle = target.direction + ((_rel_direction > 0) ? 105 : -105); + if (_attack_angle > 360){ + _attack_angle -= 360; + } else if (_attack_angle< 0){ + _attack_angle = 360 -_attack_angle; + } + var _flank_margin = closing_distance*2 + var _target_lock = [target.x + lengthdir_x(_flank_margin, _attack_angle), target.y + lengthdir_y(_flank_margin, _attack_angle)] draw_targets = _target_lock; direction = turn_towards_point(direction, x,y,_target_lock[0],_target_lock[1],turning_speed); + closing_distance = 0; } else { _normal_target = true; } @@ -153,36 +161,30 @@ function facing_weapon_angle(facing){ return _direct_; } -function radians(deg){ - return deg * pi/180; -} - function point_on_circle(start_x, start_y, radius, angle){ - var _angle_radians = radians(angle); + var _angle_radians = degtorad(angle); var _final_x = start_x + (radius * cos(_angle_radians)); var _final_y = start_y + (radius * sin(_angle_radians)); return [_final_x, _final_y]; } function draw_weapon_firing_arc(wep_id){ - - var _tangent_direction = facing_weapon_angle(weapon_facing[wep_id]); - var _max_distance = weapon_range[wep_id]; - - var _left = x - _max_distance; - var _top = y - _max_distance; - var _right = x + _max_distance; - var _bottom = y + _max_distance; - - var _final = point_on_circle(x, y, _max_distance, _tangent_direction); - - var _start = point_on_circle(x, y, _max_distance, _tangent_direction+20); - - var _end = point_on_circle(x, y, _max_distance, _tangent_direction-20); - - draw_arc(_left, _top, _right,_bottom, _start[0], _start[1], _end[0], _end[1]); - draw_line(x, y, _start[0], _start[1]); - draw_line(x, y, _end[0], _end[1]); + var _tangent_direction = facing_weapon_angle(weapon_facing[wep_id]); + var _max_distance = weapon_range[wep_id]; + + var _left = x - _max_distance; + var _top = y - _max_distance; + var _right = x + _max_distance; + var _bottom = y + _max_distance; + + var _start_x = x + lengthdir_x(_max_distance, _tangent_direction - 20); + var _start_y = y + lengthdir_y(_max_distance, _tangent_direction - 20); + var _end_x = x + lengthdir_x(_max_distance, _tangent_direction + 20); + var _end_y = y + lengthdir_y(_max_distance, _tangent_direction + 20); + + draw_arc(_left, _top, _right, _bottom, _start_x, _start_y, _end_x, _end_y); + draw_line(x, y, _start_x, _start_y); + draw_line(x, y, _end_x, _end_y); } function is_targeted(){ @@ -194,8 +196,8 @@ function is_targeted(){ array_delete(bullets_for, i, 1); } else { under_fire = true; + break; } - break; } } @@ -203,11 +205,11 @@ function create_ship_projectile(wep_id){ var wep = weapon[wep_id]; var facing=weapon_facing[wep_id],ammo=weapon_ammo[wep_id],range=weapon_range[wep_id]; var dam=weapon_dam[wep_id]; + var bull = -1; if (string_count("orpedo",wep)=0) and (string_count("Interceptor",wep)=0) and (string_count("ommerz",wep)=0) and (string_count("Claws",wep)=0) and (string_count("endrils",wep)=0) && (owner != eFACTION.Necrons){ bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_en_round); bull.speed=20; bull.dam=dam; - array_push(target.bullets_for, bull.id); if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); if (facing!="front"){ bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); @@ -329,6 +331,9 @@ function create_ship_projectile(wep_id){ bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_in); bull.direction=self.direction; bull.owner=self.owner; + } + if (instance_exists(bull)){ + array_push(target.bullets_for, bull.id); } } @@ -336,7 +341,6 @@ function create_ship_projectile(wep_id){ function fire_ship_weapon(wep_id){ draw_set_alpha(1); draw_set_color(c_red); - draw_weapon_firing_arc(wep_id); var wep = weapon[wep_id]; var facing=weapon_facing[wep_id],ammo=weapon_ammo[wep_id],range=weapon_range[wep_id]; var dam=weapon_dam[wep_id]; @@ -385,7 +389,97 @@ function fire_ship_weapon(wep_id){ } } +global.ship_weapons_stats = { + "Lance Battery" : { + range : 300, + dam : 14, + facing : "front", + firing_arc : 12.5 + } + "Nova Cannon": { + range : 1500, + dam : 34, + facing : "front", + minrange : 300, + cooldown : 120, + minrange : 300, + }, + "Weapons Battery" : { + facing : "most", + cooldown : 20, + dam : 20, + firing_arc : 5, + }, + + "Interceptor Launch Bays" : { + facing : "special", + weapon_range : 9999, + ammo : 6, + cooldown , 120, + }, + "Eldar Launch Bay" : { + facing : "special", + weapon_range : 9999, + ammo : 4, + cooldown , 90, + }, + "Pulsar Lances":{ + facing : "most", + dam : 10, + weapon_cooldown : 10, + }, + "Pyro-acid Battery" : { + facing : "most", + dam : 8, + range : 300, + }, + "Feeder Tendrils" : { + facing : "most", + dam : 8, + range : 100, + }, + "Bio-Plasma Discharge":{ + range : 200, + } +} + +global.ship_defualts = { + range : 600, + facing : "front", + cooldown : 30, + minrange : 0, + dam : 0, + firing_arc : 12.5, + ship : 0, + ammo : -1, + +} +function move_data_to_current_scope(struct, overide=true){ + var _data_names = struct_get_names(struct); + for (var i=0;i pi) From 23229bb0fda654569448dc8b84e227c1f5dceb30 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 3 May 2025 16:24:05 +0100 Subject: [PATCH 028/155] ship stat assignment to stats --- objects/obj_al_ship/Alarm_0.gml | 270 +--- objects/obj_en_ship/Alarm_0.gml | 1105 +---------------- .../scr_automated_ship_combat_functions.gml | 1086 ++++++++++++++++ 3 files changed, 1137 insertions(+), 1324 deletions(-) diff --git a/objects/obj_al_ship/Alarm_0.gml b/objects/obj_al_ship/Alarm_0.gml index 14fc704942..dda1a28c89 100644 --- a/objects/obj_al_ship/Alarm_0.gml +++ b/objects/obj_al_ship/Alarm_0.gml @@ -1,70 +1,10 @@ // Sets up the ships for each race -for(var i=1; i Date: Sat, 3 May 2025 21:27:02 +0100 Subject: [PATCH 029/155] finish data transfer and kill alarms --- objects/obj_al_ship/Alarm_0.gml | 657 ------------------ objects/obj_al_ship/Create_0.gml | 4 +- objects/obj_en_ship/Alarm_0.gml | 3 - objects/obj_en_ship/Create_0.gml | 3 +- .../scr_automated_ship_combat_functions.gml | 639 +++++------------ .../scr_tyranid_fleet_functions.gml | 150 ++-- 6 files changed, 215 insertions(+), 1241 deletions(-) delete mode 100644 objects/obj_al_ship/Alarm_0.gml delete mode 100644 objects/obj_en_ship/Alarm_0.gml diff --git a/objects/obj_al_ship/Alarm_0.gml b/objects/obj_al_ship/Alarm_0.gml deleted file mode 100644 index dda1a28c89..0000000000 --- a/objects/obj_al_ship/Alarm_0.gml +++ /dev/null @@ -1,657 +0,0 @@ -// Sets up the ships for each race -assign_ship_stats(); - -// ** Imperial Navy ** -// TODO hold all these variables in a dictionary/ Constructor - - -if (class=="Sword Class Frigate"){ - sprite_index=spr_ship_sword; - ship_size=1; - name=""; - hp=100; - maxhp=100; - conditions=""; - shields=100; - maxshields=100; - leadership=80; - armour_front=5; - armour_other=5; - weapons=1; - turrets=2; - capacity=50; - carrying=0; - add_weapon_to_ship("Weapons Battery", {weapon_range:300}); -} -// ** Eldar ** -if (class=="Void Stalker"){ - sprite_index=spr_ship_void; - ship_size=3; - name=""; - hp=1000; - maxhp=1000; - conditions=""; - shields=300; - maxshields=300; - leadership=100; - armour_front=5; - armour_other=4; - weapons=3; - turrets=4; - capacity=150; - - add_weapon_to_ship("Weapons Battery"); - add_weapon_to_ship("Eldar Launch Bay"); - add_weapon_to_ship("Pulsar Lances"); -}else -if (class=="Shadow Class"){ - sprite_index=spr_ship_shadow; - ship_size=3; - name=""; - hp=600; - maxhp=600; - conditions=""; - shields=200; - maxshields=200; - leadership=90; - armour_front=5; - armour_other=4; - weapons=2; - turrets=3; - capacity=100; - carrying=0; - add_weapon_to_ship("Torpedoes"); - add_weapon_to_ship("Light Weapons Battery", {range : 450}); -}else -if (class=="Hellebore"){ - sprite_index=spr_ship_hellebore; - ship_size=1; - name=""; - hp=200; - maxhp=200; - conditions=""; - shields=200; - maxshields=200; - leadership=90; - armour_front=5; - armour_other=4; - weapons=3; - turrets=2; - capacity=50; - carrying=0; - - add_weapon_to_ship("Light Weapons Battery", {range : 450, cooldown :20, facing : "front"}); - - add_weapon_to_ship("Light Weapons Battery", {range : 450}); - add_weapon_to_ship("Eldar Launch Bay", {ammo : 1}); -}else -if (class=="Aconite"){ - sprite_index=spr_ship_aconite; - ship_size=1; - name=""; - hp=200; - maxhp=200; - conditions=""; - shields=200; - maxshields=200; - leadership=90; - armour_front=5; - armour_other=4; - weapons=3; - turrets=2; - capacity=50; - carrying=0; - add_weapon_to_ship("Light Weapons Battery", {range : 450}); -} -// ** Orkz ** -if (class=="Dethdeala"){ - sprite_index=spr_ship_deth; - ship_size=3; - name=""; - hp=1200; - maxhp=1200; - conditions=""; - shields=200; - maxshields=200; - leadership=100; - armour_front=6; - armour_other=5; - weapons=5; - turrets=3; - capacity=250; - carrying=0; - - add_weapon_to_ship("Gunz Battery", {facing:"left"}); - add_weapon_to_ship("Gunz Battery", {facing:"right"}); - add_weapon_to_ship("Bombardment Cannon"); - add_weapon_to_ship("Heavy Gunz"); - add_weapon_to_ship("Fighta Bommerz"); -}else -if (class=="Gorbag's Revenge"){ - sprite_index=spr_ship_gorbag; - ship_size=3; - name=""; - hp=1200; - maxhp=1200; - conditions=""; - shields=200; - maxshields=200; - leadership=100; - armour_front=6; - armour_other=5; - weapons=5; - turrets=3; - capacity=250; - carrying=0; - add_weapon_to_ship("Gunz Battery"); - add_weapon_to_ship("Torpedoes", {dam:12, range:300, cooldown:120}); - - add_weapon_to_ship("Fighta Bommerz": {ammo : 3}); - add_weapon_to_ship("Fighta Bommerz": {ammo : 3}); -}else -if (class=="Kroolboy") or (class=="Slamblasta"){ - ship_size=3; - sprite_index=spr_ship_krool; - if (class=="Kroolboy") then sprite_index=spr_ship_krool; - if (class=="Slamblasta") then sprite_index=spr_ship_slam; - name=""; - hp=1200; - maxhp=1200; - conditions=""; - shields=200; - maxshields=200; - leadership=100; - armour_front=6; - armour_other=5; - weapons=3; - turrets=3; - capacity=250; - carrying=0; - weapon[1]="Fighta Bommerz"; - weapon_facing[1]="special"; - weapon_dam[1]=0; - weapon_ammo[1]=3; - weapon_range[1]=9999; - weapon_cooldown[1]=120; - weapon[2]="Gunz Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=300; - weapon_cooldown[2]=30; - weapon[3]="Heavy Gunz"; - weapon_facing[3]="most"; - weapon_dam[3]=12; - weapon_range[3]=200; - weapon_cooldown[3]=40; -}else -if (class=="Battlekroozer"){ - sprite_index=spr_ship_kroozer; - ship_size=3; - name=""; - hp=1000; - maxhp=1000; - conditions=""; - shields=200; - maxshields=200; - leadership=100; - armour_front=6; - armour_other=5; - weapons=5; - turrets=3; - capacity=250; - carrying=0; - weapon[1]="Gunz Battery"; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=450; - weapon_cooldown[1]=30; - weapon[2]="Heavy Gunz"; - weapon_facing[2]="left"; - weapon_dam[2]=12; - weapon_range[2]=200; - weapon_cooldown[2]=40; - weapon[3]="Heavy Gunz"; - weapon_facing[3]="right"; - weapon_dam[3]=12; - weapon_range[3]=200; - weapon_cooldown[3]=40; - weapon[4]="Fighta Bommerz"; - weapon_facing[4]="special"; - weapon_dam[4]=0; - weapon_ammo[4]=3; - weapon_range[4]=9999; - weapon_cooldown[4]=90; - weapon[5]="Fighta Bommerz"; - weapon_facing[5]="special"; - weapon_dam[5]=0; - weapon_ammo[5]=3; - weapon_range[5]=9999; - weapon_cooldown[5]=90; - cooldown[5]=30; -}else -if (class=="Ravager"){ - sprite_index=spr_ship_ravager; - ship_size=1; - name=""; - hp=100; - maxhp=100; - conditions=""; - shields=100; - maxshields=100; - leadership=80; - armour_front=6; - armour_other=4; - weapons=2; - turrets=2; - capacity=50; - carrying=0; - weapon[1]="Gunz Battery"; - weapon_facing[1]="front"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=30; - weapon[2]="Torpedoes"; - weapon_facing[2]="front"; - weapon_dam[2]=12; - weapon_range[2]=300; - weapon_cooldown[2]=120; -} -// ** Tau ** -if (class=="Custodian"){ - sprite_index=spr_ship_custodian; - ship_size=3; - name=""; - hp=1000; - maxhp=1000; - conditions=""; - shields=200; - maxshields=200; - leadership=100; - armour_front=6; - armour_other=5; - weapons=4; - turrets=5; - capacity=1000; - carrying=0; - weapon[1]="Gravitic launcher"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=400; - weapon_minrange[1]=200; - weapon_cooldown[1]=30; - weapon[2]="Railgun Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=12; - weapon_range[2]=450; - weapon_cooldown[2]=30; - weapon[3]="Ion Cannons"; - weapon_facing[3]="most"; - weapon_dam[3]=8; - weapon_range[3]=300; - weapon_cooldown[3]=15; - weapon[4]="Manta Launch Bay"; - weapon_facing[4]="special"; - weapon_dam[4]=0; - weapon_range[4]=9999; - weapon_cooldown[4]=90; - weapon_ammo[4]=4; -}else -if (class=="Protector"){ - sprite_index=spr_ship_protector; - ship_size=2; - name=""; - hp=600; - maxhp=600; - conditions=""; - shields=200; - maxshields=200; - leadership=90; - armour_front=6; - armour_other=5; - weapons=4; - turrets=3; - capacity=250; - carrying=0; - weapon[1]="Gravitic launcher"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=400; - weapon_minrange[1]=200; - weapon_cooldown[1]=30; - weapon[2]="Railgun Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=10; - weapon_range[2]=450; - weapon_cooldown[2]=30; - weapon[3]="Ion Cannons"; - weapon_facing[3]="most"; - weapon_dam[3]=8; - weapon_range[3]=300; - weapon_cooldown[3]=15; - weapon[4]="Manta Launch Bay"; - weapon_facing[4]="special"; - weapon_dam[4]=0;weapon_range[4]=9999; - weapon_cooldown[4]=90; - weapon_ammo[4]=2; -}else -if (class=="Emissary"){ - sprite_index=spr_ship_emissary; - ship_size=2; - name=""; - hp=400; - maxhp=400; - conditions=""; - shields=100; - maxshields=100; - leadership=100; - armour_front=6; - armour_other=5; - weapons=4; - turrets=2; - capacity=100; - carrying=0; - weapon[1]="Gravitic launcher"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=400; - weapon_minrange[1]=200; - weapon_cooldown[1]=30; - weapon[2]="Railgun Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=10; - weapon_range[2]=450; - weapon_cooldown[2]=30; - weapon[3]="Ion Cannons"; - weapon_facing[3]="most"; - weapon_dam[3]=8; - weapon_range[3]=300; - weapon_cooldown[3]=15; - weapon[4]="Manta Launch Bay"; - weapon_facing[4]="special"; - weapon_dam[4]=0; - weapon_range[4]=9999; - weapon_cooldown[4]=90; - weapon_ammo[4]=1; -}else -if (class=="Warden"){ - sprite_index=spr_ship_warden; - ship_size=1; - name="";hp=100; - maxhp=100; - conditions=""; - shields=100; - maxshields=100; - leadership=80; - armour_front=5; - armour_other=4; - weapons=2; - turrets=1; - capacity=50; - carrying=0; - weapon[1]="Ion Cannon"; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=50; - weapon[2]="Railgun Battery"; - weapon_facing[2]="front"; - weapon_dam[2]=10; - weapon_range[2]=300; - weapon_cooldown[2]=60; -}else -if (class=="Castellan"){ - sprite_index=spr_ship_castellan; - ship_size=1; - name=""; - hp=100; - maxhp=100; - conditions=""; - shields=100; - maxshields=100; - leadership=80; - armour_front=5; - armour_other=4; - weapons=2; - turrets=2; - capacity=50; - carrying=0; - weapon[1]="Gravitic launcher"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=400; - weapon_minrange[1]=200; - weapon_cooldown[1]=40; - weapon[2]="Railgun Battery"; - weapon_facing[2]="front"; - weapon_dam[2]=10; - weapon_range[2]=300; - weapon_cooldown[2]=40; -} -// ** Chaos ** -if (class=="Desecrator"){ - sprite_index=spr_ship_dese; - ship_size=3; - name=""; - hp=1200; - maxhp=1200; - conditions=""; - shields=400; - maxshields=400; - leadership=90; - armour_front=7; - armour_other=5; - weapons=5; - turrets=4; - capacity=150; - carrying=0; - weapon[1]="Lance Battery"; - weapon_facing[1]="left"; - weapon_dam[1]=12; - weapon_range[1]=300; - weapon_cooldown[1]=30; - weapon[2]="Lance Battery"; - weapon_facing[2]="right"; - weapon_dam[2]=12; - weapon_range[2]=300; - weapon_cooldown[2]=30; - weapon[3]="Weapons Battery"; - weapon_facing[3]="front"; - weapon_dam[3]=18; - weapon_range[3]=600; - weapon_cooldown[3]=60; - weapon[4]="Torpedoes"; - weapon_facing[4]="front"; - weapon_dam[4]=18; - weapon_range[4]=450; - weapon_cooldown[4]=120; - weapon[5]="Fighta Bommerz"; - weapon_facing[5]="special"; - weapon_dam[5]=0; - weapon_range[5]=9999; - weapon_cooldown[5]=90; -}else -if (class=="Avenger"){ - sprite_index=spr_ship_veng; - ship_size=2; - name=""; - hp=1000; - maxhp=1000; - conditions=""; - shields=300; - maxshields=300; - leadership=85; - armour_front=5; - armour_other=5; - weapons=2; - turrets=3; - capacity=50; - carrying=0; - add_weapon_to_ship("Lance Battery", {facing : "left"}); - add_weapon_to_ship("Lance Battery", {facing : "right"}); -}else -if (class=="Carnage") or (class="Daemon"){ - sprite_index=spr_ship_carnage; - ship_size=2; - name=""; - hp=1000; - maxhp=1000; - conditions=""; - shields=300; - maxshields=300; - leadership=85; - armour_front=5; - armour_other=5; - weapons=3; - turrets=3; - capacity=50; - carrying=0; - - add_weapon_to_ship("Lance Battery"); - add_weapon_to_ship("Light Weapons Battery", {dam : 12,facing : "left", cooldown : 45}}); - add_weapon_to_ship("Light Weapons Battery", {dam : 12,facing : "right", cooldown : 45}); - if (class=="Daemon"){ - sprite_index=spr_ship_daemon; - image_alpha=0.5; - } -}else -if (class=="Iconoclast"){ - sprite_index=spr_ship_icono; - ship_size=1; - name=""; - hp=100; - maxhp=100; - conditions=""; - shields=100; - maxshields=100; - leadership=80; - armour_front=7; - armour_other=4; - weapons=1; - turrets=2; - capacity=50; - carrying=0; - add_weapon_to_ship("Light Weapons Battery"); -} -// Tyranids -if (class=="Leviathan"){ - sprite_index=spr_ship_leviathan; - ship_size=3; - name=""; - hp=1000; - maxhp=1000; - conditions=""; - shields=300; - maxshields=300; - leadership=100; - armour_front=7; - armour_other=5; - weapons=5; - turrets=3; - capacity=0; - carrying=0; - add_weapon_to_ship("Feeder Tendrils" : {dam : 12, range :160}); - add_weapon_to_ship("Bio-Plasma Discharge" : { - dam : 10, - range : 260, - cooldown : 10, - facing : "most", - }); - - add_weapon_to_ship("Pyro-Acid Battery" : { - dam : 18, - range : 500, - cooldown : 40, - facing : "front", - }); - - add_weapon_to_ship("Launch Glands"); - -}else -if (class=="Razorfiend"){ - sprite_index=spr_ship_razorfiend; - ship_size=2; - name=""; - hp=600; - maxhp=600; - conditions=""; - shields=200; - maxshields=200; - leadership=100; - armour_front=5; - armour_other=4; - weapons=3; - turrets=2; - capacity=0; - carrying=0; - - add_weapon_to_ship("Pyro-Acid Battery" , {dam : 12, facing : "front"}); - add_weapon_to_ship("Feeder Tendrils"); - add_weapon_to_ship("Massive Claws"); - -}else -if (class=="Stalker"){ - sprite_index=spr_ship_stalker; - ship_size=1; - name=""; - hp=100; - maxhp=100; - conditions=""; - shields=100; - maxshields=100; - leadership=100; - armour_front=5; - armour_other=4; - weapons=1; - turrets=0; - capacity=0; - carrying=0; - add_weapon_to_ship("Pyro-acid Battery", {cooldown : 60}); - add_weapon_to_ship("Feeder Tendrils", {cooldown : 20}); - add_weapon_to_ship("Bio-Plasma Discharge"); - -}else -if (class=="Prowler"){ - sprite_index=spr_ship_prowler; - ship_size=1; - name=""; - hp=100; - maxhp=100; - conditions=""; - shields=100; - maxshields=100; - leadership=100; - armour_front=5; - armour_other=4; - weapons=1; - turrets=0; - capacity=0; - carrying=0; - add_weapon_to_ship("Pyro-acid Battery"); - add_weapon_to_ship("Feeder Tendrils"); -} - -if (owner == eFACTION.Tyranids){ - for(var i=1; i<=2; i++){ - if (obj_fleet.en_mutation[i]=="Spore Clouds") then shields=shields+100; - if (obj_fleet.en_mutation[i]=="Health"){ - hp=floor(hp*1.1); - maxhp=hp; - } - if (obj_fleet.en_mutation[i]=="Armour") then armour_front+=1; - if (obj_fleet.en_mutation[i]=="Speed") then speed_bonus=speed_bonus*1.1; - if (obj_fleet.en_mutation[i]=="Turn") then turn_bonus=1.2; - if (obj_fleet.en_mutation[i]=="Turret") then turrets+=1; - } -} - -if (owner != eFACTION.Eldar){ - hp/=2; - maxhp=hp; - shields=shields/2; - maxshields=shields; -} -// if (obj_fleet.enemy=2){hp=hp*0.75;maxhp=hp;shields=shields*0.75;maxshields=shields;} -// hp=1;shields=1; -// if (obj_fleet.enemy="orks") then name=global.name_generator.generate_ork_ship_name(); -name="sdagdsagdasg"; -// show_message(string(class)); diff --git a/objects/obj_al_ship/Create_0.gml b/objects/obj_al_ship/Create_0.gml index 092ef51cd2..505d2f8502 100644 --- a/objects/obj_al_ship/Create_0.gml +++ b/objects/obj_al_ship/Create_0.gml @@ -36,7 +36,7 @@ turrets=0; fighters=0; bombers=0; thunderhawks=0; - +weapons = []; for(var i=0; i<8; i++){ weapon[i]=""; weapon_facing[i]=""; @@ -48,4 +48,4 @@ for(var i=0; i<8; i++){ weapon_minrange[i]=0; } -action_set_alarm(1, 0); +assign_ship_stats(); diff --git a/objects/obj_en_ship/Alarm_0.gml b/objects/obj_en_ship/Alarm_0.gml deleted file mode 100644 index a8a1483fd2..0000000000 --- a/objects/obj_en_ship/Alarm_0.gml +++ /dev/null @@ -1,3 +0,0 @@ - - -assign_ship_stats(); diff --git a/objects/obj_en_ship/Create_0.gml b/objects/obj_en_ship/Create_0.gml index fabf01760f..e69b0975dc 100644 --- a/objects/obj_en_ship/Create_0.gml +++ b/objects/obj_en_ship/Create_0.gml @@ -53,5 +53,4 @@ repeat(6){i+=1; weapon_range[i]=0; weapon_minrange[i]=0; } - -action_set_alarm(1, 0); +assign_ship_stats(); diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 8c25220d33..4f1f88ae1e 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -462,6 +462,12 @@ global.ship_weapons_stats = { ammo : 4, cooldown , 90, }, + "Manta Launch Bay" : { + facing : "special", + weapon_range : 9999, + ammo : 4, + cooldown , 90, + } "Pulsar Lances":{ facing : "most", dam : 10, @@ -488,12 +494,30 @@ global.ship_weapons_stats = { dam : 20, range : 64, cooldown : 60, - } + }, "Launch Glands" : { facing : "special", weapon_range : 9999, ammo : 6, cooldown , 120, + }, + "Gravitic launcher" : { + dam : 12, + range : 400, + minrange : 200, + cooldown:30, + }, + "Railgun Battery": { + facing : "most" + dam :12, + range : 450, + cooldown:30, + } + "Ion Cannons": { + facing : "most" + dam :8, + range : 300, + cooldown:15, } } @@ -629,9 +653,9 @@ function assign_ship_stats(){ // Eldar - if (class="Void Stalker"){sprite_index=spr_ship_void; + if (class="Void Stalker"){ + sprite_index=spr_ship_void; ship_size=3; - name=""; hp=1000; maxhp=1000; @@ -639,44 +663,21 @@ function assign_ship_stats(){ shields=300; maxshields=300; leadership=100; - armour_front=5; armour_other=4; weapons=3; turrets=4; capacity=150; - carrying=0; - - weapon[1]="Eldar Launch Bay"; - weapon_facing[1]="special"; - weapon_dam[1]=0; - weapon_range[1]=9999; - weapon_cooldown[1]=90; - weapon_ammo[1]=4; - - weapon[2]="Weapons Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=14; - weapon_range[2]=600; - weapon_cooldown[2]=30; - - weapon[3]="Pulsar Lances"; - weapon_facing[3]="most"; - weapon_dam[3]=10; - weapon_range[3]=600; - weapon_cooldown[3]=10; - - // weapon[4]="Torpedoes"; - weapon_facing[4]="front"; - weapon_dam[4]=12; - weapon_range[4]=450; - weapon_cooldown[4]=90; + + add_weapon_to_ship("Weapons Battery"); + add_weapon_to_ship("Eldar Launch Bay"); + add_weapon_to_ship("Pulsar Lances"); } if (class="Shadow Class"){sprite_index=spr_ship_shadow; + sprite_index=spr_ship_shadow; ship_size=3; - name=""; hp=600; maxhp=600; @@ -684,31 +685,20 @@ function assign_ship_stats(){ shields=200; maxshields=200; leadership=90; - armour_front=5; armour_other=4; weapons=2; turrets=3; capacity=100; carrying=0; - - weapon[1]="Torpedoes"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=450; - weapon_cooldown[1]=90; - - weapon[2]="Weapons Battery"; - weapon_facing[2]="front"; - weapon_dam[2]=10; - weapon_range[2]=450; - weapon_cooldown[2]=30; + add_weapon_to_ship("Torpedoes"); + add_weapon_to_ship("Light Weapons Battery", {range : 450}); } if (class="Hellebore"){sprite_index=spr_ship_hellebore; + sprite_index=spr_ship_hellebore; ship_size=1; - name=""; hp=200; maxhp=200; @@ -716,38 +706,23 @@ function assign_ship_stats(){ shields=200; maxshields=200; leadership=90; - armour_front=5; armour_other=4; weapons=3; turrets=2; capacity=50; carrying=0; - - weapon[1]="Pulsar Lances"; - weapon_facing[1]="front"; - weapon_dam[1]=10; - weapon_range[1]=450; - weapon_cooldown[1]=20; - - weapon[2]="Weapons Battery"; - weapon_facing[2]="front"; - weapon_dam[2]=8; - weapon_range[2]=450; - weapon_cooldown[2]=30; - - weapon[3]="Eldar Launch Bay"; - weapon_facing[3]="special"; - weapon_dam[3]=0; - weapon_range[3]=9999; - weapon_cooldown[3]=90; - weapon_ammo[1]=1; + + add_weapon_to_ship("Light Weapons Battery", {range : 450, cooldown :20, facing : "front"}); + + add_weapon_to_ship("Light Weapons Battery", {range : 450}); + add_weapon_to_ship("Eldar Launch Bay", {ammo : 1}); } if (class="Aconite"){sprite_index=spr_ship_aconite; + sprite_index=spr_ship_aconite; ship_size=1; - name=""; hp=200; maxhp=200; @@ -755,19 +730,13 @@ function assign_ship_stats(){ shields=200; maxshields=200; leadership=90; - armour_front=5; armour_other=4; weapons=3; turrets=2; capacity=50; carrying=0; - - weapon[1]="Weapons Battery"; - weapon_facing[1]="front"; - weapon_dam[1]=8; - weapon_range[1]=450; - weapon_cooldown[1]=30; + add_weapon_to_ship("Light Weapons Battery", {range : 450}); } @@ -776,9 +745,9 @@ function assign_ship_stats(){ // Orks - if (class="Dethdeala"){sprite_index=spr_ship_deth; + if (class="Dethdeala"){ + sprite_index=spr_ship_deth; ship_size=3; - name=""; hp=1200; maxhp=1200; @@ -786,106 +755,50 @@ function assign_ship_stats(){ shields=200; maxshields=200; leadership=100; - armour_front=6; armour_other=5; weapons=5; turrets=3; capacity=250; carrying=0; - - weapon[1]="Gunz Battery"; - weapon_facing[1]="left"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=30; - - weapon[2]="Gunz Battery"; - weapon_facing[2]="right"; - weapon_dam[2]=8; - weapon_range[2]=300; - weapon_cooldown[2]=30; - - weapon[3]="Bombardment Cannon"; - weapon_facing[3]="front"; - weapon_dam[3]=12; - weapon_range[3]=450; - weapon_cooldown[3]=120; - - weapon[4]="Heavy Gunz"; - weapon_facing[4]="most"; - weapon_dam[4]=12; - weapon_range[4]=200; - weapon_cooldown[4]=40; - - weapon[5]="Fighta Bommerz"; - weapon_facing[5]="special"; - weapon_dam[5]=0; - weapon_range[5]=9999; - weapon_cooldown[5]=90; + + add_weapon_to_ship("Gunz Battery", {facing:"left"}); + add_weapon_to_ship("Gunz Battery", {facing:"right"}); + add_weapon_to_ship("Bombardment Cannon"); + add_weapon_to_ship("Heavy Gunz"); + add_weapon_to_ship("Fighta Bommerz"); } - if (class="Gorbag's Revenge"){sprite_index=spr_ship_gorbag; - ship_size=3; - - name=""; - hp=1200; - maxhp=1200; - conditions=""; - shields=200; - maxshields=200; - leadership=100; - - armour_front=6; - armour_other=5; - weapons=5; - turrets=3; - capacity=250; - carrying=0; - - weapon[1]="Gunz Battery"; - weapon_facing[1]="front"; - weapon_dam[1]=8; - weapon_range[1]=450; - weapon_cooldown[1]=30; - - weapon[2]="Torpedoes"; - weapon_facing[2]="front"; - weapon_dam[2]=12; - weapon_range[2]=300; - weapon_cooldown[2]=120; - - weapon[3]="Heavy Gunz"; - weapon_facing[3]="most"; - weapon_dam[3]=12; - weapon_range[3]=200; - weapon_cooldown[3]=40; - - weapon[4]="Fighta Bommerz"; - weapon_facing[4]="special"; - weapon_dam[4]=0; - weapon_ammo[4]=3; - weapon_range[4]=9999; - weapon_cooldown[4]=90; - - weapon[5]="Fighta Bommerz"; - weapon_facing[5]="special"; - weapon_dam[5]=0; - weapon_ammo[5]=3; - weapon_range[5]=9999; - weapon_cooldown[5]=90; - cooldown[5]=30; + if (class="Gorbag's Revenge"){ + sprite_index=spr_ship_gorbag; + ship_size=3; + name=""; + hp=1200; + maxhp=1200; + conditions=""; + shields=200; + maxshields=200; + leadership=100; + armour_front=6; + armour_other=5; + weapons=5; + turrets=3; + capacity=250; + carrying=0; + add_weapon_to_ship("Gunz Battery"); + add_weapon_to_ship("Torpedoes", {dam:12, range:300, cooldown:120}); + + add_weapon_to_ship("Fighta Bommerz": {ammo : 3}); + add_weapon_to_ship("Fighta Bommerz": {ammo : 3}); } - if (class="Kroolboy") or (class="Slamblasta"){ship_size=3; + if (class=="Kroolboy") or (class=="Slamblasta"){ + ship_size=3; sprite_index=spr_ship_krool; - - if (class="Kroolboy") then sprite_index=spr_ship_krool; - - if (class="Slamblasta") then sprite_index=spr_ship_slam; - + if (class=="Kroolboy") then sprite_index=spr_ship_krool; + if (class=="Slamblasta") then sprite_index=spr_ship_slam; name=""; hp=1200; maxhp=1200; @@ -893,38 +806,20 @@ function assign_ship_stats(){ shields=200; maxshields=200; leadership=100; - armour_front=6; armour_other=5; weapons=3; turrets=3; capacity=250; carrying=0; - - weapon[1]="Fighta Bommerz"; - weapon_facing[1]="special"; - weapon_dam[1]=0; - weapon_ammo[1]=3; - weapon_range[1]=9999; - weapon_cooldown[1]=120; - - weapon[2]="Gunz Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=300; - weapon_cooldown[2]=30; - - weapon[3]="Heavy Gunz"; - weapon_facing[3]="most"; - weapon_dam[3]=12; - weapon_range[3]=200; - weapon_cooldown[3]=40; - - } - if (class="Battlekroozer"){sprite_index=spr_ship_kroozer; - ship_size=3; + add_weapon_to_ship("Fighta Bommerz", {ammo : 3, cooldown : 120}); + add_weapon_to_ship("Gunz Battery"); + add_weapon_to_ship("Heavy Gunz"); + }else if (class=="Battlekroozer"){ + sprite_index=spr_ship_kroozer; + ship_size=3; name=""; hp=1000; maxhp=1000; @@ -932,52 +827,21 @@ function assign_ship_stats(){ shields=200; maxshields=200; leadership=100; - armour_front=6; armour_other=5; weapons=5; turrets=3; capacity=250; carrying=0; - - weapon[1]="Gunz Battery"; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=450; - weapon_cooldown[1]=30; - - weapon[2]="Heavy Gunz"; - weapon_facing[2]="left"; - weapon_dam[2]=12; - weapon_range[2]=200; - weapon_cooldown[2]=40; - - weapon[3]="Heavy Gunz"; - weapon_facing[3]="right"; - weapon_dam[3]=12; - weapon_range[3]=200; - weapon_cooldown[3]=40; - - weapon[4]="Fighta Bommerz"; - weapon_facing[4]="special"; - weapon_dam[4]=0; - weapon_ammo[4]=3; - weapon_range[4]=9999; - weapon_cooldown[4]=90; - - weapon[5]="Fighta Bommerz"; - weapon_facing[5]="special"; - weapon_dam[5]=0; - weapon_ammo[5]=3; - weapon_range[5]=9999; - weapon_cooldown[5]=90; - cooldown[5]=30; - - } - - if (class="Ravager"){sprite_index=spr_ship_ravager; + add_weapon_to_ship("Gunz Battery" , {range : 450}); + add_weapon_to_ship("Heavy Gunz" , {facing : "left"}); + add_weapon_to_ship("Heavy Gunz" , {facing : "right"}); + add_weapon_to_ship("Fighta Bommerz"); + add_weapon_to_ship("Fighta Bommerz"); + }else + if (class=="Ravager"){ + sprite_index=spr_ship_ravager; ship_size=1; - name=""; hp=100; maxhp=100; @@ -985,33 +849,19 @@ function assign_ship_stats(){ shields=100; maxshields=100; leadership=80; - armour_front=6; armour_other=4; weapons=2; turrets=2; capacity=50; carrying=0; - - weapon[1]="Gunz Battery"; - weapon_facing[1]="front"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=30; - - weapon[2]="Torpedoes"; - weapon_facing[2]="front"; - weapon_dam[2]=12; - weapon_range[2]=300; - weapon_cooldown[2]=120; - + add_weapon_to_ship("Gunz Battery"); + add_weapon_to_ship("Torpedoes", {range : 300, cooldown:120}); } - - // Tau - - if (class="Custodian"){sprite_index=spr_ship_custodian; + // ** Tau ** + if (class=="Custodian"){ + sprite_index=spr_ship_custodian; ship_size=3; - name=""; hp=1000; maxhp=1000; @@ -1019,45 +869,21 @@ function assign_ship_stats(){ shields=200; maxshields=200; leadership=100; - armour_front=6; armour_other=5; weapons=4; turrets=5; capacity=1000; carrying=0; - - weapon[1]="Gravitic launcher"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=400; - weapon_minrange[1]=200; - weapon_cooldown[1]=30; - - weapon[2]="Railgun Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=12; - weapon_range[2]=450; - weapon_cooldown[2]=30; - - weapon[3]="Ion Cannons"; - weapon_facing[3]="most"; - weapon_dam[3]=8; - weapon_range[3]=300; - weapon_cooldown[3]=15; - - weapon[4]="Manta Launch Bay"; - weapon_facing[4]="special"; - weapon_dam[4]=0; - weapon_range[4]=9999; - weapon_cooldown[4]=90; - weapon_ammo[4]=4; - - } - - if (class="Protector"){sprite_index=spr_ship_protector; + add_weapon_to_ship("Gravitic launcher"); + add_weapon_to_ship("Railgun Battery"); + add_weapon_to_ship("Ion Cannons"); + add_weapon_to_ship("Manta Launch Bay"); + + }else + if (class=="Protector"){ + sprite_index=spr_ship_protector; ship_size=2; - name=""; hp=600; maxhp=600; @@ -1065,45 +891,20 @@ function assign_ship_stats(){ shields=200; maxshields=200; leadership=90; - armour_front=6; armour_other=5; weapons=4; turrets=3; capacity=250; carrying=0; - - weapon[1]="Gravitic launcher"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=400; - weapon_minrange[1]=200; - weapon_cooldown[1]=30; - - weapon[2]="Railgun Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=10; - weapon_range[2]=450; - weapon_cooldown[2]=30; - - weapon[3]="Ion Cannons"; - weapon_facing[3]="most"; - weapon_dam[3]=8; - weapon_range[3]=300; - weapon_cooldown[3]=15; - - weapon[4]="Manta Launch Bay"; - weapon_facing[4]="special"; - weapon_dam[4]=0; - weapon_range[4]=9999; - weapon_cooldown[4]=90; - weapon_ammo[4]=2; - - } - - if (class="Emissary"){sprite_index=spr_ship_emissary; + add_weapon_to_ship("Gravitic launcher"); + add_weapon_to_ship("Railgun Battery"); + add_weapon_to_ship("Ion Cannons"); + add_weapon_to_ship("Manta Launch Bay", {ammo:2}); + }else + if (class=="Emissary"){ + sprite_index=spr_ship_emissary; ship_size=2; - name=""; hp=400; maxhp=400; @@ -1111,77 +912,39 @@ function assign_ship_stats(){ shields=100; maxshields=100; leadership=100; - armour_front=6; armour_other=5; weapons=4; turrets=2; capacity=100; carrying=0; - - weapon[1]="Gravitic launcher"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=400; - weapon_minrange[1]=200; - weapon_cooldown[1]=30; - - weapon[2]="Railgun Battery"; - weapon_facing[2]="most"; - weapon_dam[2]=10; - weapon_range[2]=450; - weapon_cooldown[2]=30; - - weapon[3]="Ion Cannons"; - weapon_facing[3]="most"; - weapon_dam[3]=8; - weapon_range[3]=300; - weapon_cooldown[3]=15; - - weapon[4]="Manta Launch Bay"; - weapon_facing[4]="special"; - weapon_dam[4]=0; - weapon_range[4]=9999; - weapon_cooldown[4]=90; - weapon_ammo[4]=1; - - } - - if (class="Warden"){sprite_index=spr_ship_warden; + add_weapon_to_ship("Gravitic launcher"); + add_weapon_to_ship("Railgun Battery"); + add_weapon_to_ship("Ion Cannons"); + add_weapon_to_ship("Manta Launch Bay", {ammo:1}); + }else + if (class=="Warden"){ + sprite_index=spr_ship_warden; ship_size=1; - - name=""; - hp=100; + name="";hp=100; maxhp=100; conditions=""; shields=100; maxshields=100; leadership=80; - armour_front=5; armour_other=4; weapons=2; turrets=1; capacity=50; carrying=0; - - weapon[1]="Ion Cannon"; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=50; - - weapon[2]="Railgun Battery"; - weapon_facing[2]="front"; - weapon_dam[2]=10; - weapon_range[2]=300; - weapon_cooldown[2]=60; - - } + add_weapon_to_ship("Ion Cannons", {cooldown:50}); + add_weapon_to_ship("Railgun Battery", {cooldown:60, range:300}); - if (class="Castellan"){sprite_index=spr_ship_castellan; + }else + if (class=="Castellan"){ + sprite_index=spr_ship_castellan; ship_size=1; - name=""; hp=100; maxhp=100; @@ -1189,34 +952,19 @@ function assign_ship_stats(){ shields=100; maxshields=100; leadership=80; - armour_front=5; armour_other=4; weapons=2; turrets=2; capacity=50; carrying=0; - - weapon[1]="Gravitic launcher"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=400; - weapon_minrange[1]=200; - weapon_cooldown[1]=40; - - weapon[2]="Railgun Battery"; - weapon_facing[2]="front"; - weapon_dam[2]=10; - weapon_range[2]=300; - weapon_cooldown[2]=40; - + add_weapon_to_ship("Gravitic launcher"); + add_weapon_to_ship("Railgun Battery", {cooldown:40, range:300}); } - - // Chaos - - if (class="Desecrator"){sprite_index=spr_ship_dese; + // ** Chaos ** + if (class=="Desecrator"){ + sprite_index=spr_ship_dese; ship_size=3; - name=""; hp=1200; maxhp=1200; @@ -1224,49 +972,22 @@ function assign_ship_stats(){ shields=400; maxshields=400; leadership=90; - armour_front=7; armour_other=5; weapons=5; turrets=4; capacity=150; carrying=0; - - weapon[1]="Lance Battery"; - weapon_facing[1]="left"; - weapon_dam[1]=12; - weapon_range[1]=300; - weapon_cooldown[1]=30; - - weapon[2]="Lance Battery"; - weapon_facing[2]="right"; - weapon_dam[2]=12; - weapon_range[2]=300; - weapon_cooldown[2]=30; - - weapon[3]="Weapons Battery"; - weapon_facing[3]="front"; - weapon_dam[3]=18; - weapon_range[3]=600; - weapon_cooldown[3]=60; - - weapon[4]="Torpedoes"; - weapon_facing[4]="front"; - weapon_dam[4]=18; - weapon_range[4]=450; - weapon_cooldown[4]=120; - - weapon[5]="Fighta Bommerz"; - weapon_facing[5]="special"; - weapon_dam[5]=0; - weapon_range[5]=9999; - weapon_cooldown[5]=90; - + add_weapon_to_ship("Lance Battery", {facing:"left"}); + add_weapon_to_ship("Lance Battery", {facing:"right"}); + add_weapon_to_ship("Weapons Battery"); + add_weapon_to_ship("Torpedoes", {cooldown:120}); + add_weapon_to_ship("Fighta Bommerz"); } - if (class="Avenger"){sprite_index=spr_ship_veng; + if (class="Avenger"){ + sprite_index=spr_ship_veng; ship_size=2; - name=""; hp=1000; maxhp=1000; @@ -1274,31 +995,20 @@ function assign_ship_stats(){ shields=300; maxshields=300; leadership=85; - armour_front=5; armour_other=5; weapons=2; turrets=3; capacity=50; carrying=0; - - weapon[1]="Lance Battery"; - weapon_facing[1]="left"; - weapon_dam[1]=12; - weapon_range[1]=300; - weapon_cooldown[1]=30; - - weapon[2]="Lance Battery"; - weapon_facing[2]="right"; - weapon_dam[2]=12; - weapon_range[2]=300; - weapon_cooldown[2]=30; + add_weapon_to_ship("Lance Battery", {facing : "left"}); + add_weapon_to_ship("Lance Battery", {facing : "right"}); } - if (class="Carnage") or (class="Daemon"){sprite_index=spr_ship_carnage; + if (class="Carnage") or (class="Daemon"){ + sprite_index=spr_ship_carnage; ship_size=2; - name=""; hp=1000; maxhp=1000; @@ -1306,40 +1016,27 @@ function assign_ship_stats(){ shields=300; maxshields=300; leadership=85; - armour_front=5; armour_other=5; weapons=3; turrets=3; capacity=50; carrying=0; - - weapon[1]="Lance Battery"; - weapon_facing[1]="most"; - weapon_dam[1]=12; - weapon_range[1]=450; - weapon_cooldown[1]=30; - - weapon[2]="Weapons Battery"; - weapon_facing[2]="left"; - weapon_dam[2]=12; - weapon_range[2]=300; - weapon_cooldown[2]=45; - - weapon[3]="Weapons Battery"; - weapon_facing[3]="right"; - weapon_dam[3]=12; - weapon_range[3]=300; - weapon_cooldown[3]=45; - - if (class="Daemon"){sprite_index=spr_ship_daemon; - image_alpha=0.1; - } + + add_weapon_to_ship("Lance Battery"); + add_weapon_to_ship("Light Weapons Battery", {dam : 12,facing : "left", cooldown : 45}); + add_weapon_to_ship("Light Weapons Battery", {dam : 12,facing : "right", cooldown : 45}); + if (class=="Daemon"){ + sprite_index=spr_ship_daemon; + image_alpha=0.5; + } } + - if (class="Iconoclast"){sprite_index=spr_ship_icono; + if (class="Iconoclast"){ + sprite_index=spr_ship_icono; + sprite_index=spr_ship_icono; ship_size=1; - name=""; hp=100; maxhp=100; @@ -1347,19 +1044,13 @@ function assign_ship_stats(){ shields=100; maxshields=100; leadership=80; - armour_front=7; armour_other=4; weapons=1; turrets=2; capacity=50; carrying=0; - - weapon[1]="Weapons Battery"; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=30; + add_weapon_to_ship("Light Weapons Battery"); } @@ -1529,19 +1220,31 @@ function assign_ship_stats(){ + if (owner == eFACTION.Tyranids){ + for(var i=1; i<=2; i++){ + if (obj_fleet.en_mutation[i]=="Spore Clouds") then shields=shields+100; + if (obj_fleet.en_mutation[i]=="Health"){ + hp=floor(hp*1.1); + maxhp=hp; + } + if (obj_fleet.en_mutation[i]=="Armour") then armour_front+=1; + if (obj_fleet.en_mutation[i]=="Speed") then speed_bonus=speed_bonus*1.1; + if (obj_fleet.en_mutation[i]=="Turn") then turn_bonus=1.2; + if (obj_fleet.en_mutation[i]=="Turret") then turrets+=1; + } + } - - - - - - if (owner != eFACTION.Eldar) and (owner != eFACTION.Necrons){ - hp=hp/2; + if (owner != eFACTION.Eldar){ + hp/=2; maxhp=hp; shields=shields/2; maxshields=shields; - } + // if (obj_fleet.enemy=2){hp=hp*0.75;maxhp=hp;shields=shields*0.75;maxshields=shields;} + // hp=1;shields=1; + // if (obj_fleet.enemy="orks") then name=global.name_generator.generate_ork_ship_name(); + // show_message(string(class)); + bridge=maxhp; diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index 073b11b1fa..105875bc6e 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -233,47 +233,9 @@ function organise_tyranid_fleet_bio(){ } } -function nid_ship_weapons_set(weapon,slot){ - var weapons = { - "Feeder Tendrils":{ - weapon_facing : "most", - weapon_dam : 12, - weapon_range : 160, - weapon_cooldown : 30, - }, - "Bio-Plasma Discharge":{ - weapon_facing : "most", - weapon_dam : 10, - weapon_range : 260, - weapon_cooldown : 30, - }, - "Pyro-Acid Battery":{ - weapon_facing : "front", - weapon_dam : 18, - weapon_range : 500, - weapon_cooldown : 40, - }, - "Launch Glands":{ - weapon_facing : "special", - weapon_dam : 9999, - weapon_range : 6, - weapon_cooldown : 120, - }, - } - if (struct_exists(weapons, weapon)){ - var wep_choice = weapons[$ weapon]; - weapon[slot]=weapon; - weapon_facing[slot]=wep_choice.weapon_facing; - weapon_dam[slot]=wep_choice.weapon_dam; - weapon_range[slot]=wep_choice.weapon_range; - weapon_cooldown[slot]=wep_choice.weapon_cooldown; - } -} - - function set_nid_ships(){ - if (class="Leviathan"){ + if (class=="Leviathan"){ sprite_index=spr_ship_leviathan; ship_size=3; name=""; @@ -289,13 +251,25 @@ function set_nid_ships(){ turrets=3; capacity=0; carrying=0; - nid_ship_weapons_set("Feeder Tendrils", 1); - nid_ship_weapons_set("Bio-Plasma Discharge", 2); - nid_ship_weapons_set("Pyro-Acid Battery", 3); - nid_ship_weapons_set("Launch Glands", 4); - } + add_weapon_to_ship("Feeder Tendrils" : {dam : 12, range :160}); + add_weapon_to_ship("Bio-Plasma Discharge" : { + dam : 10, + range : 260, + cooldown : 10, + facing : "most", + }); - else if (class="Razorfiend"){ + add_weapon_to_ship("Pyro-Acid Battery" : { + dam : 18, + range : 500, + cooldown : 40, + facing : "front", + }); + + add_weapon_to_ship("Launch Glands"); + + }else + if (class=="Razorfiend"){ sprite_index=spr_ship_razorfiend; ship_size=2; name=""; @@ -308,25 +282,16 @@ function set_nid_ships(){ armour_front=5; armour_other=4; weapons=3; - turrets=2;capacity=0;carrying=0; - weapon[1]="Pyro-Acid Battery"; - weapon_facing[1]="front"; - weapon_dam[1]=12; - weapon_range[1]=300; - weapon_cooldown[1]=30; - weapon[2]="Feeder Tendrils"; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=100; - weapon_cooldown[2]=30; - weapon[3]="Massive Claws"; - weapon_facing[3]="most"; - weapon_dam[3]=20; - weapon_range[3]=64; - weapon_cooldown[3]=60; - } + turrets=2; + capacity=0; + carrying=0; + + add_weapon_to_ship("Pyro-Acid Battery" , {dam : 12, facing : "front"}); + add_weapon_to_ship("Feeder Tendrils"); + add_weapon_to_ship("Massive Claws"); - if (class="Stalker"){ + }else + if (class=="Stalker"){ sprite_index=spr_ship_stalker; ship_size=1; name=""; @@ -339,25 +304,15 @@ function set_nid_ships(){ armour_front=5; armour_other=4; weapons=1; - turrets=0;capacity=0;carrying=0; - weapon[1]="Pyro-Acid Battery"; - weapon_facing[1]="front"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=60; - weapon[2]="Feeder Tendrils"; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=100; - weapon_cooldown[2]=30; - weapon[3]="Bio-Plasma Discharge"; - weapon_facing[3]="front"; - weapon_dam[3]=6; - weapon_range[3]=200; - weapon_cooldown[3]=60; - } + turrets=0; + capacity=0; + carrying=0; + add_weapon_to_ship("Pyro-acid Battery", {cooldown : 60}); + add_weapon_to_ship("Feeder Tendrils", {cooldown : 20}); + add_weapon_to_ship("Bio-Plasma Discharge"); - else if (class="Prowler"){ + }else + if (class=="Prowler"){ sprite_index=spr_ship_prowler; ship_size=1; name=""; @@ -370,34 +325,11 @@ function set_nid_ships(){ armour_front=5; armour_other=4; weapons=1; - turrets=0;capacity=0;carrying=0; - weapon[1]="Pyro-acid Battery"; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=30; - weapon[2]="Feeder Tendrils"; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=100; - weapon_cooldown[1]=30; + turrets=0; + capacity=0; + carrying=0; + add_weapon_to_ship("Pyro-acid Battery"); + add_weapon_to_ship("Feeder Tendrils"); } - - - - var i=0; - repeat(2){ - i+=1; - if (obj_fleet.en_mutation[i]=="Spore Clouds") then shields=shields+100; - if (obj_fleet.en_mutation[i]=="Health"){ - hp=floor(hp*1.1); - maxhp=hp; - } - if (obj_fleet.en_mutation[i]=="Armour") then armour_front+=1; - if (obj_fleet.en_mutation[i]=="Speed") then speed_bonus=speed_bonus*1.1; - if (obj_fleet.en_mutation[i]=="Turn") then turn_bonus=1.2; - if (obj_fleet.en_mutation[i]=="Turret") then turrets+=1; - } - } \ No newline at end of file From 86aaa73ee5a925b669929744fd3d857ac567e299 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 3 May 2025 22:17:45 +0100 Subject: [PATCH 030/155] finish ork conversion --- ChapterMaster.yyp | 1 + objects/obj_al_ship/obj_al_ship.yy | 1 - objects/obj_en_ship/obj_en_ship.yy | 1 - .../scr_automated_ship_combat_functions.gml | 896 ------------------ .../scr_ship_combat_data.gml | 892 +++++++++++++++++ .../scr_ship_combat_data.yy | 13 + 6 files changed, 906 insertions(+), 898 deletions(-) create mode 100644 scripts/scr_ship_combat_data/scr_ship_combat_data.gml create mode 100644 scripts/scr_ship_combat_data/scr_ship_combat_data.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index bd53096c96..2cb14778e2 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -884,6 +884,7 @@ {"id":{"name":"scr_serialization_functions","path":"scripts/scr_serialization_functions/scr_serialization_functions.yy",},}, {"id":{"name":"scr_shader_initialize","path":"scripts/scr_shader_initialize/scr_shader_initialize.yy",},}, {"id":{"name":"scr_ship_battle","path":"scripts/scr_ship_battle/scr_ship_battle.yy",},}, + {"id":{"name":"scr_ship_combat_data","path":"scripts/scr_ship_combat_data/scr_ship_combat_data.yy",},}, {"id":{"name":"scr_ship_count","path":"scripts/scr_ship_count/scr_ship_count.yy",},}, {"id":{"name":"scr_ship_occupants","path":"scripts/scr_ship_occupants/scr_ship_occupants.yy",},}, {"id":{"name":"scr_shoot","path":"scripts/scr_shoot/scr_shoot.yy",},}, diff --git a/objects/obj_al_ship/obj_al_ship.yy b/objects/obj_al_ship/obj_al_ship.yy index e6be455e47..637e2f3fde 100644 --- a/objects/obj_al_ship/obj_al_ship.yy +++ b/objects/obj_al_ship/obj_al_ship.yy @@ -3,7 +3,6 @@ "%Name":"obj_al_ship", "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], diff --git a/objects/obj_en_ship/obj_en_ship.yy b/objects/obj_en_ship/obj_en_ship.yy index 0e2b4100ef..c03f0d75c9 100644 --- a/objects/obj_en_ship/obj_en_ship.yy +++ b/objects/obj_en_ship/obj_en_ship.yy @@ -3,7 +3,6 @@ "%Name":"obj_en_ship", "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 4f1f88ae1e..e92d5d43fa 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -146,21 +146,6 @@ function draw_arc(x1,y1,x2,y2,x3,y3,x4,y4,precision=24){ return 0; } -function facing_weapon_angle(facing){ - var _direct_ = direction; - switch (facing){ - case "right": - _direct_+=90; - break; - case "left": - _direct_-=90; - break; - default: - break; - } - return _direct_; -} - function point_on_circle(start_x, start_y, radius, angle){ var _angle_radians = degtorad(angle); var _final_x = start_x + (radius * cos(_angle_radians)); @@ -389,886 +374,5 @@ function fire_ship_weapon(wep_id){ } } -global.ship_weapons_stats = { - "Lance Battery" : { - range : 300, - dam : 14, - facing : "front", - firing_arc : 12.5 - } - "Nova Cannon": { - range : 1500, - dam : 34, - facing : "front", - minrange : 300, - cooldown : 120, - minrange : 300, - }, - "Weapons Battery" : { - facing : "most", - cooldown : 20, - dam : 20, - firing_arc : 5, - }, - "Light Weapons Battery" : { - facing : "most", - range : 300, - cooldown : 30, - dam : 8, - firing_arc : 8, - }, - "Gunz Battery" : { - facing : "front", - range : 300, - cooldown : 30, - dam : 8, - firing_arc : 15, - }, - "Heavy Gunz" : { - weapon_facing : "most", - dam : 12, - range : 200, - cooldown : 40, - }, - "Bombardment Cannon"{ - facing : "front", - dam : 12, - range : 450, - cooldown : 120, - firing_arc : 4, - }, - - "Torpedoes" :{ - dam : 12, - range : 450, - cooldown : 90, - }, - - "Interceptor Launch Bays" : { - facing : "special", - weapon_range : 9999, - ammo : 6, - cooldown , 120, - }, - "Fighta Bommerz":{ - facing : "special", - weapon_range : 9999, - ammo : 8, - cooldown , 90, - } - "Eldar Launch Bay" : { - facing : "special", - weapon_range : 9999, - ammo : 4, - cooldown , 90, - }, - "Manta Launch Bay" : { - facing : "special", - weapon_range : 9999, - ammo : 4, - cooldown , 90, - } - "Pulsar Lances":{ - facing : "most", - dam : 10, - weapon_cooldown : 10, - }, - "Pyro-acid Battery" : { - facing : "most", - dam : 8, - range : 300, - }, - "Feeder Tendrils" : { - facing : "most", - dam : 8, - range : 100, - firing_arc : 50, - }, - "Bio-Plasma Discharge":{ - range : 200, - cooldown : 60, - dam : 6, - }, - "Massive Claws" : { - facing :"most", - dam : 20, - range : 64, - cooldown : 60, - }, - "Launch Glands" : { - facing : "special", - weapon_range : 9999, - ammo : 6, - cooldown , 120, - }, - "Gravitic launcher" : { - dam : 12, - range : 400, - minrange : 200, - cooldown:30, - }, - "Railgun Battery": { - facing : "most" - dam :12, - range : 450, - cooldown:30, - } - "Ion Cannons": { - facing : "most" - dam :8, - range : 300, - cooldown:15, - } -} - -global.ship_defualts = { - range : 600, - facing : "front", - cooldown : 30, - minrange : 0, - dam : 0, - firing_arc : 12.5, - ship : 0, - ammo : -1, - -} -function move_data_to_current_scope(struct, overide=true){ - var _data_names = struct_get_names(struct); - for (var i=0;i Date: Sun, 4 May 2025 02:19:35 +0100 Subject: [PATCH 031/155] make ship weapons object orientated --- objects/obj_p_ship/Draw_0.gml | 8 +- objects/obj_p_ship/Step_0.gml | 4 - .../scr_automated_ship_combat_functions.gml | 107 ------------------ .../scr_ship_combat_data.gml | 99 +++++++++++++--- 4 files changed, 86 insertions(+), 132 deletions(-) diff --git a/objects/obj_p_ship/Draw_0.gml b/objects/obj_p_ship/Draw_0.gml index 7b1dc9f7ce..24a9c0885b 100644 --- a/objects/obj_p_ship/Draw_0.gml +++ b/objects/obj_p_ship/Draw_0.gml @@ -29,11 +29,11 @@ if (selected=1){ } draw_set_alpha(1); - for (var i=0;i0) and (instance_exists(target)){ bull.image_xscale=2; bull.image_yscale=2; } - if (wep="Plasma Cannon"){ - bull.sprite_index=spr_ground_plasma; - bull.image_xscale=3;bull.image_yscale=3; - } } if (string_count("orpedo",wep)=1) and (ok=3){ diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index e92d5d43fa..1a17586f43 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -153,25 +153,6 @@ function point_on_circle(start_x, start_y, radius, angle){ return [_final_x, _final_y]; } -function draw_weapon_firing_arc(wep_id){ - var _tangent_direction = facing_weapon_angle(weapon_facing[wep_id]); - var _max_distance = weapon_range[wep_id]; - - var _left = x - _max_distance; - var _top = y - _max_distance; - var _right = x + _max_distance; - var _bottom = y + _max_distance; - - var _start_x = x + lengthdir_x(_max_distance, _tangent_direction - 20); - var _start_y = y + lengthdir_y(_max_distance, _tangent_direction - 20); - var _end_x = x + lengthdir_x(_max_distance, _tangent_direction + 20); - var _end_y = y + lengthdir_y(_max_distance, _tangent_direction + 20); - - draw_arc(_left, _top, _right, _bottom, _start_x, _start_y, _end_x, _end_y); - draw_line(x, y, _start_x, _start_y); - draw_line(x, y, _end_x, _end_y); -} - function is_targeted(){ var bullets = array_length(bullets_for); under_fire = false; @@ -199,98 +180,10 @@ function create_ship_projectile(wep_id){ if (facing!="front"){ bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); } - if (string_count("ova",wep)=1){ - bull.image_xscale=2; - bull.image_yscale=2; - } - else if (string_count("eavy Gunz",wep)=1){ - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - else if (string_count("Lance",wep)=1){ - bull.sprite_index=spr_ground_las; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - else if (string_count("Ion",wep)=1){ - bull.sprite_index=spr_pulse; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - else if (string_count("Rail",wep)=1){ - bull.sprite_index=spr_railgun; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - else if (string_count("Gravitic",wep)=1){ - bull.image_xscale=2; - bull.image_yscale=2; - } - else if (string_count("Plasma",wep)=1){ - bull.sprite_index=spr_ground_plasma; - bull.image_xscale=2; - bullimage_yscale=2; - bull.speed=15; - } - else if (string_count("Pyro-Acid",wep)=1){ - bull.sprite_index=spr_glob; - bull.image_xscale=2; - bullimage_yscale=2; - } - if (string_count("Weapons",wep)=1) and (owner = eFACTION.Eldar){ - bull.sprite_index=spr_ground_las; - bull.image_xscale=2; - bull.image_yscale=2; - } - if (string_count("Pulse",wep)=1) and (owner = eFACTION.Eldar){ - bull.sprite_index=spr_pulse; - bull.image_xscale=1.5; - bull.image_yscale=1.5; - } - - } - if (string_count("orpedo",wep)=1) and (owner != eFACTION.Necrons){ - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - } - bull=instance_create(x,y+lengthdir_y(-10,direction+90),obj_en_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - bull=instance_create(x,y+lengthdir_y(10,direction+90),obj_en_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - - if (class!="Ravager"){ - bull=instance_create(x,y+lengthdir_y(30,direction+90),obj_en_round); - bull.speed=10; - bull.direction=direction; - bull.sprite_index=spr_torpedo; - bull.dam=dam; - } } - if (wep="Lightning Arc"){lightning=10; - if (target.shields>0){ - if (class="Cairn Class") or (class="Reaper Class") then target.shields-=20; - else{target.shields-=20; - } - } - if (target.shields<=0){ - if (class="Cairn Class") or (class="Reaper Class") then target.hp-=10; - else{target.hp-=10; - } - } - } if (wep="Gauss Particle Whip"){whip=15; if (target.shields>0) then target.shields-=dam; if (target.shields<=0) then target.hp-=dam; diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index ee127f9908..b896936ba0 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -3,7 +3,13 @@ global.ship_weapons_stats = { range : 300, dam : 14, facing : "front", - firing_arc : 12.5 + firing_arc : 12.5, + img : spr_ground_las, + } + "Plasma Cannon" : { + img : spr_ground_plasma, + draw_scale : 3, + bullet_speed : 15, } "Nova Cannon": { range : 1500, @@ -12,6 +18,7 @@ global.ship_weapons_stats = { minrange : 300, cooldown : 120, minrange : 300, + draw_scale: 2, }, "Weapons Battery" : { facing : "most", @@ -51,6 +58,9 @@ global.ship_weapons_stats = { dam : 12, range : 450, cooldown : 90, + bullet_speed : 10, + barrel_count : 4, + img:spr_torpedo, }, "Interceptor Launch Bays" : { @@ -81,17 +91,21 @@ global.ship_weapons_stats = { facing : "most", dam : 10, weapon_cooldown : 10, + img: spr_ground_las, }, "Pyro-acid Battery" : { facing : "most", dam : 8, range : 300, + img : spr_glob, + draw_scale : 2, }, "Feeder Tendrils" : { facing : "most", dam : 8, range : 100, firing_arc : 50, + melee : true, }, "Bio-Plasma Discharge":{ range : 200, @@ -103,11 +117,12 @@ global.ship_weapons_stats = { dam : 20, range : 64, cooldown : 60, + melee : true, }, "Launch Glands" : { facing : "special", weapon_range : 9999, - ammo : 6, + ammo : 20, cooldown , 120, }, "Gravitic launcher" : { @@ -115,29 +130,34 @@ global.ship_weapons_stats = { range : 400, minrange : 200, cooldown:30, + draw_scale:2, }, "Railgun Battery": { facing : "most" dam :12, range : 450, cooldown:30, + img : spr_railgun, }, "Ion Cannons": { facing : "most" dam :8, range : 300, cooldown:15, + img : spr_pulse, }, "Lightning Arc" : { facing : "most", - dam : 0, + dam : 20, range : 300, cooldown : 15, + damage_type:"shields" }, "Star Pulse Generator": { dam : 0, range : 220, - cooldown : 210 + cooldown : 210, + img : spr_pulse }, "Gauss Particle Whip":{ dam : 30, @@ -146,7 +166,7 @@ global.ship_weapons_stats = { } } -global.ship_defualts = { +global.ship_weapon_defualts = { range : 600, facing : "front", cooldown : 30, @@ -158,6 +178,10 @@ global.ship_defualts = { bullet_speed : 20, bullet_obj : obj_en_round, img : spr_round, + damage_type : "full", + draw_scale : 1.5, + barrel_count : 1, + melee : false, } function move_data_to_current_scope(struct, overide=true){ @@ -182,6 +206,9 @@ function facing_weapon_angle(facing){ case "left": _direct_-=90; break; + case "rear": + _direct_ -= 180; + break; default: break; } @@ -194,7 +221,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ move_data_to_current_scope(_wep_data); } move_data_to_current_scope(overide_data); - move_data_to_current_scope(global.ship_defualts, false); + move_data_to_current_scope(global.ship_weapon_defualts, false); name = weapon_name; cooldown_timer = 0; @@ -203,6 +230,47 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ static find_target = function(){ } + static draw_weapon_firing_arc = function{ + var _tangent_direction = 0; + var _facing = facing + if (instance_exists(ship)){ + with (ship){ + _tangent_direction = facing_weapon_angle(_facing); + } + } + var _max_distance = range; + + var _left = x - _max_distance; + var _top = y - _max_distance; + var _right = x + _max_distance; + var _bottom = y + _max_distance; + + if (facing == "most"){ + firing_arc = 135; + } + draw_set_color(38144); + + var _start_x = x + lengthdir_x(_max_distance, _tangent_direction - firing_arc); + var _start_y = y + lengthdir_y(_max_distance, _tangent_direction - firing_arc); + var _end_x = x + lengthdir_x(_max_distance, _tangent_direction + firing_arc); + var _end_y = y + lengthdir_y(_max_distance, _tangent_direction + firing_arc); + + draw_arc(_left, _top, _right, _bottom, _start_x, _start_y, _end_x, _end_y); + draw_line(x, y, _start_x, _start_y); + draw_line(x, y, _end_x, _end_y); + + if (minrange > 0){ + draw_set_color(c_red); + var _start_x = x + lengthdir_x(minrange, _tangent_direction - firing_arc); + var _start_y = y + lengthdir_y(minrange, _tangent_direction - firing_arc); + var _end_x = x + lengthdir_x(minrange, _tangent_direction + firing_arc); + var _end_y = y + lengthdir_y(minrange, _tangent_direction + firing_arc); + + draw_arc(_left, _top, _right, _bottom, _start_x, _start_y, _end_x, _end_y); + draw_line(x, y, _start_x, _start_y); + draw_line(x, y, _end_x, _end_y); + } + } } function add_weapon_to_ship(weapon_name, overide_data={}){ @@ -506,7 +574,7 @@ function assign_ship_stats(){ capacity=50; carrying=0; add_weapon_to_ship("Gunz Battery"); - add_weapon_to_ship("Torpedoes", {range : 300, cooldown:120}); + add_weapon_to_ship("Torpedoes", {range : 300, cooldown:120,barrel_count:2}); } // ** Tau ** if (class=="Custodian"){ @@ -783,11 +851,12 @@ function assign_ship_stats(){ capacity=250; carrying=0; - add_weapon_to_ship("Lightning Arc"); + add_weapon_to_ship("Lightning Arc", {dam : 10}); } - if (class="Jackal Class"){ship_size=2; + if (class="Jackal Class"){ + ship_size=2; sprite_index=spr_ship_jackal; name=""; @@ -805,11 +874,12 @@ function assign_ship_stats(){ capacity=25; carrying=0; - add_weapon_to_ship("Lightning Arc", range :250); + add_weapon_to_ship("Lightning Arc", {dam : 10,range :250}); } - if (class="Dirge Class"){ship_size=2; + if (class="Dirge Class"){ + ship_size=2; sprite_index=spr_ship_dirge; name=""; @@ -827,12 +897,7 @@ function assign_ship_stats(){ capacity=25; carrying=0; - weapon[1]="Lightning Arc"; - weapon_facing[1]="most"; - weapon_dam[1]=0; - weapon_range[1]=250; - weapon_cooldown[1]=15; - + add_weapon_to_ship("Lightning Arc", {dam : 10,range :250}); } From 629983c492960b40e8d37335d809d365253e2bd7 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 4 May 2025 03:01:56 +0100 Subject: [PATCH 032/155] final OOP bits for weapons now projectiles --- .../scr_ship_combat_data.gml | 78 ++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index b896936ba0..4a22fe115c 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -212,6 +212,7 @@ function facing_weapon_angle(facing){ default: break; } + return _direct_; } @@ -226,9 +227,82 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ cooldown_timer = 0; target = 0; - find_direction = - static find_target = function(){ + static fire = function(){ + draw_set_alpha(1); + draw_set_color(c_red); + if (cooldown_timer <= 0 && instance_exists(target) && (ammo == -1 || ammo>0)){ + if (ammo>0){ + ammo--; + } + } + } + static find_target = function(){ + if (instance_exists(ship)){ + var _shoot_angle = 0; + with (ship)( + _shoot_angle = facing_weapon_angle(facing); + ); + if (_shoot_angle > 360){ + _shoot_angle -= 360; + } else if (_shoot_angle< 0){ + _shoot_angle = 360 -_shoot_angle; + } + with (ship) + if (ship.object_index == obj_p_ship || ship.object_index == obj_al_ship){ + var _enemies = instance_number(obj_en_ship); + for (var i=0;i<_enemies;i++){ + var _targ = instance_nearest(ship.x, ship.y, obj_en_ship); + if (_targ.hp<=0){ + instance_deactivate_object(_targ.id); + continue; + } + var _distance = point_distance(_targ.x, targ.y, x,y); + if (_distance > range){ + break; + } + if (minrange>0 && _distance (_shoot_angle - firing_arc)){ + target = _targ; + break; + } + } + instance_activate_object(obj_en_ship); + } else if (ship.object_index == obj_en_ship){ + var _enemies = instance_number(obj_p_ship) + instance_number(obj_al_ship); + for (var i=0;i<_enemies;i++){ + var _targ = instance_nearest(ship.x, ship.y, obj_p_ship); + var targ_2 = instance_nearest(ship.x, ship.y, obj_al_ship); + if (point_distance(targ_2.x, targ_2.y, x,y) range){ + break; + } + if (minrange>0 && _distance (_shoot_angle - firing_arc)){ + target = _targ; + break; + } + } + instance_activate_object(obj_p_ship); + instance_activate_object(obj_al_ship); + } + } + parent.object_index== obj_enemy } static draw_weapon_firing_arc = function{ var _tangent_direction = 0; From 152b776bc62bb3d8257c10fb0c6069507c06aa99 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 4 May 2025 17:23:16 +0100 Subject: [PATCH 033/155] it woorks it acctually god damn works --- ChapterMaster.yyp | 1 + objects/obj_al_ship/Create_0.gml | 2 +- objects/obj_al_ship/Step_0.gml | 41 +-- objects/obj_en_ship/Create_0.gml | 5 +- objects/obj_en_ship/Step_0.gml | 65 +--- objects/obj_fleet/Alarm_1.gml | 15 +- objects/obj_fleet_spawner/Alarm_1.gml | 7 +- objects/obj_p_ship/Create_0.gml | 4 +- objects/obj_p_ship/Step_0.gml | 107 +------ .../scr_automated_ship_combat_functions.gml | 54 +--- .../scr_player_fleet_combat_functions.gml | 148 ++------- .../scr_player_ship_functions.gml | 4 +- .../scr_ship_combat_data.gml | 284 ++++-------------- .../scr_ship_weapon_struct.gml | 263 ++++++++++++++++ .../scr_ship_weapon_struct.yy | 13 + .../scr_tyranid_fleet_functions.gml | 6 +- 16 files changed, 409 insertions(+), 610 deletions(-) create mode 100644 scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml create mode 100644 scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 2cb14778e2..885aa931aa 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -887,6 +887,7 @@ {"id":{"name":"scr_ship_combat_data","path":"scripts/scr_ship_combat_data/scr_ship_combat_data.yy",},}, {"id":{"name":"scr_ship_count","path":"scripts/scr_ship_count/scr_ship_count.yy",},}, {"id":{"name":"scr_ship_occupants","path":"scripts/scr_ship_occupants/scr_ship_occupants.yy",},}, + {"id":{"name":"scr_ship_weapon_struct","path":"scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.yy",},}, {"id":{"name":"scr_shoot","path":"scripts/scr_shoot/scr_shoot.yy",},}, {"id":{"name":"scr_special_view","path":"scripts/scr_special_view/scr_special_view.yy",},}, {"id":{"name":"scr_specialist_point_handler","path":"scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy",},}, diff --git a/objects/obj_al_ship/Create_0.gml b/objects/obj_al_ship/Create_0.gml index 505d2f8502..163f9e0a1a 100644 --- a/objects/obj_al_ship/Create_0.gml +++ b/objects/obj_al_ship/Create_0.gml @@ -31,12 +31,12 @@ shields=1; maxshields=1; armour_front=0; armour_other=0; -weapons=0; turrets=0; fighters=0; bombers=0; thunderhawks=0; weapons = []; +ai_type = "allies"; for(var i=0; i<8; i++){ weapon[i]=""; weapon_facing[i]=""; diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index 447223c338..6be856ffdf 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -172,7 +172,6 @@ if (!__b__){ } if (speed<0) then speed=speed*0.9; // Weapon reloads - cooldown_ship_weapons(); if (turret_cool>0) then turret_cool-=1; targe=0; @@ -304,11 +303,7 @@ if (__b__){ if (y<-2000) or (y>room_height+2000) or (x<-2000) or (x>room_width+2000) then hp=-50; // Weapon and turret cooldown - for (var i = 1; i < array_length(cooldown); i++) { - if (cooldown[i]>0){ - cooldown[i]--; - } - } + if (turret_cool>0) then turret_cool-=1; targe=0; @@ -333,38 +328,6 @@ if (__b__){ bull.direction+=choose(random(10),1*-(random(10))); } } - targe=0; - rdir=0; - dist=9999; - - xx=lengthdir_x(64,direction+90); - yy=lengthdir_y(64,direction+90); - - front=0; - right=0; - left=0; - rear=0; - - targe=instance_nearest(xx,yy,obj_en_ship); - rdir=point_direction(x,y,target.x,target.y); - // if (rdir>45) and (rdir<=135) and (targe!=target){target_r=targe;right=1;} - // if (rdir>225) and (rdir<=315) and (targe!=target) and (targe!=target_r){target_l=targe;left=1;} - target_l=instance_nearest(x+lengthdir_x(64,direction+90),y+lengthdir_y(64,direction+90),obj_en_ship); - target_r=instance_nearest(x+lengthdir_x(64,direction+270),y+lengthdir_y(64,direction+270),obj_en_ship); - - if (collision_line(x,y,x+lengthdir_x(2000,direction),y+lengthdir_y(2000,direction),obj_en_ship,0,1)) then front=1; - - - f=0; - facing=""; - ammo=0; - range=0; - wep=""; - dam=0; - gg=0; - - for (var i=0;i0) and (instance_exists(obj_p_ship)){ if (speed<0) then speed=speed*0.9; - cooldown_ship_weapons(); - if (turret_cool>0) then turret_cool-=1; @@ -159,32 +157,8 @@ if (hp>0) and (instance_exists(obj_p_ship)){ bull.direction+=choose(random(10),1*-(random(10))); } } - targe=0;rdir=0;dirr="";dist=9999; - - - xx=lengthdir_x(64,direction+90); - yy=lengthdir_y(64,direction+90); - - var front, right, left, rear; - front=0;right=0;left=0;rear=0; - - targe=instance_nearest(xx,yy,obj_p_ship); - rdir=point_direction(x,y,target.x,target.y); - // if (rdir>45) and (rdir<=135) and (targe!=target){target_r=targe;right=1;} - // if (rdir>225) and (rdir<=315) and (targe!=target) and (targe!=target_r){target_l=targe;left=1;} - target_l=instance_nearest(x+lengthdir_x(64,direction+90),y+lengthdir_y(64,direction+90),obj_p_ship); - target_r=instance_nearest(x+lengthdir_x(64,direction+270),y+lengthdir_y(64,direction+270),obj_p_ship); - - if (collision_line(x,y,x+lengthdir_x(2000,direction),y+lengthdir_y(2000,direction),obj_p_ship,0,1)) then front=1; - - - var f, facing, ammo, range, wep, dam, gg;f=0;facing="";ammo=0;range=0;wep="";dam=0;gg=0; - - lightning=0; - - for (var i=0;i0) and (instance_exists(obj_p_ship)){ if (y<-2000) or (y>room_height+2000) or (x<-2000) or (x>room_width+2000) then hp=-50; - - - if (cooldown[1]>0) then cooldown[1]-=1; - if (cooldown[2]>0) then cooldown[2]-=1; - if (cooldown[3]>0) then cooldown[3]-=1; - if (cooldown[4]>0) then cooldown[4]-=1; - if (cooldown[5]>0) then cooldown[5]-=1; + if (turret_cool>0) then turret_cool-=1; @@ -288,31 +256,8 @@ if (hp>0) and (instance_exists(obj_p_ship)){ bull.direction+=choose(random(10),1*-(random(10))); } } - targe=0;rdir=0;dirr="";dist=9999; - - - xx=lengthdir_x(64,direction+90); - yy=lengthdir_y(64,direction+90); - - var front, right, left, rear; - front=0;right=0;left=0;rear=0; - - targe=instance_nearest(xx,yy,obj_p_ship); - rdir=point_direction(x,y,target.x,target.y); - // if (rdir>45) and (rdir<=135) and (targe!=target){target_r=targe;right=1;} - // if (rdir>225) and (rdir<=315) and (targe!=target) and (targe!=target_r){target_l=targe;left=1;} - target_l=instance_nearest(x+lengthdir_x(64,direction+90),y+lengthdir_y(64,direction+90),obj_p_ship); - target_r=instance_nearest(x+lengthdir_x(64,direction+270),y+lengthdir_y(64,direction+270),obj_p_ship); - - if (collision_line(x,y,x+lengthdir_x(2000,direction),y+lengthdir_y(2000,direction),obj_p_ship,0,1)) then front=1; - - - var f, facing, ammo, range, wep, dam, gg;f=0;facing="";ammo=0;range=0;wep="";dam=0;gg=0; - - - for (var i=0;i0){en_column[4]="Sword Class Frigate";en_num[4]=en_escort;en_size[4]=1;} + if (en_escort>0){ + en_column[4]="Sword Class Frigate"; + en_num[4]=en_escort; + en_size[4]=1; + } - if (en_frigate>0){en_column[3]="Avenger Class Grand Cruiser";en_num[3]=en_frigate;en_size[3]=2;} + if (en_frigate>0){ + en_column[3]="Avenger Class Grand Cruiser"; + en_num[3]=en_frigate; + en_size[3]=2; + } - var i;i=0;i=en_capital; + var i=0; + i=en_capital; if (i>0){ en_column[2]="Apocalypse Class Battleship";en_num[2]=floor(random(i))+1; if (en_num[2]<(en_capital*0.6)) then en_num[2]=round(en_capital*0.6); diff --git a/objects/obj_fleet_spawner/Alarm_1.gml b/objects/obj_fleet_spawner/Alarm_1.gml index c802db6cd4..3088b92419 100644 --- a/objects/obj_fleet_spawner/Alarm_1.gml +++ b/objects/obj_fleet_spawner/Alarm_1.gml @@ -346,7 +346,12 @@ if (owner = eFACTION.Necrons){// This is an orderly Necron ship formation } } - +with (obj_en_ship){ + assign_ship_stats(); +} +with (obj_al_ship){ + assign_ship_stats(); +} /* */ diff --git a/objects/obj_p_ship/Create_0.gml b/objects/obj_p_ship/Create_0.gml index e274fcbc86..21a69f00e7 100644 --- a/objects/obj_p_ship/Create_0.gml +++ b/objects/obj_p_ship/Create_0.gml @@ -47,7 +47,7 @@ shields=1; maxshields=1; armour_front=0; armour_other=0; -weapons=0; +weapons=[]; turrets=0; fighters=0; bombers=0; @@ -55,6 +55,8 @@ thunderhawks=0; boarders=0; board_cooldown=0; +ai_type = "player"; + weapon = array_create(8, ""); weapon_facing=array_create(8, ""); weapon_cooldown=array_create(8, 0); diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index e8a9282f2b..c1f13f6416 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -185,112 +185,9 @@ if (hp>0) and (instance_exists(target)){ bull.direction+=choose(random(3),1*-(random(3))); } } - targe=0;rdir=0;dirr="";dist=9999; - - - xx=lengthdir_x(64,direction+90); - yy=lengthdir_y(64,direction+90); - - var front, right, left, rear; - front=0;right=0;left=0;rear=0; - - targe=instance_nearest(xx,yy,obj_en_ship); - if (instance_exists(targe)){ - rdir=point_direction(x,y,target.x,target.y); - if (rdir>45) and (rdir<=135) and (targe!=target){ - target_r=targe;right=1; - } - if (rdir>225) and (rdir<=315) and (targe!=target) and (targe!=target_r){target_l=targe;left=1;} - if (collision_line(x,y,x+lengthdir_x(2000,direction),y+lengthdir_y(2000,direction),obj_en_ship,0,1)) then front=1; - - - var f=0,facing="",ammo=0,range=0,wep="",dam=0; - - for (var gg=1;gg0) then cooldown[gg]-=1; - - ok=0;f+=1;facing="";ammo=0;range=0;wep=""; - - - if (cooldown[gg]<=0) and (weapon[gg]!="") and (weapon_ammo[gg]>0) then ok=1; - if (ok=1){ - facing=weapon_facing[gg]; - ammo=weapon_ammo[gg]; - range=weapon_range[gg]; - } - - targe=target; + ship_shoot_weapons(); - if (facing="right") then targe=target_r; - if (facing="left") then targe=target_l; - if ((facing="front") or (facing="most")) and (front=1) then ok=2; - if (facing="right") or (facing="most") and (right=1) then ok=2; - if (facing="left") or (facing="most") and (left=1) then ok=2; - if (facing="special") then ok=2; - if (instance_exists(targe)){ - - - dist=point_distance(x,y,targe.x,targe.y); - - - if (ok=2) and (dist<(range+(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))))){ - //if (ammo>0) and (ammo<500) then ammo-=1; - weapon_ammo[gg]=ammo; - cooldown[gg]=weapon_cooldown[gg]; - wep=weapon[gg]; - dam=weapon_dam[gg]; - - // if (f=3) and (ship_id=2) then show_message("ammo: "+string(ammo)+" | range: "+string(range)); - - if (ammo<0) then ok=0; - ok=3; - - if (string_count("orpedo",wep)=0) and (string_count("hawk",wep)=0) and (ok=3){ - bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_p_round); - bull.speed=20;bull.dam=dam; - if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - if (facing!="front"){bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y);} - if (string_count("ova",wep)=1){bull.image_xscale=2;bull.image_yscale=2;} - if (wep="Lance Battery"){ - bull.sprite_index=spr_ground_las; - bull.image_xscale=2; - bull.image_yscale=2; - } - } - if (string_count("orpedo",wep)=1) and (ok=3){ - - if (sprite_index=spr_ship_bb){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_p_round); - bull.speed=10;bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - } - - bull=instance_create(x,y+lengthdir_y(-10,direction+90),obj_p_round); - bull.speed=10; - bull.direction=direction;bull.sprite_index=spr_torpedo; - bull.dam=dam; - bull=instance_create(x,y+lengthdir_y(10,direction+90),obj_p_round); - bull.speed=10; - bull.direction=direction;bull.sprite_index=spr_torpedo; - bull.dam=dam; - - if (sprite_index=spr_ship_bb){ - bull=instance_create(x,y+lengthdir_y(30,direction+90),obj_p_round); - bull.speed=10; - bull.direction=direction;bull.sprite_index=spr_torpedo;bull.dam=dam; - } - } - if (string_count("hawk",wep)=1) and (ok=3){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_p_th); - bull.direction=self.direction; - } - } - } - } - } - - - + } diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 1a17586f43..1a968c3a62 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -79,7 +79,7 @@ function cooldown_ship_weapons(){ function destroy_ship_and_leave_husk(){ image_alpha=0.5; - if (owner != eFACTION.Tyranids){ + if (ai_type == "player" || owner != eFACTION.Tyranids){ husk=instance_create(x,y,obj_en_husk); husk.sprite_index=sprite_index; husk.direction=direction; @@ -167,55 +167,15 @@ function is_targeted(){ } } -function create_ship_projectile(wep_id){ - var wep = weapon[wep_id]; - var facing=weapon_facing[wep_id],ammo=weapon_ammo[wep_id],range=weapon_range[wep_id]; - var dam=weapon_dam[wep_id]; - var bull = -1; - if (string_count("orpedo",wep)=0) and (string_count("Interceptor",wep)=0) and (string_count("ommerz",wep)=0) and (string_count("Claws",wep)=0) and (string_count("endrils",wep)=0) && (owner != eFACTION.Necrons){ - bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_en_round); - bull.speed=20; - bull.dam=dam; - if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - if (facing!="front"){ - bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - } - - - } - - if (wep="Gauss Particle Whip"){whip=15; - if (target.shields>0) then target.shields-=dam; - if (target.shields<=0) then target.hp-=dam; - } - if (wep="Star Pulse Generator") and (instance_exists(target)){ - bull=instance_create(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),obj_en_pulse); - bull.speed=20; - if (targe=target) then bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - if (facing!="front"){ - bull.direction=point_direction(x+lengthdir_x(32,direction),y+lengthdir_y(32,direction),target.x,target.y); - } - bull.target_x=target.x; - bull.target_y=target.y; - } - - - - if ((string_count("Claws",wep)=1) or (string_count("endrils",wep)=1)) { - if (target.shields<=0) then target.hp-=weapon_dam[wep_id]; - if (target.shields>0) then target.shields-=weapon_dam[wep_id]; - } - if ((string_count("Interceptor",wep)=1) or (string_count("ommerz",wep)=1) or (string_count("Manta",wep)=1) or (string_count("Glands",wep)=1) or (string_count("Eldar Launch",wep)=1)){ - bull=instance_create(x,y+lengthdir_y(-30,direction+90),obj_en_in); - bull.direction=self.direction; - bull.owner=self.owner; +function ship_shoot_weapons(){ + for (var i=0;i0)){ - if (ammo>0){ - ammo--; - } - } - } - - static find_target = function(){ - if (instance_exists(ship)){ - var _shoot_angle = 0; - with (ship)( - _shoot_angle = facing_weapon_angle(facing); - ); - if (_shoot_angle > 360){ - _shoot_angle -= 360; - } else if (_shoot_angle< 0){ - _shoot_angle = 360 -_shoot_angle; - } - with (ship) - if (ship.object_index == obj_p_ship || ship.object_index == obj_al_ship){ - var _enemies = instance_number(obj_en_ship); - for (var i=0;i<_enemies;i++){ - var _targ = instance_nearest(ship.x, ship.y, obj_en_ship); - if (_targ.hp<=0){ - instance_deactivate_object(_targ.id); - continue; - } - var _distance = point_distance(_targ.x, targ.y, x,y); - if (_distance > range){ - break; - } - if (minrange>0 && _distance (_shoot_angle - firing_arc)){ - target = _targ; - break; - } - } - instance_activate_object(obj_en_ship); - } else if (ship.object_index == obj_en_ship){ - var _enemies = instance_number(obj_p_ship) + instance_number(obj_al_ship); - for (var i=0;i<_enemies;i++){ - var _targ = instance_nearest(ship.x, ship.y, obj_p_ship); - var targ_2 = instance_nearest(ship.x, ship.y, obj_al_ship); - if (point_distance(targ_2.x, targ_2.y, x,y) range){ - break; - } - if (minrange>0 && _distance (_shoot_angle - firing_arc)){ - target = _targ; - break; - } - } - instance_activate_object(obj_p_ship); - instance_activate_object(obj_al_ship); - } - } - parent.object_index== obj_enemy - } - static draw_weapon_firing_arc = function{ - var _tangent_direction = 0; - var _facing = facing - if (instance_exists(ship)){ - with (ship){ - _tangent_direction = facing_weapon_angle(_facing); - } - } - var _max_distance = range; - - var _left = x - _max_distance; - var _top = y - _max_distance; - var _right = x + _max_distance; - var _bottom = y + _max_distance; - - if (facing == "most"){ - firing_arc = 135; - } - draw_set_color(38144); - - var _start_x = x + lengthdir_x(_max_distance, _tangent_direction - firing_arc); - var _start_y = y + lengthdir_y(_max_distance, _tangent_direction - firing_arc); - var _end_x = x + lengthdir_x(_max_distance, _tangent_direction + firing_arc); - var _end_y = y + lengthdir_y(_max_distance, _tangent_direction + firing_arc); - - draw_arc(_left, _top, _right, _bottom, _start_x, _start_y, _end_x, _end_y); - draw_line(x, y, _start_x, _start_y); - draw_line(x, y, _end_x, _end_y); - - if (minrange > 0){ - draw_set_color(c_red); - var _start_x = x + lengthdir_x(minrange, _tangent_direction - firing_arc); - var _start_y = y + lengthdir_y(minrange, _tangent_direction - firing_arc); - var _end_x = x + lengthdir_x(minrange, _tangent_direction + firing_arc); - var _end_y = y + lengthdir_y(minrange, _tangent_direction + firing_arc); - - draw_arc(_left, _top, _right, _bottom, _start_x, _start_y, _end_x, _end_y); - draw_line(x, y, _start_x, _start_y); - draw_line(x, y, _end_x, _end_y); - } - } -} - -function add_weapon_to_ship(weapon_name, overide_data={}){ - overide_data.ship = id; - array_push(weapons, new ShipWeapon(weapon_name, overide_data)); -} - function assign_ship_stats(){ if (class="Apocalypse Class Battleship"){ @@ -366,7 +218,6 @@ function assign_ship_stats(){ leadership=90; armour_front=6; armour_other=5; - weapons=4; turrets=4; capacity=150; carrying=0; @@ -378,8 +229,8 @@ function assign_ship_stats(){ } - if (class="Nemesis Class Fleet Carrier"){sprite_index=spr_ship_nem; - sprite_index=spr_ship_nem; + if (class="Nemesis Class Fleet Carrier"){ + sprite_index=spr_ship_nem; ship_size=3; name=""; hp=1000; @@ -390,7 +241,6 @@ function assign_ship_stats(){ leadership=85; armour_front=5; armour_other=5; - weapons=3; turrets=5; capacity=100; carrying=24; @@ -400,7 +250,7 @@ function assign_ship_stats(){ } - if (class="Avenger Class Grand Cruiser"){sprite_index=spr_ship_aven; + if (class="Avenger Class Grand Cruiser"){ sprite_index=spr_ship_aven; ship_size=2; name=""; @@ -412,7 +262,6 @@ function assign_ship_stats(){ leadership=85; armour_front=5; armour_other=5; - weapons=2; turrets=3; capacity=50; add_weapon_to_ship("Lance Battery", {cooldown:30}); @@ -421,7 +270,7 @@ function assign_ship_stats(){ } - if (class="Sword Class Frigate"){sprite_index=spr_ship_sword; + if (class="Sword Class Frigate"){ sprite_index=spr_ship_sword; ship_size=1; name=""; @@ -433,7 +282,6 @@ function assign_ship_stats(){ leadership=80; armour_front=5; armour_other=5; - weapons=1; turrets=2; capacity=50; carrying=0; @@ -457,7 +305,6 @@ function assign_ship_stats(){ leadership=100; armour_front=5; armour_other=4; - weapons=3; turrets=4; capacity=150; @@ -479,7 +326,6 @@ function assign_ship_stats(){ leadership=90; armour_front=5; armour_other=4; - weapons=2; turrets=3; capacity=100; carrying=0; @@ -500,7 +346,6 @@ function assign_ship_stats(){ leadership=90; armour_front=5; armour_other=4; - weapons=3; turrets=2; capacity=50; carrying=0; @@ -524,7 +369,6 @@ function assign_ship_stats(){ leadership=90; armour_front=5; armour_other=4; - weapons=3; turrets=2; capacity=50; carrying=0; @@ -549,7 +393,6 @@ function assign_ship_stats(){ leadership=100; armour_front=6; armour_other=5; - weapons=5; turrets=3; capacity=250; carrying=0; @@ -563,26 +406,25 @@ function assign_ship_stats(){ } if (class="Gorbag's Revenge"){ - sprite_index=spr_ship_gorbag; - ship_size=3; - name=""; - hp=1200; - maxhp=1200; - conditions=""; - shields=200; - maxshields=200; - leadership=100; - armour_front=6; - armour_other=5; - weapons=5; - turrets=3; - capacity=250; - carrying=0; - add_weapon_to_ship("Gunz Battery"); - add_weapon_to_ship("Torpedoes", {dam:12, range:300, cooldown:120}); - - add_weapon_to_ship("Fighta Bommerz": {ammo : 3}); - add_weapon_to_ship("Fighta Bommerz": {ammo : 3}); + sprite_index=spr_ship_gorbag; + ship_size=3; + name=""; + hp=1200; + maxhp=1200; + conditions=""; + shields=200; + maxshields=200; + leadership=100; + armour_front=6; + armour_other=5; + turrets=3; + capacity=250; + carrying=0; + add_weapon_to_ship("Gunz Battery"); + add_weapon_to_ship("Torpedoes", {dam:12, range:300, cooldown:120}); + + add_weapon_to_ship("Fighta Bommerz", {ammo : 3}); + add_weapon_to_ship("Fighta Bommerz", {ammo : 3}); } @@ -600,7 +442,6 @@ function assign_ship_stats(){ leadership=100; armour_front=6; armour_other=5; - weapons=3; turrets=3; capacity=250; carrying=0; @@ -621,7 +462,6 @@ function assign_ship_stats(){ leadership=100; armour_front=6; armour_other=5; - weapons=5; turrets=3; capacity=250; carrying=0; @@ -643,7 +483,6 @@ function assign_ship_stats(){ leadership=80; armour_front=6; armour_other=4; - weapons=2; turrets=2; capacity=50; carrying=0; @@ -663,7 +502,6 @@ function assign_ship_stats(){ leadership=100; armour_front=6; armour_other=5; - weapons=4; turrets=5; capacity=1000; carrying=0; @@ -685,7 +523,6 @@ function assign_ship_stats(){ leadership=90; armour_front=6; armour_other=5; - weapons=4; turrets=3; capacity=250; carrying=0; @@ -706,7 +543,6 @@ function assign_ship_stats(){ leadership=100; armour_front=6; armour_other=5; - weapons=4; turrets=2; capacity=100; carrying=0; @@ -726,7 +562,6 @@ function assign_ship_stats(){ leadership=80; armour_front=5; armour_other=4; - weapons=2; turrets=1; capacity=50; carrying=0; @@ -746,7 +581,6 @@ function assign_ship_stats(){ leadership=80; armour_front=5; armour_other=4; - weapons=2; turrets=2; capacity=50; carrying=0; @@ -789,7 +623,6 @@ function assign_ship_stats(){ leadership=85; armour_front=5; armour_other=5; - weapons=2; turrets=3; capacity=50; carrying=0; @@ -810,7 +643,6 @@ function assign_ship_stats(){ leadership=85; armour_front=5; armour_other=5; - weapons=3; turrets=3; capacity=50; carrying=0; @@ -838,7 +670,6 @@ function assign_ship_stats(){ leadership=80; armour_front=7; armour_other=4; - weapons=1; turrets=2; capacity=50; carrying=0; @@ -866,7 +697,6 @@ function assign_ship_stats(){ armour_front=5; armour_other=5; - weapons=3; turrets=5; capacity=800; carrying=0; @@ -896,7 +726,6 @@ function assign_ship_stats(){ armour_front=5; armour_other=5; - weapons=3; turrets=4; capacity=500; carrying=0; @@ -920,7 +749,6 @@ function assign_ship_stats(){ armour_front=5; armour_other=5; - weapons=1; turrets=2; capacity=250; carrying=0; @@ -943,7 +771,6 @@ function assign_ship_stats(){ armour_front=4; armour_other=4; - weapons=1; turrets=2; capacity=25; carrying=0; @@ -966,7 +793,6 @@ function assign_ship_stats(){ armour_front=4; armour_other=4; - weapons=1; turrets=2; capacity=25; carrying=0; diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml new file mode 100644 index 0000000000..40ea7f3aba --- /dev/null +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -0,0 +1,263 @@ +global.ship_weapon_defualts = { + range : 600, + facing : "front", + cooldown : 30, + minrange : 0, + dam : 0, + firing_arc : 12.5, + ship : 0, + ammo : -1, + bullet_speed : 20, + bullet_obj : obj_en_round, + img : spr_round, + damage_type : "full", + draw_scale : 1.5, + barrel_count : 1, + melee : false, + +} +function move_data_to_current_scope(struct, overide=true){ + var _data_names = struct_get_names(struct); + for (var i=0;i 1){ + var barrel_offset = -20*(barrel_offset/2); + } + var _bul_y = ship.y+lengthdir_y(barrel_offset,_tangent_direction); + if (bullet_obj==obj_en_round){ + if (ship.ai_type = "player" ){ + bullet_obj = obj_p_round + }else if (ship.ai_type = "allies"){ + bullet_obj = obj_al_round + } + } + repeat(barrel_count){ + var _bullet_qualities = { + speed : bullet_speed, + dam : dam, + image_xscale : draw_scale, + image_yscale : draw_scale, + direction : point_direction(_bul_x,_bul_y, target.x,target.y), + target : target, + target_x:target.x, + target_y:target.y, + } + + _bullet = instance_create_layer( + _bul_x, + _bul_y, + layer_get_all()[0], + bullet_obj + ); + with (_bullet){ + move_data_to_current_scope(_bullet_qualities); + } + array_push(target.bullets_for, _bullet.id); + barrel_offset+=20 + _bul_y = ship.y+lengthdir_y(barrel_offset,_tangent_direction); + } + } + static fire = function(){ + if (cooldown_timer > 0){ + cooldown_timer--; + } + draw_set_alpha(1); + draw_set_color(c_red); + if (cooldown_timer <= 0 && instance_exists(target) && (ammo == -1 || ammo>0)){ + if (ammo>0){ + ammo--; + } + cooldown_timer = cooldown; + if (!melee && facing != "special"){ + create_projectile(); + } else if (facing != "special"){ + if (target.shields<=0){ + target.hp-=dam; + } + else if (target.shields>0){ + target.shields-=dam; + } + } else if (facing == "special") { + launch_flyers(); + } + } + } + + static launch_flyers = function(){ + var _launch_x = ship.x; + var _launch_y = ship.y; + + if (ship.ai_type = "player" ){ + bull=instance_create(_launch_x,_launch_y,obj_p_th); + bull.direction=ship.direction; + }else if (ship.ai_type = "allies"){ + var _flyer = instance_create(_launch_x,_launch_y,obj_al_in); + _flyer.direction=self.direction; + _flyer.owner=self.owner; + } else { + var _flyer = instance_create(_launch_x,_launch_y,obj_en_in); + _flyer.direction=self.direction; + _flyer.owner=self.owner; + } + } + + static find_target = function(){ + show_debug_message("targeting"); + x = ship.x; + y = ship.y; + var _shoot_angle = weapon_direction(); + if (_shoot_angle > 360){ + _shoot_angle -= 360; + } else if (_shoot_angle< 0){ + _shoot_angle = 360 -_shoot_angle; + } + if (ship.ai_type == "player" || ship.ai_type == "allies"){ + show_debug_message("player"); + var _enemies = instance_number(obj_en_ship); + for (var i=0;i<_enemies;i++){ + var _targ = instance_nearest(ship.x, ship.y, obj_en_ship); + if (_targ.hp<=0){ + instance_deactivate_object(_targ.id); + continue; + } + var _distance = point_distance(_targ.x, _targ.y, x,y); + if (_distance > range){ + break; + } + if (minrange>0 && _distance (_shoot_angle - firing_arc)){ + target = _targ.id; + break; + } + } + instance_activate_object(obj_en_ship); + } else if (ship.ai_type = "enemy"){ + show_debug_message("enemy"); + var _enemies = instance_number(obj_p_ship) + instance_number(obj_al_ship); + for (var i=0;i<_enemies;i++){ + var _targ = instance_nearest(ship.x, ship.y, obj_p_ship); + var _targ_2 = instance_nearest(ship.x, ship.y, obj_al_ship); + if (!instance_exists(_targ)){ + if (instance_exists(_targ_2)){ + _targ = _targ_2; + } else { + break; + } + } else if (instance_exists(_targ) && instance_exists(_targ_2)){ + if (point_distance(_targ_2.x, _targ_2.y, x,y) range){ + break; + } + if (minrange>0 && _distance (_shoot_angle - firing_arc)){ + target = _targ; + break; + } + } + instance_activate_object(obj_p_ship); + instance_activate_object(obj_al_ship); + } + show_debug_message($"targeting2 {target}/"); + } + static draw_weapon_firing_arc = function(){ + var _tangent_direction = weapon_direction(); + var _facing = facing + + var _max_distance = range; + + x = ship.x; + + y = ship.y; + + var _left = x - _max_distance; + var _top = y - _max_distance; + var _right = x + _max_distance; + var _bottom = y + _max_distance; + + if (facing == "most"){ + firing_arc = 135; + } + draw_set_color(38144); + + var _start_x = x + lengthdir_x(_max_distance, _tangent_direction - firing_arc); + var _start_y = y + lengthdir_y(_max_distance, _tangent_direction - firing_arc); + var _end_x = x + lengthdir_x(_max_distance, _tangent_direction + firing_arc); + var _end_y = y + lengthdir_y(_max_distance, _tangent_direction + firing_arc); + + draw_arc(_left, _top, _right, _bottom, _start_x, _start_y, _end_x, _end_y); + draw_line(x, y, _start_x, _start_y); + draw_line(x, y, _end_x, _end_y); + + if (minrange > 0){ + draw_set_color(c_red); + var _start_x = x + lengthdir_x(minrange, _tangent_direction - firing_arc); + var _start_y = y + lengthdir_y(minrange, _tangent_direction - firing_arc); + var _end_x = x + lengthdir_x(minrange, _tangent_direction + firing_arc); + var _end_y = y + lengthdir_y(minrange, _tangent_direction + firing_arc); + + draw_arc(_left, _top, _right, _bottom, _start_x, _start_y, _end_x, _end_y); + draw_line(x, y, _start_x, _start_y); + draw_line(x, y, _end_x, _end_y); + } + } +} + +function add_weapon_to_ship(weapon_name, overide_data={}){ + overide_data.ship = id; + array_push(weapons, new ShipWeapon(weapon_name, overide_data)); +} \ No newline at end of file diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.yy b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.yy new file mode 100644 index 0000000000..0747bed5ba --- /dev/null +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_ship_weapon_struct", + "isCompatibility":false, + "isDnD":false, + "name":"scr_ship_weapon_struct", + "parent":{ + "name":"fleet", + "path":"folders/Scripts/fleet.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index 105875bc6e..85252907c4 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -251,15 +251,15 @@ function set_nid_ships(){ turrets=3; capacity=0; carrying=0; - add_weapon_to_ship("Feeder Tendrils" : {dam : 12, range :160}); - add_weapon_to_ship("Bio-Plasma Discharge" : { + add_weapon_to_ship("Feeder Tendrils" , {dam : 12, range :160}); + add_weapon_to_ship("Bio-Plasma Discharge" , { dam : 10, range : 260, cooldown : 10, facing : "most", }); - add_weapon_to_ship("Pyro-Acid Battery" : { + add_weapon_to_ship("Pyro-Acid Battery" , { dam : 18, range : 500, cooldown : 40, From 43951f23b010632876db1f4b2e9d4fc242ec3477 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 4 May 2025 17:29:24 +0100 Subject: [PATCH 034/155] correct weapoon images --- scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index 40ea7f3aba..76c7aaac09 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -78,6 +78,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ target : target, target_x:target.x, target_y:target.y, + sprite_index : img, } _bullet = instance_create_layer( From 252b406461539049ead67ff67514115c71655270 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 4 May 2025 19:25:19 +0100 Subject: [PATCH 035/155] more tweaks, makethings work --- objects/obj_fleet/Alarm_1.gml | 8 ++++++-- objects/obj_p_ship/Step_0.gml | 9 +++++---- .../scr_automated_ship_combat_functions.gml | 5 +++-- .../scr_player_fleet_combat_functions.gml | 5 +++++ scripts/scr_ship_combat_data/scr_ship_combat_data.gml | 8 ++++---- .../scr_ship_weapon_struct/scr_ship_weapon_struct.gml | 4 ++-- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/objects/obj_fleet/Alarm_1.gml b/objects/obj_fleet/Alarm_1.gml index 89b05f1c34..267179352d 100644 --- a/objects/obj_fleet/Alarm_1.gml +++ b/objects/obj_fleet/Alarm_1.gml @@ -106,7 +106,7 @@ if (enemy=9){ } if (enemy=10){ - var i;i=0;i=en_frigate; + var i=0;i=en_frigate; if (en_capital>0){en_column[1]="Desecrator";en_num[1]=en_capital;en_size[1]=3;} @@ -116,7 +116,11 @@ if (enemy=10){ if (i>0){en_column[4]="Daemon";en_num[4]=i;i-=en_num[4];en_size[4]=2;}// en_num[3]+=en_num[2]+1; - if (en_escort>0){en_column[5]="Iconoclast";en_num[5]=en_escort;en_size[5]=1;}// en_num[5]+=en_num[4]+1; + if (en_escort>0){ + en_column[5]="Iconoclast"; + en_num[5]=en_escort; + en_size[5]=1; + }// en_num[5]+=en_num[4]+1; } diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index c1f13f6416..787459a491 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -192,9 +192,6 @@ if (hp>0) and (instance_exists(target)){ - - - /* */ //Deploy boarding craft logic @@ -202,7 +199,11 @@ if (instance_exists(obj_en_ship)) and (boarders>0) and (board_cooldown<=0) and ( var eh=0,te=0; repeat(2){ eh+=1;te=0; - if (eh=1) and (board_capital=true){if (instance_exists(obj_en_capital)) then te=instance_nearest(x,y,obj_en_capital);} + if (eh=1) and (board_capital=true){ + if (instance_exists(obj_en_capital)){ + te=instance_nearest(x,y,obj_en_capital); + } + } if (eh=2) and (board_frigate=true){if (instance_exists(obj_en_cruiser)) then te=instance_nearest(x,y,obj_en_cruiser);} if (te!=0) and (instance_exists(te)){ if (point_distance(x,y,te.x,te.y)<=428){ diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 1a968c3a62..4451f2c024 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -93,9 +93,10 @@ function destroy_ship_and_leave_husk(){ explo.x+=random_range(sprite_width*0.25,sprite_width*-0.25); explo.y+=random_range(sprite_width*0.25,sprite_width*-0.25); } + } else { + if (owner == eFACTION.Tyranids) then effect_create_above(ef_firework,x,y,1,c_purple); } - if (owner == eFACTION.Tyranids) then effect_create_above(ef_firework,x,y,1,c_purple); - instance_destroy(); + instance_destroy(); } /// draw_arc(x1,y1,x2,y2,x3,y3,x4,y4,precision) diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 02dd6ac588..023c9161a3 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -168,6 +168,11 @@ function setup_player_combat_ship(){ for (var i=0;i Date: Sun, 4 May 2025 19:25:53 +0100 Subject: [PATCH 036/155] e51816b36 correct weapoon images --- scripts/scr_ship_combat_data/scr_ship_combat_data.gml | 2 ++ scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index bd3f3389b1..5545771c72 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -66,9 +66,11 @@ global.ship_weapons_stats = { dam : 12, range : 2000, cooldown : 90, + ammo : 3, bullet_speed : 10, barrel_count : 1, img:spr_torpedo, + draw_scale : 3, }, "Interceptor Launch Bays" : { diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index 92f8f73d17..670be98a7a 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -126,8 +126,8 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ var _launch_y = ship.y; if (ship.ai_type = "player" ){ - bull=instance_create(_launch_x,_launch_y,obj_p_th); - bull.direction=ship.direction; + var _flyer=instance_create(_launch_x,_launch_y,obj_p_th); + _flyer.direction=ship.direction; }else if (ship.ai_type = "allies"){ var _flyer = instance_create(_launch_x,_launch_y,obj_al_in); _flyer.direction=self.direction; From 957ae8cfdfdf7fa449954966d80a04eb43379864 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 4 May 2025 21:59:54 +0100 Subject: [PATCH 037/155] fix ship fleet array issues --- objects/obj_en_ship/Step_0.gml | 3 ++- objects/obj_fleet/Draw_64.gml | 2 ++ .../scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml | 7 +++++-- .../scr_ship_combat_data/scr_ship_combat_data.gml | 14 +++++++------- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/objects/obj_en_ship/Step_0.gml b/objects/obj_en_ship/Step_0.gml index 25985eb4f9..ad279ecad1 100644 --- a/objects/obj_en_ship/Step_0.gml +++ b/objects/obj_en_ship/Step_0.gml @@ -147,7 +147,8 @@ if (hp>0) and (instance_exists(obj_p_ship)){ bull=instance_create(x,y,obj_en_round); bull.direction=point_direction(x,y,targe.x,targe.y); if (owner = eFACTION.Tyranids) then bull.sprite_index=spr_glob; - bull.speed=20;bull.dam=3; + bull.speed=20; + bull.dam=3; bull.image_xscale=0.5; bull.image_yscale=0.5;turret_cool=floor(60/turrets); if (owner = eFACTION.Necrons){ diff --git a/objects/obj_fleet/Draw_64.gml b/objects/obj_fleet/Draw_64.gml index 4e7986415a..2512609783 100644 --- a/objects/obj_fleet/Draw_64.gml +++ b/objects/obj_fleet/Draw_64.gml @@ -206,3 +206,5 @@ if (start == 7) { draw_set_valign(fa_bottom); draw_text(_result_center_x, _bbox_y2 - _padding_y, _result_box_footer); } + + diff --git a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml index 8cab32875a..df16567420 100644 --- a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml +++ b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml @@ -41,7 +41,9 @@ function scr_kill_ship(index){ } _units_on_ship = array_shuffle(_units_on_ship); for (var i=0;i=0;i--){ + var _ships = array_length(ship) + for (var i=_ships-1;i>=0;i--){ if (ship[i]!="") and (ship_hp[i]<=0){ scr_kill_ship(i); } diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index 5545771c72..a01f81bb09 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -21,13 +21,13 @@ global.ship_weapons_stats = { draw_scale: 2, }, "Weapons Battery" : { - facing : "most", + facing : "front", cooldown : 20, - dam : 20, + dam : 18, firing_arc : 5, }, "Light Weapons Battery" : { - facing : "most", + facing : "front", range : 300, cooldown : 30, dam : 8, @@ -41,7 +41,7 @@ global.ship_weapons_stats = { firing_arc : 15, }, "Heavy Gunz" : { - weapon_facing : "most", + weapon_facing : "front", dam : 12, range : 200, cooldown : 40, @@ -104,7 +104,7 @@ global.ship_weapons_stats = { cooldown: 90, }, "Pulsar Lances":{ - facing : "most", + facing : "front", dam : 10, weapon_cooldown : 10, img: spr_ground_las, @@ -150,14 +150,14 @@ global.ship_weapons_stats = { draw_scale:2, }, "Railgun Battery": { - facing : "most", + facing : "front", dam :12, range : 450, cooldown:30, img : spr_railgun, }, "Ion Cannons": { - facing : "most", + facing : "front", dam :8, range : 300, cooldown:15, From 00245c750735a5a50f6cc7f7162be4986bae0547 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 4 May 2025 23:54:45 +0100 Subject: [PATCH 038/155] get ridof multiple arrays for weapon data --- objects/obj_p_ship/Alarm_0.gml | 225 ------------------ .../scr_fleet_advisor/scr_fleet_advisor.gml | 9 +- .../scr_ini_ship_cleanup.gml | 4 +- .../scr_player_fleet_combat_functions.gml | 24 +- .../scr_player_fleet_functions.gml | 5 +- .../scr_player_ship_functions.gml | 101 ++------ .../scr_ship_combat_data.gml | 13 +- .../scr_ship_weapon_struct.gml | 6 + .../scr_tyranid_fleet_functions.gml | 2 + 9 files changed, 49 insertions(+), 340 deletions(-) delete mode 100644 objects/obj_p_ship/Alarm_0.gml diff --git a/objects/obj_p_ship/Alarm_0.gml b/objects/obj_p_ship/Alarm_0.gml deleted file mode 100644 index eabf2f872f..0000000000 --- a/objects/obj_p_ship/Alarm_0.gml +++ /dev/null @@ -1,225 +0,0 @@ - - -action=""; - direction=0; - - - cooldown1=0; - cooldown2=0; - cooldown3=0; - cooldown4=0; - cooldown5=0; - - - name=obj_ini.ship[ship_id]; - class=obj_ini.ship_class[ship_id]; - hp=obj_ini.ship_hp[ship_id]*1; - maxhp=obj_ini.ship_hp[ship_id]*1; - conditions=obj_ini.ship_conditions[ship_id]; - shields=obj_ini.ship_shields[ship_id]*100; - maxshields=shields; - armour_front=obj_ini.ship_front_armour[ship_id]; - armour_other=obj_ini.ship_other_armour[ship_id]; - weapons=obj_ini.ship_weapons[ship_id]; - turrets=0; - ship_colour=obj_controller.body_colour_replace; - weapon = obj_ini.ship_wep[ship_id] - - weapon_facing[1]=""; - weapon_cooldown[1]=0; - weapon_hp[1]=hp/4; - weapon_dam[1]=0; - weapon_ammo[1]=999; - weapon_range[1]=0; - weapon_minrange[1]=0; - weapon_facing[2]=""; - weapon_cooldown[2]=0; - weapon_hp[2]=hp/4; - weapon_dam[2]=0; - weapon_ammo[2]=999; - weapon_range[2]=0; - weapon_minrange[2]=0; - - weapon_facing[3]=""; - weapon_cooldown[3]=0; - weapon_hp[3]=hp/4; - weapon_dam[3]=0; - weapon_ammo[3]=999; - weapon_range[3]=0; - weapon_minrange[3]=0; - - weapon_facing[4]=""; - weapon_cooldown[4]=0; - weapon_hp[4]=hp/4; - weapon_dam[4]=0; - weapon_ammo[4]=999; - weapon_range[4]=0; - weapon_minrange[4]=0; - - weapon_facing[5]=""; - weapon_cooldown[5]=0; - weapon_hp[5]=hp/4; - weapon_dam[5]=0; - weapon_ammo[5]=999; - weapon_range[5]=0; - weapon_minrange[5]=0; - - - - - - if (class="Battle Barge"){ - turrets=3; - weapons=5; - shield_size=3; - sprite_index=spr_ship_bb; - weapon_facing[1]="left"; - weapon_dam[1]=15; - weapon_range[1]=450; - weapon_cooldown[1]=30; - weapon_facing[2]="right"; - weapon_dam[2]=15; - weapon_range[2]=450; - weapon_cooldown[2]=30; - weapon_facing[3]="special"; - weapon_cooldown[3]=90; - weapon_ammo[3]=3; - weapon_range[3]=9999; - weapon_facing[4]="front"; - weapon_dam[4]=12; - weapon_range[4]=1000; - weapon_cooldown[4]=120;// volley several - weapon_facing[5]="most"; - weapon_dam[5]=16; - weapon_range[5]=300; - weapon_cooldown[5]=30; - } - - if (class="Slaughtersong"){turrets=3; - weapons=5;shield_size=3;sprite_index=spr_ship_song; - weapon_facing[1]="most"; - weapon_dam[1]=16; - weapon_range[1]=550; - weapon_cooldown[1]=26; - weapon_facing[2]="most"; - weapon_dam[2]=16; - weapon_range[2]=550; - weapon_cooldown[2]=26; - weapon_facing[3]="most"; - weapon_dam[3]=16; - weapon_range[3]=550; - weapon_cooldown[3]=26; - weapon_facing[4]="front"; - weapon_dam[4]=32; - weapon_range[4]=1000; - weapon_cooldown[4]=90; - } - - -if (class="Gloriana"){ - turrets=3; - weapons=5; - shield_size=3; - sprite_index=spr_ship_song; - weapon_facing[1]="most"; - weapon_dam[1]=16; - weapon_range[1]=550; - weapon_cooldown[1]=26; - weapon_facing[2]="most"; - weapon_dam[2]=16; - weapon_range[2]=550; - weapon_cooldown[2]=26; - weapon_facing[3]="most"; - weapon_dam[3]=16; - weapon_range[3]=550; - weapon_cooldown[3]=26; - weapon_facing[4]="front"; - weapon_dam[4]=32; - weapon_range[4]=1000; - weapon_cooldown[4]=90; -} - if (class="Strike Cruiser"){turrets=1; - weapons=4; - shield_size=1; - sprite_index=spr_ship_stri; - weapon_facing[1]="left"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=30; - weapon_facing[2]="right"; - weapon_dam[2]=8; - weapon_range[2]=300; - weapon_cooldown[2]=30; - weapon_facing[3]="special"; - weapon_cooldown[3]=90; - weapon_ammo[3]=3; - weapon_range[3]=9999; - weapon_facing[4]="most"; - weapon_dam[4]=12; - weapon_range[4]=300; - weapon_cooldown[4]=30; - } - - if (class="Hunter"){turrets=1; - weapons=2;shield_size=1;sprite_index=spr_ship_hunt; - weapon_facing[1]="front"; - weapon_dam[1]=8; - weapon_range[1]=450; - weapon_cooldown[1]=60; - weapon_facing[2]="most"; - weapon_dam[2]=8; - weapon_range[2]=300; - weapon_cooldown[2]=60; - } - - if (class="Gladius"){turrets=1; - weapons=2;shield_size=1;sprite_index=spr_ship_glad; - weapon_facing[1]="most"; - weapon_dam[1]=8; - weapon_range[1]=300; - weapon_cooldown[1]=30; - } - - - // STC Bonuses - if (obj_controller.stc_bonus[5]=5){armour_front=round(armour_front*1.1);armour_other=round(armour_other*1.1);} - if (obj_controller.stc_bonus[6]=2){armour_front=round(armour_front*1.1);armour_other=round(armour_other*1.1);} - - - var i=0, unit, b=0; - - for (var co=0;co<=obj_ini.companies;co++){ - for (i=0;i(unit.max_health()/10)){ - array_push(board_co, co); - array_push(board_id, i); - array_push(board_location, 0); - array_push(board_raft, 0); - boarders+=1; - } - // Loc 0: on origin ship - // Loc 1: in transit - // Loc >1: (instance_id), on enemy vessel - if (co==0 && master_present==0 && i<100){ - if (unit.role()==obj_ini.role[100][eROLE.ChapterMaster] && unit.ship_location==ship_id){ - master_present=1; - obj_fleet.control=1; - } - } - } - } - } - - if (boarders>0){ - if (obj_controller.command_set[25]=1) then board_capital=true; - if (obj_controller.command_set[26]=1) then board_frigate=true; - } - - if (hp<=0){ - x=-1000; - y=room_height/2; - if (ship_id=0) then instance_destroy(); - } \ No newline at end of file diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 38bcdea95b..f8bbb5de54 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -203,14 +203,7 @@ function scr_fleet_advisor(){ cn.temp[109] = string(obj_ini.ship_turrets[i]); - var facing_length = array_length(obj_ini.ship_wep_facing[i]); - var wep_length = array_length(obj_ini.ship_wep[i]); - var max_weapons = min(facing_length, wep_length, 5); - - for (var s = 1; s < max_weapons; s++) { - cn.temp[110+((s-1)*2)] = obj_ini.ship_wep[i][s]; - cn.temp[110+((s-1)*2)+1] = obj_ini.ship_wep_facing[i][s]; - } + cn.temp[110] = obj_ini.ship_weapons[i]; cn.temp[118] = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"; cn.temp[119] = ""; diff --git a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml index df16567420..f81b6015cd 100644 --- a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml +++ b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml @@ -92,9 +92,7 @@ function scr_kill_ship(index){ array_delete(ship_other_armour,index,1); array_delete(ship_weapons,index,1); - array_delete(ship_wep ,index,1); - array_delete(ship_wep_condition,index,1); - array_delete(ship_wep_facing,index,1); + array_delete(ship_weapons ,index,1); array_delete(ship_capacity,index,1); array_delete(ship_carrying,index,1); diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 023c9161a3..ecbe3d8eee 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -30,9 +30,6 @@ function add_fleet_ships_to_combat(fleet, combat){ array_push(combat.ship_other_armour, obj_ini.ship_other_armour[_ship_id]); array_push(combat.ship_weapons, obj_ini.ship_weapons[_ship_id]); - array_push(combat.ship_wep, obj_ini.ship_wep[_ship_id]); - array_push(combat.ship_wep_facing, obj_ini.ship_wep_facing[_ship_id]); - array_push(combat.ship_wep_condition, obj_ini.ship_wep_condition[_ship_id]); array_push(combat.ship_capacity, obj_ini.ship_capacity[_ship_id]); array_push(combat.ship_carrying, obj_ini.ship_carrying[_ship_id]); @@ -162,26 +159,9 @@ function setup_player_combat_ship(){ turrets=0; ship_colour=obj_controller.body_colour_replace; max_speed = obj_ini.ship_speed[ship_id]; - weps = obj_ini.ship_wep[ship_id]; - weapons = []; - for (var i=0;i Date: Mon, 5 May 2025 01:35:49 +0100 Subject: [PATCH 039/155] more leegacy removal --- objects/obj_p_ship/Step_0.gml | 1 - objects/obj_p_ship/obj_p_ship.yy | 1 - .../scr_automated_ship_combat_functions.gml | 8 -------- .../scr_player_fleet_combat_functions.gml | 7 ++++--- .../scr_player_fleet_functions.gml | 2 +- .../scr_player_ship_functions.gml | 5 +---- scripts/scr_ship_combat_data/scr_ship_combat_data.gml | 2 +- 7 files changed, 7 insertions(+), 19 deletions(-) diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index 787459a491..72165d65a2 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -55,7 +55,6 @@ if (hp<=0) and (x>-5000){ } if (hp>0) and (instance_exists(target)){ is_targeted(); - cooldown_ship_weapons(); if (class="Apocalypse Class Battleship") or (class="Gloriana"){ o_dist=500; diff --git a/objects/obj_p_ship/obj_p_ship.yy b/objects/obj_p_ship/obj_p_ship.yy index 88ab5c0200..318f3d5449 100644 --- a/objects/obj_p_ship/obj_p_ship.yy +++ b/objects/obj_p_ship/obj_p_ship.yy @@ -4,7 +4,6 @@ "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":51,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 4451f2c024..71a32f8b4d 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -67,14 +67,6 @@ function start_slowing_telemetry(distance_to_target, deceleration){ } -function cooldown_ship_weapons(){ - for (var i=0;i0){ - cooldown[i]--; - } - } -} - function destroy_ship_and_leave_husk(){ image_alpha=0.5; diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index ecbe3d8eee..5c509f5edb 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -160,9 +160,10 @@ function setup_player_combat_ship(){ ship_colour=obj_controller.body_colour_replace; max_speed = obj_ini.ship_speed[ship_id]; - weapons = obj_ini.ship_weapons; - - + weapons = obj_ini.ship_weapons[ship_id]; + for (var i=0;i Date: Mon, 5 May 2025 22:55:03 +0100 Subject: [PATCH 040/155] few fixes and now saving --- objects/obj_ini/Create_0.gml | 21 ++++++++++++++++-- .../scr_player_fleet_functions.gml | 1 + .../scr_player_ship_functions.gml | 17 ++++++++++---- .../scr_ship_weapon_struct.gml | 21 +++++------------- .../scr_struct_functions.gml | 13 ++++++++++- .../be2b8b48-0ab2-4b69-b879-4af5e4ede8a4.png | Bin 4405 -> 4410 bytes .../0c5eee0d-3e20-4de4-893d-69756dc63a39.png | Bin 4405 -> 4410 bytes 7 files changed, 50 insertions(+), 23 deletions(-) diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 36ca47d6cb..23e9553c34 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -131,6 +131,8 @@ serialize = function(){ array_push(artifact_struct_trimmed, artifact_struct[i]); } } + + var ship_structs = []; var save_data = { @@ -146,7 +148,9 @@ serialize = function(){ marine_structs: marines, squad_structs: squads, equipment: equipment, - gene_slaves: gene_slaves + gene_slaves: gene_slaves, + ship_weapons, + ship_data, // marines, // squads } @@ -163,7 +167,7 @@ serialize = function(){ } deserialize = function(save_data){ - var exclusions = ["complex_livery_data", "full_liveries","company_liveries", "squad_types", "marine_structs", "squad_structs"]; // skip automatic setting of certain vars, handle explicitly later + var exclusions = ["complex_livery_data", "full_liveries","company_liveries", "squad_types", "marine_structs", "squad_structs", "ship_weapons","ship_data"]; // skip automatic setting of certain vars, handle explicitly later // Automatic var setting var all_names = struct_get_names(save_data); @@ -254,6 +258,19 @@ deserialize = function(save_data){ } } + ship_weapons = []; + if (struct_exists(save_data, "ship_weapons")){ + show_debug_message(save_data.ship_weapons); + var _wep_data = save_data.ship_weapons; + for (var i=0 ; iBC6hhe}li?DFct0{n*cq_*gpM#FGitiq&@2dl|-0&igSrLRl%Xp^y)nkJS&Uhh*+phv3ucNyC*v zmBc}4pP}-L>~+4u^eA0|3?B4Q4_p9k#9o8YWBk+(VJ_Ua%RX#Vq(9X(uF5yDnw!uM(ROr*jmmEB7H(crIM-TR-=)i}Z8NrXb{&D=i7lo3G`B7R`)N}%_ zOqUKzDuU5pw*%8^YD~++R8)pbFR{o?Ztg7XEVp~FD!y;mlqmDan-s1wUnsIbr*l~k z=dQ?ZT3$(GU;JUoHj>8pPk&kx^F%Nrsj4PDuVQ-_J&xPjp-<*&c06sb^F{%|RUc{& z_qz=*JR0^rIx5hTmlropFEkoqfOB%fZS|3hPuD65LOIK#tRf8HYOfp$SGP8m7YpX? z-#b9x{BoR6-ct8|h7NXeT`I+N?)(7(LyhsNBF1c3RU`B+sFNPA1`sVBgc2`wk>3?b z^k;oiuylPGaN>j8Ym56rUpDo0=hwFf;L~&ReWt!j0q? zKZkx}?r~6~vVyNqIvbuqs6t=!PIz-`H{|tX26^ zjflRsR1rNOlPvV*X8wzwNNPtAwV^Y!f5G{MgWcfhQabhUe%!)t#)hijQl+gZ;Q^XG zDrcm8*RvOmpJ~4iCJL;|CSk7%B(U5twB;00-e$B^(Ur9W<@hK#8ctkoWYJL_Rw&J1 zI)=#f-74|ht*x4KB5Q#~mR_8}naU>d6)?kw`*+xm*Q>#=A!gNr%1lKbGFOZcuXRn)&azrUd2O#PyIxKcUeMwfzw}SaGe*id%Q}NCaNM0 z%x94@7iZ#O&3&-EcxKkJIl(viEa51KWvOqo3D{oGY^ISYIGTxzi+Y6-x;#18)*(aR zaN^}E@$kvnUb+Y8ziS5p?rw8Y@JtD&nO$=5#Ep17oUgq~R~WN8=~j6*!15p`aL0mE zOQDKSPs=A0^|4x>1ro9z8MoNH4b^aR?D5tY5cHc;zoowSJ$8!1(ir%-^gG9^1XNbQ z-fk>@akE3)mM%+|!!I$VIS5**11av$zLUH{RzDj!dJwg)DqpU+w^Hquw4|a-h8Wt9 z#J~t ztQlbb=6{cl^@ZiXlXz? zNqB5VU9q3xMLwE~_*3~FVr65MmTXcX^^Ba|b%mD@LY|x}j)?48i>V z6lRZ%FPXe+9uS5Fk(TKZ?w3cL^NC=iLM_geRa41K;;+sK4DBj-^``pq5@k-?PpnOB zc6(Odr1FY{-CcK(_lbn|AW-)Akaj+9(Xz4%gG-);7PmIVtUQ+IkeX{iRgs*8^jxY) zrt%80dy_^67rwJaXz0i~0SGT+jTW?zRbkfzSKqes4NADczmt0j^@rHA|2D0vwJZ$~i) ziKjo(bcsx5;7@{Uma~xi=HAlS??8X1v64D2JXy?Zs(kM4e?{8i{W^vV530?xuN%v+ zsZ5Y|1YUmc|8A#BE9)7KAw$f*@MYDnC&+^6Ei-aqv0LNOjr^~g5o%A}z}Ic=GFlky z4~@B}fE!D!c_^d@!{{WgiNX0wDtd3*uzU^VsrmZ0@W*C&LH$6QqhKFrz8Fm0q-cQw z4#ZA0$=Y+p&nt9aYR$ya=YiaPX`DMpUkN)6HlsnZfBHc8Tufrd*z)0k37zihXPU=jbqE!uK9ml>KSoU?KlaS{1syJ*&JGy^I=sdJGL!g0#3 zOGkeg70$=lxTXYtBg~|tWhJ!rlsf{#(P{A6V_sF~OJQ9Sw|#YO`V=K`W|Vyo*w-on zKN|f&Fmg%yR9Z2Bw2XaAk zaAZ-rb{|NwnCIrOdTXqb!-k4pL3L}+6#a>NL$Y4 zt#AU7m4s*jkJlung+CnCEN?-`)h0NU=kkkey%Dkz<3~l?+azOy6e63i{)`5~6Wq;) zwj`93*K&l@7=~MQ-@sl65bWmS6g!N~&E-Ph2a!}Y?3Zh*a(uIdv?vgt98DaMEOVFg)aJB@~J&Z61IAr;(BJKKexu{-j*K{ zoRJQ-;gCc&OZ@$NpR6*H#gq)Jqn6OwLspud-f#b0H3~|=*Tl=t`UD<3b2Fx;gm+oI zHhmKD%sXmepEfGx?&3Zk%uT;`$t;*Y#G9ci%v2ho=7eJPvA}J}rEcU$5}GP?4L4xK zK<*H`YvUD2rti17rBIA}wS;0r|9Xnb-z11DQelXF z9&0I+U}p)u{mO)=t^3M!2TxXx#Jg%Eev zNTNux#5%VjL{=2uqFG;d5r;R(_hHG~$SXjeu9HQa$0D-Xfpp_o-HCl*=x^F~kw-iN z*zsHW`0&p>feap^yJHBjab(aanzqF&a(~v!UxnEW8g7gyDw?Tksw#9$=TNMbyFRG~F3o;ELmqhh3plk73Ps zQD+oLjzZjw6!_|A#TmP5(oL6m$3@Y32u!@5-Nm1=@%X?Emnb=yMYXsJ?^@?3vMSpj z>4XHCS}=!SWNvAk;}R?{3jSCxfAV~zRcD|k(=E_ssyOmMN|ldKIq;W^@ZL?wSKkBm z43ozwu7BNgjjIb5`%O1Yp!WlRnXcdP!z=_qE+Demzipcj?7wM=pCKfZR`;J{!&2u2 z4c;AgQ953pz=kRO1{JSt`6X|y>^u+I@9Uh2w5uIqYA3$C{tex5H_nFlkM&HCxz0XJugLDRzrEwjdmd&o*fkEp)-mg|? zM+#ndpMt&;iMcO-1#3UX9)mR8C_TlZ+Pi<%DLaEX8w)ESl<2K|mHU>L%O2v|V!pW= z^xEqj5oDYLjoDt`cffE*@PCY!C}pVKlO)y6vJvH)7u}B@;m*?HLz{5NIb%Uf>yG8d z-;}l@*(%H8okMJq$gyOR`L{w6u>$n&pyb4Ne^c0f6>PVo$@$8AP2D*;oZ5eHwO9wt zhLVqu7sh7C$&IQ<6i0XALaNkuyI(@0+Hv*yzYzDhGpWK#oN2gmzxgK06O|04NluJ; z&Wf-8FyiDn({GL*XgZS?bw>t-Q@+in7@jU92lhIyzd?m%gL<&_azm*;AbR83jH|KV zO@>m#P`&ttdRa@i*>)D*rj)9-@dv7MJCv5U zjTz(4mRO~_gFFtkRo=J~Jrl4G=toY-9O06RXhWQBm2dARIHxlsisu{%Kw}H8u znOJ{wUney`73$Q&(J;>E;BJ+xk zi}yT5zv@l6GxN~3^tU32`UYvdk00N!o$FBoqa*2yO>ZuRj?)k4)l%)Eq7Q6288}6T zh)R5lwaSVXKU=mA5q{#nUxYmF8I`o+)X&(*y*FNsD+hjH%=O2S$~;cTgy+(xB_-Um zEXPk<36E9gt^Yi4y{49y!k_Q5#+8yms> zF|_H&3q4f{IlFclC~aj_JKbuomVLfT5cbis@Nuy7 zd8~}_dVDSb8JLWmB<#P(ROXiQZCPbGg_|&#G7JWNCNBE_05=Z@=O+RG8!(Z4{q7tP h`#%RCXSc`RK6Y-;{x?IfScy1i07xw~q7-f$_8%RsZZQA= literal 4405 zcmV-55z6j~P)iJFsG`eNx7`Sna%10$YQk#K2~Z>VkMgR8@2uO5XdY`O1qDhn;BLR zqh>`)3oBAt0}v`KtU&%6kx~P@VdExtLr^dq6cpt9(C2&aB}&MPHQTLhT#EaKvS0!w z(|6H#;wgGh{Bad4{l@*@!scti(99>0XY?a===VtOK8Mu0X_W8z7M1%R5*{Ic>OQh} zeTVFcZ{h7PShn4Vs`4oKrc8)jH4rg%h;mjTDxn-Pi4~9~RX}9R2A?N*`JvDF zo0Z&57kmHiH7qWkfTd&vhNcTJwqFgv^i#b8eZv`u?8Q)dx*&0Pz}UJ7S@t0KDkG%H z>5!%PsBHj0{KIRQK;vYE1i>m2e*(4D4)(n*r3~A%fkUsSsK7xPpIqDC+ zKtlCiNNicy6vpFzp40Bi=lsfotN5~ksf$Wi6@DJZY#^5b@2W}yK;3k3U z!CSBEHQ*b%3IE`AxO>k-Xw7=}z4CdRVx@8^Ym9T=kodMjRr@hCji12O%psxeQy8e$ zHgSmUyo`kI>xk>Q0Y}euI6JSvO5-uECh&N?)kqp4()pN%zeNb>LFGhbO zLgj$a;DLZ3d;YlMOcjS{akdIK*Da~ ziB=INklu(i(PH)@2&j&-=F;Msu%+cg=ky>lN{--=u(wQAsBy85j`L_g{Q|Zm@2W`% zgkoRaz^+w}C{k#Bxt&9+0yZTkvA)uR)q|+xQ{S4meRlB|{4(0$hCXWx47mfVFy;*) zscaDH_)G}n3L#2ufjF&`+)*#&zCNVXjzjCN{q4DGghaS*DKz0g)1KwR@t zl#QQ4N>Ld$ZrJb(?iQ(XveufTC_nHRJtrQmZZbk*WRt7Mpp8!r2*~DZfWhAdPo^)> z*JgIZTF@VOpD$Li>a;cpbjg7+p47-DR!^=7GFw$qW8aazu&lw4NgO-yhl$^|x%;~c? zbDriI&R8(OCDl%GN!8<=qiURUR!?x2;$a%w!&!@lI9vW^&YsiGNt~ri(asuJ`o18) z_ZSY^T*7`h&nKc*hfvf*EN@gEHn%cnGs%AL<=$9zn^9@`*=U+>2Ko^7}2hDV6tUO;mFEE1cJg6TL5 z3q5mmT|#W}I8r)KA+>T4F{X6zlunp?eur2J8u7z_K*`?kkHW=zof!TT+{;_|9 zx#2YIZ5NP9?S#J1;O<+5t@Q%3rXC?<>m``$kD+MhAsn3?)MW>tD4c?rD3gXX%T~T0 z*0OyhkU0WbM&%qu(+h|#7=j|D3Cgr~X#HEE%N`(xFaQ&owt{%+n!?iGD(S}0*2a?P$X7DU9=l9u{ns= zGT=*NVJw*?0(}zJx|2xgyaYq>F4)SZkl1n@$zA7>JN*#)f>A`7+_Xk6;`4@))wzhw znnTbKC)E0PLzg=TedBeQ@<*W~lhk|LVJO`TOU((`+)eO$nqjFu4r}#Mn1}{h3dfK@ zfywA+q4Tx`gdSfw01dq-@pdE1)d&Ss4`osnDZ?1dxr0b3-G%b)XHd{N3tMhK`MweO znr7f(DFTl@LB-5d)XhGHr|sn0!b|qL*|Qf8;nLzf7B3#gDefqC?wf)xArngCXtvI) z(B%xm)_e{I+MtncE53y^fixt6)LNIflg#BLl&MV+$L3K)vXc`Yr`tUMYdL`;v8rGa ziqvMBuN|7Kt+01rgWTN)zS;pfWfc|nY|JGUqA8~j=F)xe4n9N9&KF1?c>&MJU8D`& zA&vVQuD)yV)h(boy#@=WBotOmBCYup9riK`ci%_D@gI>l`7NbfjM|LUw&=Q3qPXoqyHey zJioT^+`csS%9SJd;?`k&`S~$?dif}(=l8?p zQG|ltkCD|lj-2X#)NbB~yxJ{D?cxH$YdQQQHh=WvuM5xWh+_wLZ^xdwLCnn$VRCjm z%GzonRNA2=HFxz~gg(8UOynqZ89h+?w?kh#3r%_#;z+1U(x_PCX-a1)V$6OrcN>h^ z!?02iuollCq4^AqWVZ4ZXG~_VA`>z;e+nu25k9RUv*&>+8bfj8A!7IBs7cG!d1SU_ z3ov!xftKb_tYj-$!z9=RB<7F7t9PN$z`$F&2XWRi7riB zx5}VC}nuIQ9-oroToah58ktYYTQR8%rma&Gko? z)#=U4BAtC%YV*G`lK>KXZX&JkYT#1j3<)`-AEvgeP!aWsi7$cFSqpu|VQ7kGs9y#t z(+J~ARLtK+W7SZ&yC}L|2z)1X)k9DFmZ!Eup3+J=^)N&!Z4hcx5UF&K->ZZ?t^l(5 zBB+@f#1##bpKPPRPz{~C5%%gsa8LkCYUhx}F2Y_ky0-9?dL3I_UyY`YdbD;opslA7 zX}MX5vH8j2A4SH_yKuChgJwH6@okq-K=i~^cLcT_4`5=yd7b)g zy$9>SBN%B;WB=Vi+cxkJ#?4;`#%+U-VA=Lvpl{lCA9gZx3w;y#mJm1m1m=!QP*UU+ znSA8y@*sCsLbej<(mG%%*^T^dm!Wf&AzYOR9+@(q2!5nFD}X3VHpE8H+QJJC4i@tw z!Wce3oDoDuFhW5Dv(n!b&SxTGbWF6$OmxD)L@CWogv7uQ0c9crl*7VADs2p3ZefH9 z3lkotWcbRsd6|D8!13ZopTkADZQGFt=sxu=+{IOYU2A<_jOn%TS{I2A-bNVB6D~0_ zCU5PlXjcOrwCJlashQCbDHf4WwPjX*6;6HPZjgCe5l;JwGN;c+B{d?_miHA;ZexUI zANA`I<17pGiEuNa0vWSHl3f(6Qnr5mnk=tyzR5qMdiELgsWlL#vrtqnK+|>wns!Pn zH{V3z=w~SDJN*7L3}KXr5eTCRQ2|7X74!0}K{B5+WHzUWZyiS-dlYq(A0xlD2VoI{ zlmC4VK9OWo{sd{>MPzTg^0y2_q^@z)?}OGHH@(tNF7JEgs-J|`WDfK#*=?_qE4KtL zgwnzqm9O_zw9y?H6G-(nan(evY~JZN*HU}h;ofl%X++-Be$FyRAERW~edtJdGV+@m zas?*RT+{XkNSkBs5q1#&8Uc`#1p-7*3Jfy+Hwfq&SOYxpGSOtCmc27 z#6{=eYFmJ-{RmR&d3yUST$MY(j}kLHp@<0y4cET2(DXVZrIELspcRfYko+T8{JV)mAQ&b)J0X@W*>gInS*3Kd-M!Bpt8kP+@#qtI^ zn73*Y2Bzc}TKT?8v?hV|b}pcJ_yQ^>uApl2S^%|sZlQkf=YPY#+pqC+d(U+=OkG67 z^hMN9Euv({DGDf6@BXVwy4%hkKD~gc!*i5%j8P(emh!-huu$&lr1Z+#aTT#$*NM>H zL~`E^#P{3?w9~hKj`*(25L3ifFm-_+N5vL@z#N3a80Ni6YK;;m(y>+|#_>%@5Z5sO zOVl5H8-eHKhZ_$EzDZ~%v>Zch%^bweigy>D-y6?fyM7WMpFIQ}5mq_T00r@=6{zxd zuC^7FuSQ$4Afd=6N~oZ*QHWETAv8LnOfP~evk{WiIz+|gFAFWczNjtQQI2S5#VSOJD|I=9^jr{Ef{i>e7kGaYj|mD1 zdv~*SxlHWVy%Xq~+(p?1-Nx3th$HH-0{aSfyoROk%Rnxf-@cz{!XT{M?mmC{0Q(_dHqjugsGtWaiT1rqIB;EUC4=%%pu`tyBA zq=X5HlrkF$A#Y$KU&;jY-lJ8Rj0(1>sT!FL&9F9|f_wBH(kCc&8h?n?u?I*V{T|H7 z_e79?2X$%#y2j2xlRE@M_id|ssF*6`w9O%k(l!zCE&k93ETY@)+`S@b}Z~D*JhbsRC);;Z26IGwX00000NkvXXu0mjf8vu7z diff --git a/sprites/spr_ship_glad/layers/be2b8b48-0ab2-4b69-b879-4af5e4ede8a4/0c5eee0d-3e20-4de4-893d-69756dc63a39.png b/sprites/spr_ship_glad/layers/be2b8b48-0ab2-4b69-b879-4af5e4ede8a4/0c5eee0d-3e20-4de4-893d-69756dc63a39.png index 4a4431613a9c354f519b9b2de59120b30c732d52..474f1d3a15df659a654a6320ddd3b00ac0b2c3a2 100644 GIT binary patch literal 4410 zcmZ{ocQhMd_s3&YqgA6#jSwSd)kxK*Xv7E-HHxA&qD8G*F;di~C`u_cLZhgLnzhwv z?a`=Ktr#_H?-hBy|NPGR{qdgr-1|M}dCup2&$<6R_uSZfXq_vUz?T33z!jt}!uVVb z&yyF(a9-UOG=H88KStLW1pow!001u{0D$B3s~1ZEfG-RHSg{2Fl-~jX9M7`qja1Jc z80__R5CH0b1K(7b0syc|A`y2@ou<|@knudf13E)CMo1&$yUMrkXbvzb#18+|j*WMa z)U@()0QLxkGSLGK9#$|(D_Llxd$iJlx>BC6hhe}li?DFct0{n*cq_*gpM#FGitiq&@2dl|-0&igSrLRl%Xp^y)nkJS&Uhh*+phv3ucNyC*v zmBc}4pP}-L>~+4u^eA0|3?B4Q4_p9k#9o8YWBk+(VJ_Ua%RX#Vq(9X(uF5yDnw!uM(ROr*jmmEB7H(crIM-TR-=)i}Z8NrXb{&D=i7lo3G`B7R`)N}%_ zOqUKzDuU5pw*%8^YD~++R8)pbFR{o?Ztg7XEVp~FD!y;mlqmDan-s1wUnsIbr*l~k z=dQ?ZT3$(GU;JUoHj>8pPk&kx^F%Nrsj4PDuVQ-_J&xPjp-<*&c06sb^F{%|RUc{& z_qz=*JR0^rIx5hTmlropFEkoqfOB%fZS|3hPuD65LOIK#tRf8HYOfp$SGP8m7YpX? z-#b9x{BoR6-ct8|h7NXeT`I+N?)(7(LyhsNBF1c3RU`B+sFNPA1`sVBgc2`wk>3?b z^k;oiuylPGaN>j8Ym56rUpDo0=hwFf;L~&ReWt!j0q? zKZkx}?r~6~vVyNqIvbuqs6t=!PIz-`H{|tX26^ zjflRsR1rNOlPvV*X8wzwNNPtAwV^Y!f5G{MgWcfhQabhUe%!)t#)hijQl+gZ;Q^XG zDrcm8*RvOmpJ~4iCJL;|CSk7%B(U5twB;00-e$B^(Ur9W<@hK#8ctkoWYJL_Rw&J1 zI)=#f-74|ht*x4KB5Q#~mR_8}naU>d6)?kw`*+xm*Q>#=A!gNr%1lKbGFOZcuXRn)&azrUd2O#PyIxKcUeMwfzw}SaGe*id%Q}NCaNM0 z%x94@7iZ#O&3&-EcxKkJIl(viEa51KWvOqo3D{oGY^ISYIGTxzi+Y6-x;#18)*(aR zaN^}E@$kvnUb+Y8ziS5p?rw8Y@JtD&nO$=5#Ep17oUgq~R~WN8=~j6*!15p`aL0mE zOQDKSPs=A0^|4x>1ro9z8MoNH4b^aR?D5tY5cHc;zoowSJ$8!1(ir%-^gG9^1XNbQ z-fk>@akE3)mM%+|!!I$VIS5**11av$zLUH{RzDj!dJwg)DqpU+w^Hquw4|a-h8Wt9 z#J~t ztQlbb=6{cl^@ZiXlXz? zNqB5VU9q3xMLwE~_*3~FVr65MmTXcX^^Ba|b%mD@LY|x}j)?48i>V z6lRZ%FPXe+9uS5Fk(TKZ?w3cL^NC=iLM_geRa41K;;+sK4DBj-^``pq5@k-?PpnOB zc6(Odr1FY{-CcK(_lbn|AW-)Akaj+9(Xz4%gG-);7PmIVtUQ+IkeX{iRgs*8^jxY) zrt%80dy_^67rwJaXz0i~0SGT+jTW?zRbkfzSKqes4NADczmt0j^@rHA|2D0vwJZ$~i) ziKjo(bcsx5;7@{Uma~xi=HAlS??8X1v64D2JXy?Zs(kM4e?{8i{W^vV530?xuN%v+ zsZ5Y|1YUmc|8A#BE9)7KAw$f*@MYDnC&+^6Ei-aqv0LNOjr^~g5o%A}z}Ic=GFlky z4~@B}fE!D!c_^d@!{{WgiNX0wDtd3*uzU^VsrmZ0@W*C&LH$6QqhKFrz8Fm0q-cQw z4#ZA0$=Y+p&nt9aYR$ya=YiaPX`DMpUkN)6HlsnZfBHc8Tufrd*z)0k37zihXPU=jbqE!uK9ml>KSoU?KlaS{1syJ*&JGy^I=sdJGL!g0#3 zOGkeg70$=lxTXYtBg~|tWhJ!rlsf{#(P{A6V_sF~OJQ9Sw|#YO`V=K`W|Vyo*w-on zKN|f&Fmg%yR9Z2Bw2XaAk zaAZ-rb{|NwnCIrOdTXqb!-k4pL3L}+6#a>NL$Y4 zt#AU7m4s*jkJlung+CnCEN?-`)h0NU=kkkey%Dkz<3~l?+azOy6e63i{)`5~6Wq;) zwj`93*K&l@7=~MQ-@sl65bWmS6g!N~&E-Ph2a!}Y?3Zh*a(uIdv?vgt98DaMEOVFg)aJB@~J&Z61IAr;(BJKKexu{-j*K{ zoRJQ-;gCc&OZ@$NpR6*H#gq)Jqn6OwLspud-f#b0H3~|=*Tl=t`UD<3b2Fx;gm+oI zHhmKD%sXmepEfGx?&3Zk%uT;`$t;*Y#G9ci%v2ho=7eJPvA}J}rEcU$5}GP?4L4xK zK<*H`YvUD2rti17rBIA}wS;0r|9Xnb-z11DQelXF z9&0I+U}p)u{mO)=t^3M!2TxXx#Jg%Eev zNTNux#5%VjL{=2uqFG;d5r;R(_hHG~$SXjeu9HQa$0D-Xfpp_o-HCl*=x^F~kw-iN z*zsHW`0&p>feap^yJHBjab(aanzqF&a(~v!UxnEW8g7gyDw?Tksw#9$=TNMbyFRG~F3o;ELmqhh3plk73Ps zQD+oLjzZjw6!_|A#TmP5(oL6m$3@Y32u!@5-Nm1=@%X?Emnb=yMYXsJ?^@?3vMSpj z>4XHCS}=!SWNvAk;}R?{3jSCxfAV~zRcD|k(=E_ssyOmMN|ldKIq;W^@ZL?wSKkBm z43ozwu7BNgjjIb5`%O1Yp!WlRnXcdP!z=_qE+Demzipcj?7wM=pCKfZR`;J{!&2u2 z4c;AgQ953pz=kRO1{JSt`6X|y>^u+I@9Uh2w5uIqYA3$C{tex5H_nFlkM&HCxz0XJugLDRzrEwjdmd&o*fkEp)-mg|? zM+#ndpMt&;iMcO-1#3UX9)mR8C_TlZ+Pi<%DLaEX8w)ESl<2K|mHU>L%O2v|V!pW= z^xEqj5oDYLjoDt`cffE*@PCY!C}pVKlO)y6vJvH)7u}B@;m*?HLz{5NIb%Uf>yG8d z-;}l@*(%H8okMJq$gyOR`L{w6u>$n&pyb4Ne^c0f6>PVo$@$8AP2D*;oZ5eHwO9wt zhLVqu7sh7C$&IQ<6i0XALaNkuyI(@0+Hv*yzYzDhGpWK#oN2gmzxgK06O|04NluJ; z&Wf-8FyiDn({GL*XgZS?bw>t-Q@+in7@jU92lhIyzd?m%gL<&_azm*;AbR83jH|KV zO@>m#P`&ttdRa@i*>)D*rj)9-@dv7MJCv5U zjTz(4mRO~_gFFtkRo=J~Jrl4G=toY-9O06RXhWQBm2dARIHxlsisu{%Kw}H8u znOJ{wUney`73$Q&(J;>E;BJ+xk zi}yT5zv@l6GxN~3^tU32`UYvdk00N!o$FBoqa*2yO>ZuRj?)k4)l%)Eq7Q6288}6T zh)R5lwaSVXKU=mA5q{#nUxYmF8I`o+)X&(*y*FNsD+hjH%=O2S$~;cTgy+(xB_-Um zEXPk<36E9gt^Yi4y{49y!k_Q5#+8yms> zF|_H&3q4f{IlFclC~aj_JKbuomVLfT5cbis@Nuy7 zd8~}_dVDSb8JLWmB<#P(ROXiQZCPbGg_|&#G7JWNCNBE_05=Z@=O+RG8!(Z4{q7tP h`#%RCXSc`RK6Y-;{x?IfScy1i07xw~q7-f$_8%RsZZQA= literal 4405 zcmV-55z6j~P)iJFsG`eNx7`Sna%10$YQk#K2~Z>VkMgR8@2uO5XdY`O1qDhn;BLR zqh>`)3oBAt0}v`KtU&%6kx~P@VdExtLr^dq6cpt9(C2&aB}&MPHQTLhT#EaKvS0!w z(|6H#;wgGh{Bad4{l@*@!scti(99>0XY?a===VtOK8Mu0X_W8z7M1%R5*{Ic>OQh} zeTVFcZ{h7PShn4Vs`4oKrc8)jH4rg%h;mjTDxn-Pi4~9~RX}9R2A?N*`JvDF zo0Z&57kmHiH7qWkfTd&vhNcTJwqFgv^i#b8eZv`u?8Q)dx*&0Pz}UJ7S@t0KDkG%H z>5!%PsBHj0{KIRQK;vYE1i>m2e*(4D4)(n*r3~A%fkUsSsK7xPpIqDC+ zKtlCiNNicy6vpFzp40Bi=lsfotN5~ksf$Wi6@DJZY#^5b@2W}yK;3k3U z!CSBEHQ*b%3IE`AxO>k-Xw7=}z4CdRVx@8^Ym9T=kodMjRr@hCji12O%psxeQy8e$ zHgSmUyo`kI>xk>Q0Y}euI6JSvO5-uECh&N?)kqp4()pN%zeNb>LFGhbO zLgj$a;DLZ3d;YlMOcjS{akdIK*Da~ ziB=INklu(i(PH)@2&j&-=F;Msu%+cg=ky>lN{--=u(wQAsBy85j`L_g{Q|Zm@2W`% zgkoRaz^+w}C{k#Bxt&9+0yZTkvA)uR)q|+xQ{S4meRlB|{4(0$hCXWx47mfVFy;*) zscaDH_)G}n3L#2ufjF&`+)*#&zCNVXjzjCN{q4DGghaS*DKz0g)1KwR@t zl#QQ4N>Ld$ZrJb(?iQ(XveufTC_nHRJtrQmZZbk*WRt7Mpp8!r2*~DZfWhAdPo^)> z*JgIZTF@VOpD$Li>a;cpbjg7+p47-DR!^=7GFw$qW8aazu&lw4NgO-yhl$^|x%;~c? zbDriI&R8(OCDl%GN!8<=qiURUR!?x2;$a%w!&!@lI9vW^&YsiGNt~ri(asuJ`o18) z_ZSY^T*7`h&nKc*hfvf*EN@gEHn%cnGs%AL<=$9zn^9@`*=U+>2Ko^7}2hDV6tUO;mFEE1cJg6TL5 z3q5mmT|#W}I8r)KA+>T4F{X6zlunp?eur2J8u7z_K*`?kkHW=zof!TT+{;_|9 zx#2YIZ5NP9?S#J1;O<+5t@Q%3rXC?<>m``$kD+MhAsn3?)MW>tD4c?rD3gXX%T~T0 z*0OyhkU0WbM&%qu(+h|#7=j|D3Cgr~X#HEE%N`(xFaQ&owt{%+n!?iGD(S}0*2a?P$X7DU9=l9u{ns= zGT=*NVJw*?0(}zJx|2xgyaYq>F4)SZkl1n@$zA7>JN*#)f>A`7+_Xk6;`4@))wzhw znnTbKC)E0PLzg=TedBeQ@<*W~lhk|LVJO`TOU((`+)eO$nqjFu4r}#Mn1}{h3dfK@ zfywA+q4Tx`gdSfw01dq-@pdE1)d&Ss4`osnDZ?1dxr0b3-G%b)XHd{N3tMhK`MweO znr7f(DFTl@LB-5d)XhGHr|sn0!b|qL*|Qf8;nLzf7B3#gDefqC?wf)xArngCXtvI) z(B%xm)_e{I+MtncE53y^fixt6)LNIflg#BLl&MV+$L3K)vXc`Yr`tUMYdL`;v8rGa ziqvMBuN|7Kt+01rgWTN)zS;pfWfc|nY|JGUqA8~j=F)xe4n9N9&KF1?c>&MJU8D`& zA&vVQuD)yV)h(boy#@=WBotOmBCYup9riK`ci%_D@gI>l`7NbfjM|LUw&=Q3qPXoqyHey zJioT^+`csS%9SJd;?`k&`S~$?dif}(=l8?p zQG|ltkCD|lj-2X#)NbB~yxJ{D?cxH$YdQQQHh=WvuM5xWh+_wLZ^xdwLCnn$VRCjm z%GzonRNA2=HFxz~gg(8UOynqZ89h+?w?kh#3r%_#;z+1U(x_PCX-a1)V$6OrcN>h^ z!?02iuollCq4^AqWVZ4ZXG~_VA`>z;e+nu25k9RUv*&>+8bfj8A!7IBs7cG!d1SU_ z3ov!xftKb_tYj-$!z9=RB<7F7t9PN$z`$F&2XWRi7riB zx5}VC}nuIQ9-oroToah58ktYYTQR8%rma&Gko? z)#=U4BAtC%YV*G`lK>KXZX&JkYT#1j3<)`-AEvgeP!aWsi7$cFSqpu|VQ7kGs9y#t z(+J~ARLtK+W7SZ&yC}L|2z)1X)k9DFmZ!Eup3+J=^)N&!Z4hcx5UF&K->ZZ?t^l(5 zBB+@f#1##bpKPPRPz{~C5%%gsa8LkCYUhx}F2Y_ky0-9?dL3I_UyY`YdbD;opslA7 zX}MX5vH8j2A4SH_yKuChgJwH6@okq-K=i~^cLcT_4`5=yd7b)g zy$9>SBN%B;WB=Vi+cxkJ#?4;`#%+U-VA=Lvpl{lCA9gZx3w;y#mJm1m1m=!QP*UU+ znSA8y@*sCsLbej<(mG%%*^T^dm!Wf&AzYOR9+@(q2!5nFD}X3VHpE8H+QJJC4i@tw z!Wce3oDoDuFhW5Dv(n!b&SxTGbWF6$OmxD)L@CWogv7uQ0c9crl*7VADs2p3ZefH9 z3lkotWcbRsd6|D8!13ZopTkADZQGFt=sxu=+{IOYU2A<_jOn%TS{I2A-bNVB6D~0_ zCU5PlXjcOrwCJlashQCbDHf4WwPjX*6;6HPZjgCe5l;JwGN;c+B{d?_miHA;ZexUI zANA`I<17pGiEuNa0vWSHl3f(6Qnr5mnk=tyzR5qMdiELgsWlL#vrtqnK+|>wns!Pn zH{V3z=w~SDJN*7L3}KXr5eTCRQ2|7X74!0}K{B5+WHzUWZyiS-dlYq(A0xlD2VoI{ zlmC4VK9OWo{sd{>MPzTg^0y2_q^@z)?}OGHH@(tNF7JEgs-J|`WDfK#*=?_qE4KtL zgwnzqm9O_zw9y?H6G-(nan(evY~JZN*HU}h;ofl%X++-Be$FyRAERW~edtJdGV+@m zas?*RT+{XkNSkBs5q1#&8Uc`#1p-7*3Jfy+Hwfq&SOYxpGSOtCmc27 z#6{=eYFmJ-{RmR&d3yUST$MY(j}kLHp@<0y4cET2(DXVZrIELspcRfYko+T8{JV)mAQ&b)J0X@W*>gInS*3Kd-M!Bpt8kP+@#qtI^ zn73*Y2Bzc}TKT?8v?hV|b}pcJ_yQ^>uApl2S^%|sZlQkf=YPY#+pqC+d(U+=OkG67 z^hMN9Euv({DGDf6@BXVwy4%hkKD~gc!*i5%j8P(emh!-huu$&lr1Z+#aTT#$*NM>H zL~`E^#P{3?w9~hKj`*(25L3ifFm-_+N5vL@z#N3a80Ni6YK;;m(y>+|#_>%@5Z5sO zOVl5H8-eHKhZ_$EzDZ~%v>Zch%^bweigy>D-y6?fyM7WMpFIQ}5mq_T00r@=6{zxd zuC^7FuSQ$4Afd=6N~oZ*QHWETAv8LnOfP~evk{WiIz+|gFAFWczNjtQQI2S5#VSOJD|I=9^jr{Ef{i>e7kGaYj|mD1 zdv~*SxlHWVy%Xq~+(p?1-Nx3th$HH-0{aSfyoROk%Rnxf-@cz{!XT{M?mmC{0Q(_dHqjugsGtWaiT1rqIB;EUC4=%%pu`tyBA zq=X5HlrkF$A#Y$KU&;jY-lJ8Rj0(1>sT!FL&9F9|f_wBH(kCc&8h?n?u?I*V{T|H7 z_e79?2X$%#y2j2xlRE@M_id|ssF*6`w9O%k(l!zCE&k93ETY@)+`S@b}Z~D*JhbsRC);;Z26IGwX00000NkvXXu0mjf8vu7z From 9b50aa927b0ea6805ef3dfe03cc533a529d327e3 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 7 May 2025 09:57:34 +0100 Subject: [PATCH 041/155] tyranid bioo rescource --- scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml | 94 ++----------- .../scr_tyranid_fleet_functions.gml | 128 ++++++++++++------ .../scr_tyranid_planet_functions.gml | 11 +- 3 files changed, 114 insertions(+), 119 deletions(-) diff --git a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml index 1e8a0c05b2..37e4afbbd8 100644 --- a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml +++ b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml @@ -243,91 +243,26 @@ function scr_enemy_ai_d() { } } - if ((p_tyranids[i]=3) or (p_tyranids[i]=4)) and (p_population[i]>0){ + if (p_tyranids[i] > 3 && planet_feature_bool(p_feature[i], P_features.Gene_Stealer_Cult) && obj_controller.turn > 120){ if (!(has_problem_planet(i, "Hive Fleet"))){ - var roll=irandom_range(100,300); + var roll=irandom_range(0,300); var cont=0; if (p_tyranids[i]=3) and (roll<=5) then cont=1; if (p_tyranids[i]=4) and (roll<=8) then cont=1; - var firstest=open_problem_slot(i); - if (cont=1 && firstest>-1){ - - p_problem[i][firstest]="Hive Fleet"; - p_timer[i][firstest]=irandom_range(60,120)+1; - p_timer[i][firstest]+=irandom_range(80,120)+1; - // p_timer[i][firstest]=floor(random_range(3,6))+1; - // show_message("Hive Fleet Destination: "+string(name)+"#ETA: "+string(p_timer[i][firstest])); - - - var fleet, xx, yy; - xx=random_range(room_width*1.25,room_width*2); - xx=choose(xx*-1,xx); - xx=x+xx; - yy=random_range(room_height*1.25,room_height*2); - yy=choose(yy*-1,yy); - yy=y+yy; - fleet=instance_create(xx,yy,obj_en_fleet); - fleet.owner = eFACTION.Tyranids; - fleet.sprite_index=spr_fleet_tyranid; - fleet.image_speed=0; - - fleet.capital_number=choose(7,8,9); - fleet.frigate_number=round(random_range(6,12)); - fleet.escort_number=round(random_range(12,27)); - - /*fleet.capital_number=choose(5,6); - fleet.frigate_number=round(random_range(4,8)); - fleet.escort_number=round(random_range(8,18));*/ - - fleet.image_index=floor((fleet.capital_number)+(fleet.frigate_number/2)+(fleet.escort_number/4)); - fleet.image_alpha=0; - - fleet.action_x=x; - fleet.action_y=y; - - fleet.action_eta=p_timer[i][firstest]; - fleet.action="move"; + if (cont = 1 && firstest > -1){ + var _capitals = choose(7,8,9); + var _frigates = irandom_range(6,12); + var _escorts = irandom_range(12,27); + var _fleet = summon_new_hive_fleet(_capitals, _frigates, _escorts); + add_new_problem(i, "Hive Fleet", _fleet.eta, self, {}); } - - } } - - if (has_problem_planet_and_time(i,"Hive Fleet", 3)>-1){ - var woop=scr_role_count("Chief "+string(obj_ini.role[100,17]),""); - - var o,yep,yep2;o=0;yep=true;yep2=false; - if (scr_has_disadv("Psyker Intolerant")) then yep=false; - - if (obj_controller.known[eFACTION.Tyranids]=0) and (woop!=0) and (yep!=false){ - scr_popup("Shadow in the Warp",$"Chief {obj_ini.role[100,17]} "+string(obj_ini.name[0,5])+" reports a disturbance in the warp. He claims it is like a shadow.","shadow",""); - scr_event_log("red",$"Chief {obj_ini.role[100,17]} reports a disturbance in the warp. He claims it is like a shadow."); - } - if (obj_controller.known[eFACTION.Tyranids]=0) and (woop=0) and (yep!=false){ - var q=0,q2=0; - repeat(90){ - if (q2=0){q+=1; - if (obj_ini.role[0,q]==obj_ini.role[100][eROLE.ChapterMaster]){q2=q; - if (string_count("0",obj_ini.spe[0,q2])>0) then yep2=true; - } - } - } - if (yep2=true){ - scr_popup("Shadow in the Warp","You are distracted and bothered by a nagging sensation in the warp. It feels as though a shadow descends upon your sector.","shadow",""); - scr_event_log("red","You sense a disturbance in the warp. It feels something like a massive shadow."); - } - } - - - - g=50; - i=50; - obj_controller.known[eFACTION.Tyranids]=1; - } + hive_fleet_arrives_from_out_of_system(); } @@ -346,11 +281,12 @@ function scr_enemy_ai_d() { } } - - // Colonists Colonize - - with(obj_star){if (x<-10000){x+=20000;y+=20000;}} - with(obj_star){if (x<-10000){x+=20000;y+=20000;}} + with(obj_star){ + if (x<-10000){ + x+=20000; + y+=20000; + } + } var already_enroute = false; var cur_star = id; diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index e02bfd0559..d7ddf38d4c 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -42,6 +42,7 @@ function tyranid_fleet_planet_action(){ if (p_influence[i][eFACTION.Tyranids]>50){ var alert = $"The Genestealer Cult on {planet_numeral_name(i)} is exceedingly thorough, there is almost no resistance as the swarm descends and what little resistance remains is quickly quelled by infiltrators, most of the populations willingly offer themselves to their new gods jumping into acid vats to form biomass for their newly arrived gods or otherwise allowing themselves to be devoured by the teaming ripper swarms"; scr_popup("Tyranids",alert,"",""); + p_pdf[i] = 0; scr_alert("red","owner",$"Tyranid swarms begin the process of stripping {planet_numeral_name(i)} for biomass",x,y); } else { scr_alert("red","owner",$"The pdf of {planet_numeral_name(i)} is badly degraded by genestealer cult forces as the hive fleet decends",x,y); @@ -56,7 +57,7 @@ function tyranid_fleet_planet_action(){ organise_tyranid_fleet_bio(); } -function summon_new_hive_fleet(){ +function summon_new_hive_fleet(capitals = 5,frigates = 0, escorts = 0, biomass = 1000){ var start_coords = find_nearest_edge_coords(x,y); if (start_coords[0] != 0 && start_coords[0]!= room_width){ @@ -78,18 +79,66 @@ function summon_new_hive_fleet(){ } } - fleet=instance_create(start_coords[0],start_coords[1],obj_en_fleet); - fleet.action_x=x; - fleet.action_y=y; - with (fleet){ + var _fleet=new_tyranid_fleet(start_coords[0],start_coords[1], capitals, frigates, escorts, biomass); + _fleet.action_x = x; + _fleet.action_y = y; + set_fleet_movement(); + return _fleet +} + +function hive_fleet_arrives_from_out_of_system(){ + if (has_problem_planet_and_time(i,"Hive Fleet", 3)>-1){ + var _chief_lib=scr_role_count("Chief "+string(obj_ini.role[100,17]),,"units"); + var _has_chief_lib = array_length(_chief_lib); + if (_has_chief_lib){ + _chief_lib = _chief_lib[0]; + } + + var _master_psy = false; + + var _intolerant = scr_has_disadv("Psyker Intolerant"); + + if (obj_controller.known[eFACTION.Tyranids]=0 && _has_chief_lib && !_intolerant){ + scr_popup("Shadow in the Warp",$"Chief {_chief_lib.name_role()} reports a disturbance in the warp. He claims it is like a shadow.","shadow",""); + scr_event_log("red",$"Chief {_chief_lib.name_role()} reports a disturbance in the warp. He claims it is like a shadow."); + } + if (!obj_controller.known[eFACTION.Tyranids] && !_has_chief_lib && !_intolerant){ + var q=0,q2=0; + repeat(90){ + if (q2=0){ + q+=1; + if (obj_ini.role[0,q]==obj_ini.role[100][eROLE.ChapterMaster]){q2=q; + if (string_count("0",obj_ini.spe[0,q2])>0) then _master_psy=true; + } + } + } + if (_master_psy=true){ + scr_popup("Shadow in the Warp","You are distracted and bothered by a nagging sensation in the warp. It feels as though a shadow descends upon your sector.","shadow",""); + scr_event_log("red","You sense a disturbance in the warp. It feels something like a massive shadow."); + } + } + + g=50; + i=50; + obj_controller.known[eFACTION.Tyranids]=1; + } +} + +function new_tyranid_fleet(xx, yy, capitals = 5,frigates = 0, escorts = 0, fleet_biomass = 1000){ + var _fleet = instance_create(xx, yy,obj_en_fleet); + var _mass = fleet_biomass + with (_fleet){ owner = eFACTION.Tyranids; - sprite_index=spr_fleet_tyranid; - image_index=1; - capital_number=5; - action=""; + sprite_index = spr_fleet_tyranid; + image_index = 1; + capital_number = capitals; + frigate_number = frigates; + escort_number = escorts; + action = ""; action_spd = 10; - set_fleet_movement(); - } + biomass = _mass; + } + return _fleet; } function star_biomass_value(star){ @@ -113,35 +162,35 @@ function star_biomass_value(star){ } function sort_planets_by_biomass_potential(){ - var _stars = scr_get_stars(); - var _star_count = array_length(_stars); + var _stars = scr_get_stars(); + var _star_count = array_length(_stars); - var _bio_vals = {}; - for (var i=0;i<_star_count;i++){ - var _star = _stars[i]; - _bio_vals[$ _star.name] = star_biomass_value(star); - } + var _bio_vals = {}; + for (var i = 0; i < _star_count; i++){ + var _star = _stars[i]; + _bio_vals[$ _star.name] = star_biomass_value(_star); + } - for (var i=0;i<_star_count;i++){ - var _swaps = false - for (var s=0;s<_star_count;s++){ - var _star = _stars[s]; - var _star2 = _stars[s + 1]; - var _bio = _bio_vals[$ _star.name]; - var _bio2 = _bio_vals[$ _star2.name] - if (_bio2>_bio){ - var _temp = _star; - _stars[s] = _star2; - _stars[s + 1] = _temp; - _swaps = true; - } - } - if (!true){ - break; - } - } + for (var i = 0; i < _star_count; i++){ + var _swaps = false; + for (var s = 0; s < _star_count - 1; s++){ + var _star = _stars[s]; + var _star2 = _stars[s + 1]; + var _bio = _bio_vals[$ _star.name]; + var _bio2 = _bio_vals[$ _star2.name]; + if (_bio2 > _bio){ + var _temp = _star; + _stars[s] = _star2; + _stars[s + 1] = _temp; + _swaps = true; + } + } + if (!_swaps){ + break; + } + } - return _stars; + return _stars; } function organise_tyranid_fleet_bio(){ @@ -253,7 +302,10 @@ function set_nid_ships(){ turrets=3; capacity=0; carrying=0; - add_weapon_to_ship("Feeder Tendrils" , {dam : 12, range :160}); + add_weapon_to_ship("Feeder Tendrils" , { + dam : 12, + range :160 + }); add_weapon_to_ship("Bio-Plasma Discharge" , { dam : 10, range : 260, diff --git a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml index e4fd09b13c..f93bb9ed90 100644 --- a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml +++ b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml @@ -4,7 +4,7 @@ function tyranids_planet_biomass_extraction(){ for (var planet=1;planet=5) and (planets>=planet) and (p_player[planet]+p_orks[planet]+p_guardsmen[planet]+p_pdf[planet]+p_chaos[planet]=0){ var ship=scr_orbiting_fleet(eFACTION.Tyranids); - if (ship!="none") and (p_type[planet]!="Dead") and (array_length(p_feature[planet])!=0 && ship.capital_number){ + if (ship!="none" && p_type[planet]!="Dead" && ship.capital_number){ if (planet_feature_bool(p_feature[planet], P_features.Reclamation_pools) ==1){ p_tyranids[planet]=0; if (p_type[planet]="Death") or (p_type[planet]="Hive") then ship.capital_number+=choose(0,1,1); @@ -23,7 +23,7 @@ function tyranids_planet_biomass_extraction(){ } if (planet_feature_bool(p_feature[planet], P_features.Capillary_Towers)==1) and (p_type[planet]!="Dead"){ p_feature[planet]=[]; - array_push(p_feature[planet], new NewPlanetFeature(P_features.Capillary_Towers), new NewPlanetFeature(P_features.Reclamation_pools)); + array_push(p_feature[planet], new NewPlanetFeature(P_features.Reclamation_pools)); p_population[planet]=0;// show_message("C"); } if (planet_feature_bool(p_feature[planet], P_features.Capillary_Towers)==0) and (planet_feature_bool(p_feature[planet], P_features.Reclamation_pools)==0) and (p_type[planet]!="Dead"){ @@ -35,6 +35,13 @@ function tyranids_planet_biomass_extraction(){ } } +function deploy_reclamation_pools(planet){ + if (p_pdf[planet] <= 0){ + new NewPlanetFeature(P_features.Reclamation_pools); + array_push(p_feature[planet], ) + } +} + function genestealer_cult_end_turn_growth(planet){ From 8aa31c407193564675b253229ad35487681c2d91 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 7 May 2025 16:30:02 +0100 Subject: [PATCH 042/155] further expand biomass concpet --- objects/obj_en_fleet/Alarm_1.gml | 2 +- objects/obj_en_fleet/Alarm_4.gml | 19 +- objects/obj_fleet_select/Draw_0.gml | 12 +- objects/obj_p_fleet/Alarm_4.gml | 8 +- scripts/scr_crusade/scr_crusade.gml | 2 +- .../scr_draw_planet_features.gml | 2 +- scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml | 2 +- .../scr_fleet_functions.gml | 22 +-- .../scr_khornate_fleet_functions.gml | 2 +- .../scr_ork_planet_functions.gml | 2 +- .../scr_planetary_feature.gml | 60 +++--- .../scr_star_travel_algorithm.gml | 16 +- .../scr_tyranid_fleet_functions.gml | 186 +++++++++--------- .../scr_tyranid_planet_functions.gml | 16 +- 14 files changed, 175 insertions(+), 176 deletions(-) diff --git a/objects/obj_en_fleet/Alarm_1.gml b/objects/obj_en_fleet/Alarm_1.gml index 24e1b427ae..1b33e9cc6d 100644 --- a/objects/obj_en_fleet/Alarm_1.gml +++ b/objects/obj_en_fleet/Alarm_1.gml @@ -189,7 +189,7 @@ if (navy && action=="") { var chase_fleet = get_nearest_player_fleet(x,y, false, true); if (chase_fleet!="none"){ var thatp,my_dis; - etah=chase_fleet.eta; + etah=chase_fleet.action_eta; var intercept = fleet_intercept_time_calculate(chase_fleet); if (intercept){ diff --git a/objects/obj_en_fleet/Alarm_4.gml b/objects/obj_en_fleet/Alarm_4.gml index 5e07d20081..172a947d23 100644 --- a/objects/obj_en_fleet/Alarm_4.gml +++ b/objects/obj_en_fleet/Alarm_4.gml @@ -11,10 +11,13 @@ if (action!=""){ mine=instance_nearest(x,y,obj_star); if (mine.x=sys.x2) and (mine.y=sys.y2) then connected=1; - var eta;eta=0; - eta=floor(point_distance(x,y,action_x,action_y)/action_spd)+1; - if (connected=0) then eta=eta*2; - if (connected=1) then connected=1; + var _eta=0; + _eta=floor(point_distance(x,y,action_x,action_y)/action_spd)+1; + if (connected=0){ + _eta=_eta*2; + } else { + connected=1; + } if (owner=eFACTION.Inquisition) and (action_eta<2) then action_eta=2; // action_x=sys.x; @@ -62,7 +65,7 @@ if (action==""){ if (cont=20){// Move the entire fleet, don't worry about the other crap turns_static = 0; - var eta=0; + var _eta=0; if (trade_goods!="") and (owner != eFACTION.Tyranids) and (owner != eFACTION.Chaos) and (string_count("Inqis",trade_goods)=0) and (string_count("merge",trade_goods)=0)and (string_count("_her",trade_goods)=0) and (trade_goods!="cancel_inspection") and (trade_goods!="return"){ if (scr_valid_fleet_target(target)){ @@ -78,12 +81,12 @@ if (action==""){ } } - eta=floor(point_distance(x,y,action_x,action_y)/action_spd)+1; - if (connected=0) then eta=eta*2; + _eta=floor(point_distance(x,y,action_x,action_y)/action_spd)+1; + if (connected=0) then _eta=_eta*2; if (connected=1) then connected=1; if (action_eta<=0) or (owner != eFACTION.Inquisition){ - action_eta=eta; + action_eta=_eta; if (owner = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0) then action_eta=2; } diff --git a/objects/obj_fleet_select/Draw_0.gml b/objects/obj_fleet_select/Draw_0.gml index 4dfc540e23..94d0cbe14c 100644 --- a/objects/obj_fleet_select/Draw_0.gml +++ b/objects/obj_fleet_select/Draw_0.gml @@ -101,14 +101,14 @@ if (owner == eFACTION.Player) and (player_fleet.action==""){ draw_line_dashed(x,y,sys.x,sys.y,16,scale); draw_set_font(fnt_40k_14b); - var eta=0; + var _eta=0; - eta = calculate_fleet_eta(mine.x,mine.y,sys.x,sys.y, selection_travel_speed, ,,player_fleet.warp_able); + _eta = calculate_fleet_eta(mine.x,mine.y,sys.x,sys.y, selection_travel_speed, ,,player_fleet.warp_able); - if (sys.storm>0) or (instance_nearest(x,y,obj_star).storm>0) then eta="N/A"; + if (sys.storm>0) or (instance_nearest(x,y,obj_star).storm>0) then _eta="N/A"; draw_set_font(fnt_40k_14b); - eta = "ETA "+string(eta) + "#Press SHIFT to ignore way points"; + _eta = "ETA "+string(_eta) + "#Press SHIFT to ignore way points"; var speed_string = ""; var viable=true; var types = [0,0,0]; @@ -125,9 +125,9 @@ if (owner == eFACTION.Player) and (player_fleet.action==""){ } } } - eta+=speed_string; + _eta+=speed_string; - draw_text_transformed(sys.x+17,sys.y,string_hash_to_newline(eta),scale,scale,0); + draw_text_transformed(sys.x+17,sys.y,string_hash_to_newline(_eta),scale,scale,0); if (mouse_check_button(mb_right) && viable){ var ship_count = player_fleet_ship_count(player_fleet); var fleet_selected = player_fleet_selected_count(player_fleet); diff --git a/objects/obj_p_fleet/Alarm_4.gml b/objects/obj_p_fleet/Alarm_4.gml index 203fe9e104..0bbc544ea1 100644 --- a/objects/obj_p_fleet/Alarm_4.gml +++ b/objects/obj_p_fleet/Alarm_4.gml @@ -3,11 +3,11 @@ var sys_dist, mine, connected, fleet, cont; sys_dist=9999;connected=0;cont=0; -var eta=calculate_fleet_eta(x,y, action_x,action_y,action_spd, false, false,warp_able); -// if (connected=0) then eta=eta*2; +var _eta=calculate_fleet_eta(x,y, action_x,action_y,action_spd, false, false,warp_able); +// if (connected=0) then _eta=_eta*2; // if (connected=1) then connected=1; -// if (web=1) then eta=1; -action_eta=eta; +// if (web=1) then _eta=1; +action_eta=_eta; // if (action="crusade2") then action="crusade3"; diff --git a/scripts/scr_crusade/scr_crusade.gml b/scripts/scr_crusade/scr_crusade.gml index 8de63b4609..767a27c901 100644 --- a/scripts/scr_crusade/scr_crusade.gml +++ b/scripts/scr_crusade/scr_crusade.gml @@ -177,7 +177,7 @@ function launch_crusade(){ } var travel_leeway = 10; if (_nearest_player_fleet.action == "move"){ - travel_leeway += _nearest_player_fleet.eta; + travel_leeway += _nearest_player_fleet.action_eta; } var _eta = get_viable_travel_time(travel_leeway, _nearest_player_fleet.x, _nearest_player_fleet.y, star_id.x,star_id.y, _nearest_player_fleet,false) scr_popup("Crusade",$"Fellow Astartes legions are preparing to embark on a Crusade to a nearby sector. Your forces are expected at {star_id.name}; {_eta} months from now your ships there shall begin their journey.","crusade",""); diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index 58976c7a53..83fdd070c3 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -154,7 +154,7 @@ function FeatureSelected(Feature, system, planet) constructor{ } body = $"The Cult of {feature.name} {control_string}"; break; - case P_features.Victory_Shrine: + case P_features.VictoryShrine: draw_text_transformed(xx+(area_width/2), yy +10, "Victory Shrine", 2, 2, 0); draw_set_halign(fa_left); draw_set_color(c_gray); diff --git a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml index 37e4afbbd8..a9806b6fd3 100644 --- a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml +++ b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml @@ -257,7 +257,7 @@ function scr_enemy_ai_d() { var _frigates = irandom_range(6,12); var _escorts = irandom_range(12,27); var _fleet = summon_new_hive_fleet(_capitals, _frigates, _escorts); - add_new_problem(i, "Hive Fleet", _fleet.eta, self, {}); + add_new_problem(i, "Hive Fleet", _fleet.action_eta, self, {}); } } diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index 808340945b..3427fe943c 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -176,10 +176,10 @@ function set_fleet_movement(fastest_route = true, new_action="move"){ mine=instance_nearest(x,y,obj_star); - var eta = calculate_fleet_eta(x,y,action_x,action_y,action_spd,_target_is_sys,is_orbiting(),warp_able); - action_eta = eta; + var _eta = calculate_fleet_eta(x,y,action_x,action_y,action_spd,_target_is_sys,is_orbiting(),warp_able); + action_eta = _eta; if (action_eta<=0) or (owner != eFACTION.Inquisition){ - action_eta=eta; + action_eta=_eta; if (owner = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0) then action_eta=2; } @@ -216,7 +216,7 @@ function load_unit_to_fleet(fleet, unit){ } function calculate_fleet_eta(xx,yy,xxx,yyy, fleet_speed,star1=true, star2=true,warp_able=false){ var warp_lane = false; - eta = 0; + _eta = 0; //Some duke unfinished webway stuff copied here for reference /*for (var w = 1;w<5;w++){ if (planet_feature_bool(mine.p_feature[w], P_features.Webway)==1) then web1=1; @@ -229,21 +229,21 @@ function calculate_fleet_eta(xx,yy,xxx,yyy, fleet_speed,star1=true, star2=true,w } else if (star1){ star1 = instance_nearest(xx,yy, obj_star); } - eta=floor(point_distance(xx,yy,xxx,yyy)/fleet_speed)+1; - if (!warp_lane) then eta*=2; - if (warp_lane && warp_able) then eta = ceil(eta/warp_lane); - if (!star2) then return eta; + _eta=floor(point_distance(xx,yy,xxx,yyy)/fleet_speed)+1; + if (!warp_lane) then _eta*=2; + if (warp_lane && warp_able) then _eta = ceil(_eta/warp_lane); + if (!star2) then return _eta; //check end location for warp storm if (instance_exists(star2)){ if(star2.object_index == obj_star) { if (star2.storm){ - eta += 10000; + _eta += 10000; } } } - return eta; + return _eta; } @@ -915,7 +915,7 @@ function fleet_arrival_logic(){ } - exit;// end of eta=0 + exit;// end of _eta=0 } function choose_fleet_sprite_image(){ diff --git a/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml b/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml index 7336e8db71..07f84a430a 100644 --- a/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml +++ b/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml @@ -157,7 +157,7 @@ function khorne_fleet_cargo(){ if (chase_fleet != "none") and (action == "") { var intercept_time = fleet_intercept_time_calculate(chase_fleet); if (chase_fleet.action!=""){ - if (intercept_time<=chase_fleet.eta){ + if (intercept_time<=chase_fleet._eta){ target = chase_fleet; chase_fleet_target_set(); target_chosen=true; diff --git a/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml b/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml index 4c03940d98..65d93f0163 100644 --- a/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml +++ b/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml @@ -80,7 +80,7 @@ function ork_ship_production(planet){ } function kill_warboss(){ - f_type = P_features.Victory_Shrine + f_type = P_features.VictoryShrine planet_display= $"{obj_controller.faction_leader[eFACTION.Ork]} Death Place"; Warboss = "dead"; parade = false; diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 46bb6b3da6..c10d0c9852 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -1,34 +1,34 @@ enum P_features { - Sororitas_Cathedral, - Necron_Tomb, - Artifact, - STC_Fragment, - Ancient_Ruins, - Cave_Network, - Recruiting_World, - Monastery, - Warlord6, - OrkWarboss, - Warlord10, - Special_Force, - World_Eaters, - Webway, - Secret_Base, - Starship, - Succession_War, - Mechanicus_Forge, - Reclamation_pools, - Capillary_Towers, - Daemonic_Incursion, - Victory_Shrine, - Arsenal, - Gene_Vault, - Forge, - Gene_Stealer_Cult, - Mission, - OrkStronghold - - }; + Sororitas_Cathedral, + Necron_Tomb, + Artifact, + STC_Fragment, + Ancient_Ruins, + Cave_Network, + Recruiting_World, + Monastery, + Warlord6, + OrkWarboss, + Warlord10, + Special_Force, + World_Eaters, + Webway, + Secret_Base, + Starship, + Succession_War, + Mechanicus_Forge, + Reclamationpools, + CapillaryTowers, + Daemonic_Incursion, + VictoryShrine, + Arsenal, + Gene_Vault, + Forge, + Gene_Stealer_Cult, + Mission, + OrkStronghold, + ShipDock +}; enum base_type{ Lair, diff --git a/scripts/scr_star_travel_algorithm/scr_star_travel_algorithm.gml b/scripts/scr_star_travel_algorithm/scr_star_travel_algorithm.gml index b50dd523f9..244deb9e3f 100644 --- a/scripts/scr_star_travel_algorithm/scr_star_travel_algorithm.gml +++ b/scripts/scr_star_travel_algorithm/scr_star_travel_algorithm.gml @@ -26,17 +26,17 @@ function FastestRouteAlgorithm(start_x,start_y, xx,yy,fleet, start_from_star=fal function find_star_travel_distances(cur_star_id){ var current_star = unvisited_stars[cur_star_id][0]; var cur_travel = unvisited_stars[cur_star_id][1]; - var eta; + var _eta; var warp_lane = false; for (var s=cur_star_id+1; sworst_case){ + if (_eta>worst_case){ visit_data[3] = true; } }*/ @@ -74,9 +74,9 @@ function FastestRouteAlgorithm(start_x,start_y, xx,yy,fleet, start_from_star=fal cur_star = final_route_info[2][i]; } draw_line_dashed(cur_star.x,cur_star.y,final_route_info[0].x,final_route_info[0].y,16,0.5); - var eta = $"ETA {final_route_info[1]+1}"; + var _eta = $"ETA {final_route_info[1]+1}"; var zoom_size = obj_controller.zoomed?5:1; - draw_text_transformed(cur_star.x+24,cur_star.y+40,eta,zoom_size,zoom_size,0); + draw_text_transformed(cur_star.x+24,cur_star.y+40,_eta,zoom_size,zoom_size,0); } static final_array_path = function(){ diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index d7ddf38d4c..0ef67de9bf 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -137,28 +137,38 @@ function new_tyranid_fleet(xx, yy, capitals = 5,frigates = 0, escorts = 0, fleet action = ""; action_spd = 10; biomass = _mass; + warp_able = false; } return _fleet; } -function star_biomass_value(star){ +function star_biomass_value(star, fleet=false){ var _bio_val = 0; - for (var i=0;i 300){ + capital_number++; + biomass -= 100; + } if (capital_number*2>frigate_number){ - capital_number-=1; - frigate_number+=2; - } - - if (capital_number*4>escort_number){ - var rand=choose(1,2,3,4); - if (rand=4) then escort_number+=1; - } - - - - if (capital_number>0){ - var capitals_engaged=0; - var caps = capital_number; - with (orbiting){ - for (var i=1;iescort_number){ + var rand=choose(1,2,3,4); + if (rand=4) then escort_number+=1; + } + + + + if (capital_number>0){ + var capitals_engaged=0; + var caps = capital_number; + var _planets = []; + for (var i=1;i<=array_length(orbiting.planets);i++){ + array_push(_planets, i); } - - - - var _is_dead=false; + _planets = array_shuffle(_planets); + for (var i=0;i 0 || orbiting.p_guardsmen[_planet]) + } with (orbiting){ - _is_dead = is_dead_star(); + for (var i=1;i5){ - _split_fleet=true; - } - - - repeat(100){ - if (good!=5){ - xx=self.x+random_range(-300,300); - yy=self.y+random_range(-300,300); - if (good=0) then plin=instance_nearest(xx,yy,obj_star); - if (good=1) and (_is_dead=5) then plin2=instance_nearest(xx,yy,obj_star); - - good = !array_contains(plin.p_type, "dead"); + var _is_dead=false; + with (orbiting){ + _is_dead = is_dead_star(); + } + + if (_is_dead){ - if (good=1) and (_is_dead=5){ - if (!instance_exists(plin2)) then break; - if (!array_contains(plin.p_type, "dead")) then good++ - - var new_fleet; - new_fleet=instance_create(x,y,obj_en_fleet); - new_fleet.capital_number=floor(capital_number*0.4); - new_fleet.frigate_number=floor(frigate_number*0.4); - new_fleet.escort_number=floor(escort_number*0.4); - - capital_number-=new_fleet.capital_number; - frigate_number-=new_fleet.frigate_number; - escort_number-=new_fleet.escort_number; - - new_fleet.owner=eFACTION.Tyranids; - new_fleet.sprite_index=spr_fleet_tyranid; - new_fleet.image_index=1; - - /*with(new_fleet){ - var ii;ii=0;ii+=capital_number;ii+=round((frigate_number/2));ii+=round((escort_number/4)); - if (ii<=1) then ii=1;image_index=ii; - }*/ - - new_fleet.action_x=plin2.x; - new_fleet.action_y=plin2.y; - with (new_fleet){ - set_fleet_movement(); - } - break; - } - - - if (good=1) and (instance_exists(plin)){action_x=plin.x;action_y=plin.y;alarm[4]=1;if (_is_dead!=5) then good=5;} - } - } - instance_activate_object(obj_star); + var xx=0,yy=0,good=0,plin=0,plin2=0; + var _split_fleet = false; + if (bio_mass > 1000){ + _split_fleet=true; + } + + if (split_fleet){ + split_off_new_nid_splinter(); } } +} function set_nid_ships(){ diff --git a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml index f93bb9ed90..92402089aa 100644 --- a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml +++ b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml @@ -5,29 +5,29 @@ function tyranids_planet_biomass_extraction(){ if (p_tyranids[planet]>=5) and (planets>=planet) and (p_player[planet]+p_orks[planet]+p_guardsmen[planet]+p_pdf[planet]+p_chaos[planet]=0){ var ship=scr_orbiting_fleet(eFACTION.Tyranids); if (ship!="none" && p_type[planet]!="Dead" && ship.capital_number){ - if (planet_feature_bool(p_feature[planet], P_features.Reclamation_pools) ==1){ + if (planet_feature_bool(p_feature[planet], P_features.Reclamationpools) ==1){ p_tyranids[planet]=0; if (p_type[planet]="Death") or (p_type[planet]="Hive") then ship.capital_number+=choose(0,1,1); ship.capital_number+=1; ship.escort_number+=3; ship.image_index=floor((ship.capital_number)+(ship.frigate_number/2)+(ship.escort_number/4)); p_type[planet]="Dead"; - delete_features(p_feature[planet], P_features.Reclamation_pools);// show_message("D"); + delete_features(p_feature[planet], P_features.Reclamationpools);// show_message("D"); if (is_dead_star()) then image_alpha=0.33; // if image_alpha = 0.33 then send the ship somewhere new } - if (planet_feature_bool(p_feature[planet], P_features.Capillary_Towers)==1) and (p_type[planet]!="Dead"){ + if (planet_feature_bool(p_feature[planet], P_features.CapillaryTowers)==1) and (p_type[planet]!="Dead"){ p_population[planet]=floor(p_population[planet]*0.3); } - if (planet_feature_bool(p_feature[planet], P_features.Capillary_Towers)==1) and (p_type[planet]!="Dead"){ + if (planet_feature_bool(p_feature[planet], P_features.CapillaryTowers)==1) and (p_type[planet]!="Dead"){ p_feature[planet]=[]; - array_push(p_feature[planet], new NewPlanetFeature(P_features.Reclamation_pools)); + array_push(p_feature[planet], new NewPlanetFeature(P_features.Reclamationpools)); p_population[planet]=0;// show_message("C"); } - if (planet_feature_bool(p_feature[planet], P_features.Capillary_Towers)==0) and (planet_feature_bool(p_feature[planet], P_features.Reclamation_pools)==0) and (p_type[planet]!="Dead"){ - array_push(p_feature[planet], new NewPlanetFeature(P_features.Capillary_Towers));// show_message("B"); + if (planet_feature_bool(p_feature[planet], P_features.CapillaryTowers)==0) and (planet_feature_bool(p_feature[planet], P_features.Reclamationpools)==0) and (p_type[planet]!="Dead"){ + array_push(p_feature[planet], new NewPlanetFeature(P_features.CapillaryTowers));// show_message("B"); } } @@ -37,7 +37,7 @@ function tyranids_planet_biomass_extraction(){ function deploy_reclamation_pools(planet){ if (p_pdf[planet] <= 0){ - new NewPlanetFeature(P_features.Reclamation_pools); + new NewPlanetFeature(P_features.Reclamationpools); array_push(p_feature[planet], ) } } From 02b4ef149c69b639bd0a2b50f176dbe8bbcd86e1 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 7 May 2025 22:05:15 +0100 Subject: [PATCH 043/155] mass explosions in fleet combat --- objects/obj_al_in/Step_0.gml | 1 + objects/obj_al_round/Create_0.gml | 3 +- objects/obj_en_in/Step_0.gml | 9 ++++-- .../obj_en_round/Collision_obj_al_ship.gml | 4 +-- objects/obj_en_round/Collision_obj_p_ship.gml | 4 +-- objects/obj_en_round/Create_0.gml | 1 + objects/obj_en_round/Step_0.gml | 10 +++++-- objects/obj_en_ship/Step_0.gml | 6 +++- objects/obj_fleet/Create_0.gml | 11 ++++++-- objects/obj_fleet/Draw_0.gml | 8 ++++++ objects/obj_fleet/Step_0.gml | 1 + objects/obj_fleet/obj_fleet.yy | 1 + objects/obj_p_round/Collision_obj_en_ship.gml | 4 +-- objects/obj_p_round/Create_0.gml | 1 + objects/obj_p_round/Step_0.gml | 6 +++- objects/obj_p_ship/Step_0.gml | 1 + objects/obj_p_th/Step_0.gml | 8 ++++-- .../__global_object_depths.gml | 2 +- .../scr_ship_weapon_struct.gml | 25 ++++++++++++++--- .../scr_system_search_helpers.gml | 20 +++++++++++++ .../scr_tyranid_fleet_functions.gml | 28 ++++++++++++------- .../spr_mk7_gladiator_chest.yy | 2 ++ sprites/spr_ship_glad/spr_ship_glad.yy | 7 ++--- 23 files changed, 123 insertions(+), 40 deletions(-) diff --git a/objects/obj_al_in/Step_0.gml b/objects/obj_al_in/Step_0.gml index ea44b7dc0a..c8a68ed0e9 100644 --- a/objects/obj_al_in/Step_0.gml +++ b/objects/obj_al_in/Step_0.gml @@ -36,6 +36,7 @@ if (instance_exists(target)) { bull.image_xscale = 0.5; bull.image_yscale = 0.5; bull.dam = 3; + bull.explosion_sprite = spr_explosion; if (owner == 7) then bull.dam = 2; } } else if (!instance_exists(target)) or (target.x <= -4000) { diff --git a/objects/obj_al_round/Create_0.gml b/objects/obj_al_round/Create_0.gml index 67d9ddee3c..d4ed7544cc 100644 --- a/objects/obj_al_round/Create_0.gml +++ b/objects/obj_al_round/Create_0.gml @@ -1,2 +1,3 @@ dam = 0; -image_angle=direction; \ No newline at end of file +image_angle=direction; +explosion_sprite = spr_explosion; \ No newline at end of file diff --git a/objects/obj_en_in/Step_0.gml b/objects/obj_en_in/Step_0.gml index 9acf05eee8..f34332aebf 100644 --- a/objects/obj_en_in/Step_0.gml +++ b/objects/obj_en_in/Step_0.gml @@ -21,12 +21,17 @@ if (instance_exists(target)){ if (action="bank") and (dist>300) then action="close"; if (action="shoot") and (cooldown1<=0){ - var bull;cooldown1=30;if (owner = eFACTION.Tau) then cooldown1=20; + var bull; + cooldown1=30; + if (owner = eFACTION.Tau) then cooldown1=20; bull=instance_create(x,y,obj_en_round);bull.direction=self.direction; if (owner = eFACTION.Tau) or (owner = eFACTION.Eldar) then bull.sprite_index=spr_pulse; if (owner = eFACTION.Tyranids) then bull.sprite_index=spr_glob; - bull.speed=20;bull.image_xscale=0.5;bull.image_yscale=0.5;bull.dam=3; + bull.speed=20; + bull.image_xscale=0.5; + bull.image_yscale=0.5;bull.dam=3; if (owner = eFACTION.Ork) then bull.dam=2; + bull.explosion_sprite = spr_explosion; } } diff --git a/objects/obj_en_round/Collision_obj_al_ship.gml b/objects/obj_en_round/Collision_obj_al_ship.gml index a07e8ce3c9..521eef49e5 100644 --- a/objects/obj_en_round/Collision_obj_al_ship.gml +++ b/objects/obj_en_round/Collision_obj_al_ship.gml @@ -13,9 +13,7 @@ if (armdam) and (other.shields>0) then other.shields-=0.5; if (arm>dam) and (other.shields<=0) then other.hp-=0.5; -if (sprite_index=spr_torpedo){ - instance_create(x,y,obj_explosion); -} +new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); instance_destroy(); diff --git a/objects/obj_en_round/Collision_obj_p_ship.gml b/objects/obj_en_round/Collision_obj_p_ship.gml index ca69454d04..7daa300ebc 100644 --- a/objects/obj_en_round/Collision_obj_p_ship.gml +++ b/objects/obj_en_round/Collision_obj_p_ship.gml @@ -19,9 +19,7 @@ if (armdam) and (other.shields>0) then other.shields-=1; if (arm>dam) and (other.shields<=0) then other.hp-=1; -if (sprite_index=spr_torpedo){ - instance_create(x,y,obj_explosion); -} +new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); instance_destroy(); diff --git a/objects/obj_en_round/Create_0.gml b/objects/obj_en_round/Create_0.gml index 8c524b1e31..a494bf6d3b 100644 --- a/objects/obj_en_round/Create_0.gml +++ b/objects/obj_en_round/Create_0.gml @@ -1,3 +1,4 @@ dam = 0; image_angle=direction; +explosion_sprite = spr_explosion; diff --git a/objects/obj_en_round/Step_0.gml b/objects/obj_en_round/Step_0.gml index ec58b7cc89..6a61b4d4a6 100644 --- a/objects/obj_en_round/Step_0.gml +++ b/objects/obj_en_round/Step_0.gml @@ -7,12 +7,18 @@ if (dam<=4){ if (instance_exists(obj_p_small)){ th=instance_nearest(x,y,obj_p_small); thd=point_distance(x,y,th.x,th.y); - if (thd<6){th.hp-=(self.dam-1);instance_destroy();} + if (thd<6){ + th.hp-=(self.dam-1); + new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); + } } if (instance_exists(obj_al_in)){ th=instance_nearest(x,y,obj_al_in); thd=point_distance(x,y,th.x,th.y); - if (thd<6){th.hp-=(self.dam-1);instance_destroy();} + if (thd<6){ + th.hp-=(self.dam-1); + new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); + } } } diff --git a/objects/obj_en_ship/Step_0.gml b/objects/obj_en_ship/Step_0.gml index ad279ecad1..2c569a85b9 100644 --- a/objects/obj_en_ship/Step_0.gml +++ b/objects/obj_en_ship/Step_0.gml @@ -146,7 +146,9 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (dist>64) and (dist<300){ bull=instance_create(x,y,obj_en_round); bull.direction=point_direction(x,y,targe.x,targe.y); - if (owner = eFACTION.Tyranids) then bull.sprite_index=spr_glob; + if (owner = eFACTION.Tyranids){ + bull.sprite_index=spr_glob; + } bull.speed=20; bull.dam=3; bull.image_xscale=0.5; @@ -156,6 +158,8 @@ if (hp>0) and (instance_exists(obj_p_ship)){ bull.image_yscale=1; } bull.direction+=choose(random(10),1*-(random(10))); + + bull.explosion_sprite = spr_explosion; } } diff --git a/objects/obj_fleet/Create_0.gml b/objects/obj_fleet/Create_0.gml index 68c77a33db..ce3043926e 100644 --- a/objects/obj_fleet/Create_0.gml +++ b/objects/obj_fleet/Create_0.gml @@ -3,12 +3,17 @@ instance_activate_object(obj_controller); log_message("Fleet Combat Started"); -beg=0;fallen=0;fallen_command=0; +beg=0;fallen=0; +fallen_command=0; obj_controller.cooldown=20; -sel_x1=0;sel_y1=0;control=0; +sel_x1=0; +sel_y1=0;control=0; ships_selected=0; battle_special=""; -csm_exp=0;star_name=""; +csm_exp=0; +star_name=""; + +explosions = []; // woohoo=0; left_down=0; diff --git a/objects/obj_fleet/Draw_0.gml b/objects/obj_fleet/Draw_0.gml index e69de29bb2..1ff322f92a 100644 --- a/objects/obj_fleet/Draw_0.gml +++ b/objects/obj_fleet/Draw_0.gml @@ -0,0 +1,8 @@ +draw_set_alpha(1); + +for (var i=array_length(explosions)-1; i>= 0;i--){ + if (explosions[i].draw() == -1){ + delete explosions[i]; + array_delete(explosions, i , 1); + } +} diff --git a/objects/obj_fleet/Step_0.gml b/objects/obj_fleet/Step_0.gml index 475e3f1b9f..b041587028 100644 --- a/objects/obj_fleet/Step_0.gml +++ b/objects/obj_fleet/Step_0.gml @@ -45,6 +45,7 @@ if (start=5){ las.direction=point_direction(las.x,las.y,player_lasers_target.x,player_lasers_target.y)+round(random_range(-4,4)); las.image_xscale=1.5;las.image_yscale=1.5;las.speed=30;las.dam=30; las.sprite_index=spr_ground_las;las.image_index=0;las.image_speed=0; + las.explosion_sprite = spr_explosion; } } diff --git a/objects/obj_fleet/obj_fleet.yy b/objects/obj_fleet/obj_fleet.yy index 1a782880de..72f731e5cf 100644 --- a/objects/obj_fleet/obj_fleet.yy +++ b/objects/obj_fleet/obj_fleet.yy @@ -18,6 +18,7 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":32,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":13,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"obj_fleet", diff --git a/objects/obj_p_round/Collision_obj_en_ship.gml b/objects/obj_p_round/Collision_obj_en_ship.gml index 59e9c01cf9..0ace281444 100644 --- a/objects/obj_p_round/Collision_obj_en_ship.gml +++ b/objects/obj_p_round/Collision_obj_en_ship.gml @@ -15,9 +15,7 @@ if (other.class!="Daemon") or (other.image_alpha>=1){ if (arm>dam) and (other.shields>0) then other.shields-=1; if (arm>dam) and (other.shields<=0) then other.hp-=1; - if (sprite_index=spr_torpedo){ - instance_create(x,y,obj_explosion); - } + new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); } diff --git a/objects/obj_p_round/Create_0.gml b/objects/obj_p_round/Create_0.gml index 8c524b1e31..a494bf6d3b 100644 --- a/objects/obj_p_round/Create_0.gml +++ b/objects/obj_p_round/Create_0.gml @@ -1,3 +1,4 @@ dam = 0; image_angle=direction; +explosion_sprite = spr_explosion; diff --git a/objects/obj_p_round/Step_0.gml b/objects/obj_p_round/Step_0.gml index cf6d346158..b000d404b2 100644 --- a/objects/obj_p_round/Step_0.gml +++ b/objects/obj_p_round/Step_0.gml @@ -7,7 +7,11 @@ if (dam<=4){ if (instance_exists(obj_en_in)){ th=instance_nearest(x,y,obj_en_in); thd=point_distance(x,y,th.x,th.y); - if (thd<6){th.hp-=(self.dam-1);instance_destroy();} + if (thd<6){ + th.hp-=(self.dam-1); + new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); + instance_destroy() + ;} } } diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index 72165d65a2..3069c68374 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -182,6 +182,7 @@ if (hp>0) and (instance_exists(target)){ bull.image_yscale=0.5; turret_cool=floor(60/turrets); bull.direction+=choose(random(3),1*-(random(3))); + bull.explosion_sprite = spr_explosion; } } ship_shoot_weapons(); diff --git a/objects/obj_p_th/Step_0.gml b/objects/obj_p_th/Step_0.gml index f09a7fa620..5be27e00c0 100644 --- a/objects/obj_p_th/Step_0.gml +++ b/objects/obj_p_th/Step_0.gml @@ -20,8 +20,12 @@ if (instance_exists(target)){ if (action="shoot") and (cooldown1<=0){ var bull;cooldown1=30; - bull=instance_create(x,y,obj_p_round);bull.direction=self.direction; - bull.speed=20;bull.image_xscale=0.5;bull.image_yscale=0.5;bull.dam=3; + bull=instance_create(x,y,obj_p_round); + bull.direction=self.direction; + bull.speed=20;bull.image_xscale=0.5; + bull.image_yscale=0.5; + bull.dam=3; + bull.explosion_sprite = spr_explosion; } diff --git a/scripts/__global_object_depths/__global_object_depths.gml b/scripts/__global_object_depths/__global_object_depths.gml index 288b2b6164..5a9abd60c6 100644 --- a/scripts/__global_object_depths/__global_object_depths.gml +++ b/scripts/__global_object_depths/__global_object_depths.gml @@ -8,7 +8,7 @@ function __global_object_depths() { // NOTE: MacroExpansion is used to insert the array initialisation at import time // insert the generated arrays here - global.__objectDepths[0] = -5000; // obj_fleet + global.__objectDepths[0] = -10000; // obj_fleet global.__objectDepths[1] = 0; // obj_circular global.__objectDepths[2] = -9999; // obj_fleet_spawner global.__objectDepths[3] = 8; // obj_fleet_controller diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index f3d97f514f..af03ce6bbe 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -16,9 +16,28 @@ global.ship_weapon_defualts = { melee : false, accuracy : 98, condition : "fuly_functional", + explosion_sprite : spr_explosion, bombard_value : 0 } +function ShipWeaponExplosion(explosion_sprite, x, y, scale = 1) constructor{ + self.x = x; + self.y = y; + self.scale = scale; + bang_sprite = explosion_sprite; + animation_frames = sprite_get_number(bang_sprite); + current_index = 0; + static draw = function(){ + draw_sprite_ext(bang_sprite,floor(current_index),x, y,1*scale,1*scale,0,c_white,1); + current_index += 0.1; + if (floor(current_index) > animation_frames){ + return -1; + } + return 1; + } + + array_push(obj_fleet.explosions, self); +} function ShipWeapon(weapon_name, overide_data={}) constructor{ if (struct_exists(global.ship_weapons_stats, weapon_name)){ @@ -70,6 +89,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ target_x:target.x, target_y:target.y, sprite_index : img, + explosion_sprite : explosion_sprite, } _bullet = instance_create_layer( @@ -131,7 +151,6 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ } static find_target = function(){ - show_debug_message("targeting"); x = ship.x; y = ship.y; var _shoot_angle = weapon_direction(); @@ -141,7 +160,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ _shoot_angle = 360 -_shoot_angle; } if (ship.ai_type == "player" || ship.ai_type == "allies"){ - show_debug_message("player"); + var _enemies = instance_number(obj_en_ship); for (var i=0;i<_enemies;i++){ var _targ = instance_nearest(ship.x, ship.y, obj_en_ship); @@ -166,7 +185,6 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ } instance_activate_object(obj_en_ship); } else if (ship.ai_type = "enemy"){ - show_debug_message("enemy"); var _enemies = instance_number(obj_p_ship) + instance_number(obj_al_ship); for (var i=0;i<_enemies;i++){ var _targ = instance_nearest(ship.x, ship.y, obj_p_ship); @@ -204,7 +222,6 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ instance_activate_object(obj_p_ship); instance_activate_object(obj_al_ship); } - show_debug_message($"targeting2 {target}/"); } static draw_weapon_firing_arc = function(){ var _tangent_direction = weapon_direction(); diff --git a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml index 1b1e6e183b..ec57c555c9 100644 --- a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml +++ b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml @@ -429,4 +429,24 @@ function planet_has_forces(star, planet_id, faction, minimum_strength = 1){ break; } return found; +} + + +function planet_all_forces(star, planet_id){ + var forces_list; + with (star){ + forces_list = [ + p_tau[planet_id], + p_tyranids[planet_id], + p_orks[planet_id], + p_eldar[planet_id], + p_necrons[planet_id], + p_demons[planet_id], + p_player[planet_id], + p_chaos[planet_id], + p_traitors[planet_id] + + ] + } + return array_sum(forces_list); } \ No newline at end of file diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index 0ef67de9bf..e711937cfc 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -82,7 +82,10 @@ function summon_new_hive_fleet(capitals = 5,frigates = 0, escorts = 0, biomass = var _fleet=new_tyranid_fleet(start_coords[0],start_coords[1], capitals, frigates, escorts, biomass); _fleet.action_x = x; _fleet.action_y = y; - set_fleet_movement(); + with(_fleet){ + set_fleet_movement(); + } + return _fleet } @@ -244,19 +247,24 @@ function organise_tyranid_fleet_bio(){ array_push(_planets, i); } _planets = array_shuffle(_planets); + capitals_engaged = 0; for (var i=0;i= capital_number){ + break; + } var _planet = _planets[i]; - if (orbiting.p_pdf[_planet] > 0 || orbiting.p_guardsmen[_planet]) - } - with (orbiting){ - for (var i=1;i 0){ + var _all_except_nids = planet_all_forces(orbiting, _planet) - orbiting.p_tyranids[_planet]; + if (orbiting.p_pdf[_planet] > 0 || orbiting.p_guardsmen[_planet] || _all_except_nids>0){ + for (var n=0;orbiting.p_tyranids[_planet]<6 && biomass>9;n++){ + orbiting.p_tyranids[_planet]++; + biomass -=10; + } + capitals_engaged++; } } - } + + } } diff --git a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy index 6da82ea10c..a95b2f8f92 100644 --- a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy +++ b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ship_glad/spr_ship_glad.yy b/sprites/spr_ship_glad/spr_ship_glad.yy index 9cc53775ef..572141dc6e 100644 --- a/sprites/spr_ship_glad/spr_ship_glad.yy +++ b/sprites/spr_ship_glad/spr_ship_glad.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":30.0, + "seqWidth":79.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":39, "yorigin":15, From cb56873a790a52fe82e315cedc21620eb9d1d630 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 7 May 2025 22:12:47 +0100 Subject: [PATCH 044/155] correct explosion sprrites --- .../scr_ship_combat_data/scr_ship_combat_data.gml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index a46fef8187..dc7149f441 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -6,6 +6,7 @@ global.ship_weapons_stats = { facing : "front", firing_arc : 25, img : spr_ground_las, + explosion_sprite : spr_explosion3, }, "Plasma Cannon" : { img : spr_ground_plasma, @@ -13,7 +14,8 @@ global.ship_weapons_stats = { bullet_speed : 15, dam : 30, firing_arc : 3, - bombard_value :4, + bombard_value :4, + explosion_sprite : spr_explosion_plas, }, "Nova Cannon": { range : 1500, @@ -29,6 +31,7 @@ global.ship_weapons_stats = { cooldown : 20, dam : 18, firing_arc : 5, + explosion_sprite : spr_explosion2, }, "Light Weapons Battery" : { facing : "front", @@ -36,6 +39,7 @@ global.ship_weapons_stats = { cooldown : 30, dam : 8, firing_arc : 8, + explosion_sprite : spr_explosion2, }, "Gunz Battery" : { facing : "front", @@ -43,6 +47,7 @@ global.ship_weapons_stats = { cooldown : 30, dam : 8, firing_arc : 15, + explosion_sprite : spr_explosion2, }, "Heavy Gunz" : { weapon_facing : "front", @@ -115,6 +120,7 @@ global.ship_weapons_stats = { dam : 10, weapon_cooldown : 10, img: spr_ground_las, + explosion_sprite :spr_explosion_plas, }, "Pyro-acid Battery" : { facing : "most", @@ -134,6 +140,7 @@ global.ship_weapons_stats = { range : 200, cooldown : 60, dam : 6, + explosion_sprite :spr_explosion3, }, "Massive Claws" : { facing :"most", @@ -162,6 +169,7 @@ global.ship_weapons_stats = { range : 450, cooldown:30, img : spr_railgun, + explosion_sprite :spr_explosion_plas, }, "Ion Cannons": { facing : "front", @@ -169,6 +177,7 @@ global.ship_weapons_stats = { range : 300, cooldown:15, img : spr_pulse, + explosion_sprite :spr_explosion_plas, }, "Lightning Arc" : { facing : "most", @@ -183,6 +192,7 @@ global.ship_weapons_stats = { cooldown : 210, img : spr_pulse, speed : 20, + explosion_sprite :spr_explosion_plas, }, "Gauss Particle Whip":{ dam : 30, From 9f3b509694c4ee72b1cffd85c6fc2dbfdd2385f2 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 12 May 2025 21:59:57 +0100 Subject: [PATCH 045/155] simplify draw code --- objects/obj_al_ship/Step_0.gml | 2 +- objects/obj_en_ship/Draw_0.gml | 21 ++-- objects/obj_en_ship/Step_0.gml | 2 +- objects/obj_fleet/Create_0.gml | 16 ++- objects/obj_fleet/Draw_0.gml | 46 +++++++ objects/obj_fleet/Mouse_53.gml | 13 -- objects/obj_fleet/Mouse_56.gml | 34 ------ objects/obj_fleet/obj_fleet.yy | 1 - objects/obj_p_ship/Step_0.gml | 2 +- .../scr_automated_ship_combat_functions.gml | 115 ++++++++++++++---- scripts/scr_hit/scr_hit.gml | 39 ++++++ .../scr_player_ship_functions.gml | 21 +++- .../scr_ship_combat_data.gml | 13 +- .../scr_ship_weapon_struct.gml | 23 +++- .../turn_towards_point/turn_towards_point.gml | 4 + sprites/spr_explosion/spr_explosion.yy | 7 +- sprites/spr_explosion2/spr_explosion2.yy | 7 +- sprites/spr_explosion3/spr_explosion3.yy | 7 +- .../spr_explosion_plas/spr_explosion_plas.yy | 7 +- sprites/spr_ship_stri/spr_ship_stri.yy | 7 +- 20 files changed, 270 insertions(+), 117 deletions(-) delete mode 100644 objects/obj_fleet/Mouse_53.gml diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index 6be856ffdf..cf16240c8f 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -131,7 +131,7 @@ if (!__b__){ direction=turn_towards_point(direction,x,y,target.x,target.y,.1); } broadside_movement(); - flank_movement(); + flank_behaviour(); /*if (target!=0) and (action="broadside") and (o_dist>=dist){ direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) }*/ diff --git a/objects/obj_en_ship/Draw_0.gml b/objects/obj_en_ship/Draw_0.gml index 39e3c4578d..a201c2b7e8 100644 --- a/objects/obj_en_ship/Draw_0.gml +++ b/objects/obj_en_ship/Draw_0.gml @@ -16,27 +16,30 @@ draw_set_halign(fa_center); draw_set_alpha(1); if (lightning>01) and (instance_exists(target)){ - draw_set_color(c_lime);lightning-=1; + draw_set_color(c_lime); + lightning-=1; scr_bolt(x,y,target.x,target.y,0); } if (whip>0) and (instance_exists(target)){ - draw_set_color(c_lime);whip-=1; + draw_set_color(c_lime); + whip-=1; scr_bolt(x,y,target.x,target.y,0); scr_bolt(x-1,y+1,target.x-1,target.y+1,0); } draw_set_color(38144); -if (class!="Battlekroozer") then draw_self(); -if (class="Battlekroozer") then draw_sprite_ext(sprite_index,0,x,y,0.75,0.75,direction,c_white,1); - - +if (class!="Battlekroozer"){ + draw_self(); +} else { + draw_sprite_ext(sprite_index,0,x,y,0.75,0.75,direction,c_white,1); +} if (owner != eFACTION.Tau){ if (shields<=0){ - if (obj_controller.zoomed=0){if (maxhp!=0) then draw_text(x,y-(sprite_height/2),string_hash_to_newline(string(floor((hp/maxhp)*100))+"%"));} - if (obj_controller.zoomed=1){if (maxhp!=0) then draw_text_transformed(x,y-sprite_height,string_hash_to_newline(string(floor((hp/maxhp)*100))+"%"),2,2,0);} + if (obj_controller.zoomed=0){if (maxhp!=0) then draw_text(x,y-(sprite_height/2),string_hash_to_newline(string(floor((hp/maxhp)*100))+"%"));} + if (obj_controller.zoomed=1){if (maxhp!=0) then draw_text_transformed(x,y-sprite_height,string_hash_to_newline(string(floor((hp/maxhp)*100))+"%"),2,2,0);} } if (shields>0){ @@ -46,7 +49,7 @@ if (owner != eFACTION.Tau){ } } -if (owner = eFACTION.Tau){ +else if (owner = eFACTION.Tau){ if (shields<=0){ if (obj_controller.zoomed=0){if (maxhp!=0) then draw_text(x,y-(sprite_width/2),string_hash_to_newline(string(floor((hp/maxhp)*100))+"%"));} if (obj_controller.zoomed=1){if (maxhp!=0) then draw_text_transformed(x,y-sprite_width,string_hash_to_newline(string(floor((hp/maxhp)*100))+"%"),2,2,0);} diff --git a/objects/obj_en_ship/Step_0.gml b/objects/obj_en_ship/Step_0.gml index 2c569a85b9..31fad913d4 100644 --- a/objects/obj_en_ship/Step_0.gml +++ b/objects/obj_en_ship/Step_0.gml @@ -76,7 +76,7 @@ if (hp>0) and (instance_exists(obj_p_ship)){ direction=turn_towards_point(direction,x,y,target.x,target.y,.1); } broadside_movement(); - flank_movement(); + flank_behaviour(); /*if (target!=0) and (action="broadside") and (o_dist>=dist){ diff --git a/objects/obj_fleet/Create_0.gml b/objects/obj_fleet/Create_0.gml index ce3043926e..03afb42f74 100644 --- a/objects/obj_fleet/Create_0.gml +++ b/objects/obj_fleet/Create_0.gml @@ -24,9 +24,19 @@ obj_controller.x=0; obj_controller.y=240; obj_controller.combat=1; is_zoomed=obj_controller.zoomed; -start=0;combat_end=170; - -if (obj_controller.zoomed=0) then with(obj_controller){scr_zoom();} +start=0; +combat_end=170; + +fleet_select_box = false; + +if (obj_controller.zoomed=0){ + set_zoom_to_default() +} else { + with(obj_controller){ + scr_zoom(); + } + set_zoom_to_default(); +} enemy=0; enemy_status="attacking"; diff --git a/objects/obj_fleet/Draw_0.gml b/objects/obj_fleet/Draw_0.gml index 1ff322f92a..7ddce9239a 100644 --- a/objects/obj_fleet/Draw_0.gml +++ b/objects/obj_fleet/Draw_0.gml @@ -1,3 +1,5 @@ + + draw_set_alpha(1); for (var i=array_length(explosions)-1; i>= 0;i--){ @@ -6,3 +8,47 @@ for (var i=array_length(explosions)-1; i>= 0;i--){ array_delete(explosions, i , 1); } } +if (start!=5){ + exit; +} +if(mouse_check_button_pressed(mb_left)){ + var _mb_consts = return_mouse_consts(); + fleet_select_box = new DragBox( + _mb_consts[0], + _mb_consts[1], + mb_left, + function(x_start,y_start,x_end,y_end){ + obj_fleet.ships_selected = 0; + with (obj_p_ship){ + if (point_in_rectangle(x, y,x_start,y_start,x_end,y_end )){ + obj_fleet.ships_selected++; + selected = 1; + } else { + if (selected && !keyboard_check(vk_shift)){ + selected = 0; + } + } + } + }, + function(x_start,y_start,x_end,y_end){ + obj_fleet.ships_selected = 0; + with (obj_p_ship){ + if (point_in_rectangle(x, y,x_start,y_start,x_end,y_end )){ + obj_fleet.ships_selected++; + selected = 1; + } else { + if (selected && !keyboard_check(vk_shift)){ + selected = 0; + } + } + } + } + ); +} + +if (fleet_select_box!= false){ + if (!fleet_select_box.step()){ + delete fleet_select_box; + fleet_select_box = false; + }; +} \ No newline at end of file diff --git a/objects/obj_fleet/Mouse_53.gml b/objects/obj_fleet/Mouse_53.gml deleted file mode 100644 index 1e74f5a699..0000000000 --- a/objects/obj_fleet/Mouse_53.gml +++ /dev/null @@ -1,13 +0,0 @@ - -if (sel_x1+sel_y1=0) and (control=1){ - if (instance_exists(obj_p_ship)){ - left_down=50;sel_x1=mouse_x;sel_y1=mouse_y;ships_selected=0; - - with(obj_p_ship){ - if (keyboard_check(vk_shift)=false) then selected=0; - sel_x1=mouse_x;sel_y1=mouse_y; - } - } -} - - diff --git a/objects/obj_fleet/Mouse_56.gml b/objects/obj_fleet/Mouse_56.gml index 9d4a7d0548..aa0d6f2ff2 100644 --- a/objects/obj_fleet/Mouse_56.gml +++ b/objects/obj_fleet/Mouse_56.gml @@ -1,39 +1,5 @@ -var pressy;pressy=0; -sel_x1=0;sel_y1=0; - - -if (instance_exists(obj_p_ship)) and (control=1){ - left_down=0; - with(obj_p_ship){ - var casey=2; - sel_x2=mouse_x; - sel_y2=mouse_y; - - if (point_distance(sel_x1,sel_y1,sel_x2,sel_y2)<30) then casey=1; - - if (casey=1){ - selected=0; - if (point_distance(mouse_x,mouse_y,x,y)<=30){ - selected=1; - obj_fleet.ships_selected+=1; - } - } - - if (casey=2){ - if point_in_rectangle(x,y,sel_x1,sel_y1,sel_x2,sel_y2){ - selected=1; - obj_fleet.ships_selected+=1; - } - else{ - if (!keyboard_check(vk_shift)) then selected=0; - } - } - - sel_x1=0;sel_y1=0;sel_x2=0;sel_y2=0; - } -} if (start=5) and (obj_controller.zoomed=0){ if (mouse_x>=__view_get( e__VW.XView, 0 )+12) and (mouse_y>=__view_get( e__VW.YView, 0 )+436) and (mouse_x<__view_get( e__VW.XView, 0 )+48) and (mouse_y<__view_get( e__VW.YView, 0 )+480) and (room_speed<90) then room_speed+=30; diff --git a/objects/obj_fleet/obj_fleet.yy b/objects/obj_fleet/obj_fleet.yy index 72f731e5cf..9cb8783842 100644 --- a/objects/obj_fleet/obj_fleet.yy +++ b/objects/obj_fleet/obj_fleet.yy @@ -13,7 +13,6 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":56,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":53,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":67,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":32,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":13,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index 3069c68374..19cb9b0a0f 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -97,7 +97,7 @@ if (hp>0) and (instance_exists(target)){ direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed/2); } broadside_movement(); - flank_movement(); + flank_behaviour(); } if (draw_targets != false){ diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 71a32f8b4d..6ffac6be37 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -20,38 +20,111 @@ function broadside_movement(){ } } -function flank_movement(){ +function return_longest_range_weapon(weapons, facing = "none"){ + var _weapon = false; + for (var i=0;i _weapon.range){ + _weapon = weapons[i]; + } + } + } + return _weapon; +} + +function flank_direction_move(main_weapon = false){ + var _rel_direction = point_direction(target.x, target.y, x, y) - target.direction; + if (abs(_rel_direction) < 105){ + if (main_weapon == false){ + ship_rear_approach(_rel_direction); + } else { + if (point_distance(x, y, target.x, target.y) > main_weapon.range && abs(_rel_direction) <= main_weapon.firing_arc){ + avoid_ship_weapon(main_weapon, rel_direction); + } else { + ship_rear_approach(_rel_direction); + } + } + + } else { + defualt_target_movement(); + } +} + +function avoid_ship_weapon(weapon, rel_direction){ + if (rel_direction){ + var avoid_angle = target.direction + weapon.firing_arc; + } else { + var avoid_angle = target.direction - weapon.firing_arc; + } + var _sx = xm+lengthdir_x(weapon.range, avoid_angle); + var _sy = ym+lengthdir_y(weapon.range, avoid_angle); + draw_targets = [_sx, _sy]; +} + +function ship_rear_approach(rel_direction){ + var _attack_angle = target.direction + ((rel_direction > 0) ? 105 : -105); + if (_attack_angle > 360){ + _attack_angle -= 360; + } else if (_attack_angle< 0){ + _attack_angle = 360 -_attack_angle; + } + var _flank_margin = closing_distance*2 + var _target_lock = [target.x + lengthdir_x(_flank_margin, _attack_angle), target.y + lengthdir_y(_flank_margin, _attack_angle)] + draw_targets = _target_lock; + ship_turn_towards_point(_target_lock[0],_target_lock[1]); + closing_distance = 0; +} + +function get_out_of_weapon_firing_arc(weapon, weapon_owner){ + var _rel_direction = point_direction(weapon_owner.x, weapon_owner.y, x, y) - weapon_owner.direction; + var _travel_direct = 0; + if (_rel_direction>0){ + _travel_direct = weapon_owner.direction + weapon.firing_arc + 90; + } else { + _travel_direct = weapon_owner.direction - weapon.firing_arc - 90; + } + var _target_lock = [x + lengthdir_x(1000, _travel_direct), y + lengthdir_y(1000, _travel_direct)] + ship_turn_towards_point(_target_lock[0],_target_lock[1]); + draw_targets = _target_lock; +} + +function flank_behaviour(){ var _normal_target = false; if (target!=0 && action=="flank"){ + var _target_main_weapon = return_longest_range_weapon(target.weapons, "front"); if (!under_fire){ - var _rel_direction = point_direction(target.x, target.y, x, y) - target.direction; - if (abs(_rel_direction) < 105){ - var _attack_angle = target.direction + ((_rel_direction > 0) ? 105 : -105); - if (_attack_angle > 360){ - _attack_angle -= 360; - } else if (_attack_angle< 0){ - _attack_angle = 360 -_attack_angle; - } - var _flank_margin = closing_distance*2 - var _target_lock = [target.x + lengthdir_x(_flank_margin, _attack_angle), target.y + lengthdir_y(_flank_margin, _attack_angle)] - draw_targets = _target_lock; - direction = turn_towards_point(direction, x,y,_target_lock[0],_target_lock[1],turning_speed); - closing_distance = 0; - } else { - _normal_target = true; - } + if (!_target_main_weapon){ + flank_direction_move(); + } else { + var _rel_direction = point_direction(target.x, target.y, x, y) - target.direction; + if (abs(_rel_direction) <= _target_main_weapon.firing_arc){ + get_out_of_weapon_firing_arc(_target_main_weapon, target); + } else { + flank_direction_move(); + } + } } else { + _normal_target = true; } } if (_normal_target ){ - if (y>=target.y) then target_distance=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - if (ytarget.y) and (target_distance>closing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); - if (yclosing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); + defualt_target_movement(); } } +function defualt_target_movement(){ + if (y>=target.y) then target_distance=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); + if (ytarget.y) and (target_distance>closing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); + if (yclosing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); +} + function start_slowing_telemetry(distance_to_target, deceleration){ var _start_slowing = false; if (speed>0){ diff --git a/scripts/scr_hit/scr_hit.gml b/scripts/scr_hit/scr_hit.gml index 0e6210750d..ebe17add7a 100644 --- a/scripts/scr_hit/scr_hit.gml +++ b/scripts/scr_hit/scr_hit.gml @@ -194,6 +194,45 @@ function mouse_distance_less(xx, yy, distance){ return (point_distance(xx,yy,mouse_consts[0],mouse_consts[1])<=distance) } +function DragBox(xx, yy, bind_button = mb_left, on_release=false, on_drag = false) constructor{ + x1 = xx; + y1 = yy; + + x2 = xx; + y2 = yy; + + self.bind_button = bind_button; + self.on_release = on_release; + self.on_drag = on_drag; + + box_colour = CM_GREEN_COLOR; + + drag_alpha = 0.25; + + static step = function(){ + var _mb_consts = return_mouse_consts(); + x2 = _mb_consts[0]; + y2 = _mb_consts[1]; + if (!mouse_button_held(bind_button)){ + if (is_callable(on_release)){ + on_release(x1,y1,x2,y2); + return false; + } + } else { + draw_set_color(box_colour); + draw_set_alpha(drag_alpha); + draw_rectangle(x1, y1, x2, y2, 0); + draw_set_alpha(1); + draw_rectangle(x1, y1, x2, y2, 1); + + if (is_callable(on_drag)){ + on_drag(x1,y1,x2,y2); + } + } + return true; + } +} + function return_mouse_consts_tooltip(){ var consts = return_mouse_consts(); return [consts[0], consts[1]] diff --git a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml index cfa2346350..9d93e907b2 100644 --- a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml +++ b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml @@ -278,8 +278,8 @@ function new_player_ship(type, start_loc="home", new_name=""){ obj_ini.ship_front_armour[index]=6; obj_ini.ship_other_armour[index]=6; obj_ini.ship_shields[index]=12; - add_weapon_to_ini_ship(index, "Weapons Battery", {facing : "left", firing_arc: 20}); - add_weapon_to_ini_ship(index, "Weapons Battery", {facing : "right", firing_arc: 20}); + add_weapon_to_ini_ship(index, "Weapons Battery", {facing : "left", firing_arc: 30}); + add_weapon_to_ini_ship(index, "Weapons Battery", {facing : "right", firing_arc: 30}); add_weapon_to_ini_ship(index, "Light Weapons Battery", {facing : "front"}); add_weapon_to_ini_ship(index, "Thunderhawk Launch Bays"); add_weapon_to_ini_ship(index, "Macro Bombardment Cannons"); @@ -290,6 +290,7 @@ function new_player_ship(type, start_loc="home", new_name=""){ obj_ini.ship_contents[index]=""; obj_ini.ship_turrets[index]=3; } + if (string_count("Strike Cruiser",type)>0){ obj_ini.ship_class[index]="Strike Cruiser"; obj_ini.ship_size[index]=2; @@ -301,8 +302,20 @@ function new_player_ship(type, start_loc="home", new_name=""){ obj_ini.ship_front_armour[index]=6; obj_ini.ship_other_armour[index]=6; obj_ini.ship_shields[index]=6; - add_weapon_to_ini_ship(index, "Weapons Battery", {facing : "left"}); - add_weapon_to_ini_ship(index, "Weapons Battery", {facing : "right"}); + obj_ini.ship_data[index].left_broad_positions = [[56, 16],[65, 16],[74,16],[83, 16]]; + obj_ini.ship_data[index].right_broad_positions = [[56, 37],[65, 37],[74,37],[83, 37]]; + var _broadsl = obj_ini.ship_data[index].left_broad_positions; + var _broadsr = obj_ini.ship_data[index].right_broad_positions; + for (var i=0;i animation_frames){ return -1; } @@ -150,9 +150,22 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ } } + static calc_gun_position = function(){ + if (struct_exists(self, "ship_position")){ + var _ship_sprite = ship.sprite_index; + var _x_offset = sprite_get_xoffset(_ship_sprite); + var _y_offset = sprite_get_yoffset(_ship_sprite); + var _dist = point_distance(_x_offset, _y_offset, ship_position[0], ship_position[1]); + var _rel_direction = point_direction(_x_offset,_y_offset, ship_position[0], ship_position[1]); + x = ship.x + lengthdir_x(_dist , ship.direction+_rel_direction); + y = ship.y + lengthdir_y(_dist , ship.direction+_rel_direction); + } else { + x = ship.x; + y = ship.y; + } + } static find_target = function(){ - x = ship.x; - y = ship.y; + calc_gun_position(); var _shoot_angle = weapon_direction(); if (_shoot_angle > 360){ _shoot_angle -= 360; @@ -229,9 +242,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ var _max_distance = range; - x = ship.x; - - y = ship.y; + calc_gun_position(); var _left = x - _max_distance; var _top = y - _max_distance; diff --git a/scripts/turn_towards_point/turn_towards_point.gml b/scripts/turn_towards_point/turn_towards_point.gml index b801bb9f16..282428d461 100644 --- a/scripts/turn_towards_point/turn_towards_point.gml +++ b/scripts/turn_towards_point/turn_towards_point.gml @@ -19,3 +19,7 @@ function turn_towards_point(current_angle, x1, y1, x2, y2, turn_speed) { } + +function ship_turn_towards_point(target_x,target_y){ + direction = turn_towards_point(direction, x, y, target_x, target_y, turning_speed); +} diff --git a/sprites/spr_explosion/spr_explosion.yy b/sprites/spr_explosion/spr_explosion.yy index 5a06964558..99ed55df75 100644 --- a/sprites/spr_explosion/spr_explosion.yy +++ b/sprites/spr_explosion/spr_explosion.yy @@ -69,6 +69,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":64.0, + "seqWidth":64.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -97,10 +99,7 @@ },"Disabled":false,"id":"e3586009-fe9f-4ffd-ae6b-5306a1bbaa08","IsCreationKey":false,"Key":6.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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":32, "yorigin":32, diff --git a/sprites/spr_explosion2/spr_explosion2.yy b/sprites/spr_explosion2/spr_explosion2.yy index 571661e618..d5e6485b93 100644 --- a/sprites/spr_explosion2/spr_explosion2.yy +++ b/sprites/spr_explosion2/spr_explosion2.yy @@ -76,6 +76,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":64.0, + "seqWidth":64.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -125,10 +127,7 @@ },"Disabled":false,"id":"6a8df266-eb69-44d0-a7dc-ac3177820f19","IsCreationKey":false,"Key":13.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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":32, "yorigin":32, diff --git a/sprites/spr_explosion3/spr_explosion3.yy b/sprites/spr_explosion3/spr_explosion3.yy index 66f4ed915b..df95777625 100644 --- a/sprites/spr_explosion3/spr_explosion3.yy +++ b/sprites/spr_explosion3/spr_explosion3.yy @@ -86,6 +86,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":64.0, + "seqWidth":64.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -165,10 +167,7 @@ },"Disabled":false,"id":"b45e1ad1-5605-4f37-9ba1-0739e0a8a14c","IsCreationKey":false,"Key":23.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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":32, "yorigin":32, diff --git a/sprites/spr_explosion_plas/spr_explosion_plas.yy b/sprites/spr_explosion_plas/spr_explosion_plas.yy index 9937ac694f..c36009316f 100644 --- a/sprites/spr_explosion_plas/spr_explosion_plas.yy +++ b/sprites/spr_explosion_plas/spr_explosion_plas.yy @@ -69,6 +69,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":64.0, + "seqWidth":64.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -97,10 +99,7 @@ },"Disabled":false,"id":"a319f899-f3d0-4b64-9869-6965563b4843","IsCreationKey":false,"Key":6.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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":32, "yorigin":32, diff --git a/sprites/spr_ship_stri/spr_ship_stri.yy b/sprites/spr_ship_stri/spr_ship_stri.yy index cb58b58721..23cd650996 100644 --- a/sprites/spr_ship_stri/spr_ship_stri.yy +++ b/sprites/spr_ship_stri/spr_ship_stri.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":51.0, + "seqWidth":131.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":65, "yorigin":25, From 8f4bbe297bfd483d415e98dade8daf7e2f3a197c Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 7 May 2025 11:29:00 +0100 Subject: [PATCH 046/155] fix: Crash when creating fallen mission (#806) --- .../scr_mission_functions.gml | 2 +- scripts/scr_random_event/scr_random_event.gml | 40 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 2aab02cdd7..1327adbcfe 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -594,7 +594,7 @@ function problem_count_down(planet, count_change=1){ function add_new_problem(planet, problem, timer,star="none", other_data={}){ var problem_added=false; if (star=="none"){ - for (var i=1;i0){ + log_message($"Fallen: found star {star.name} planet {planet} as candidate") + + var assigned_problem = add_new_problem(planet, "fallen", eta,star) + log_message($"assigned_problem {assigned_problem}") - if(!assigned_problem) { - log_error("RE: Hunt the Fallen, coulnd't assign a problem to the planet"); - return; + if (!assigned_problem) { + log_error("RE: Hunt the Fallen, coulnd't assign a problem to the planet"); + return; + } + + var text = "Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to send out a strike team and scour the planet. Any longer and any Fallen that might be there will have escaped."; + scr_popup("Hunt the Fallen",text,"fallen",""); + scr_event_log("","Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to investigate."); + var star_alert = instance_create(star.x+16,star.y-24,obj_star_event); + star_alert.image_alpha=1; + star_alert.image_speed=1; + star_alert.col="purple"; } - - var text = "Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to send out a strike team and scour the planet. Any longer and any Fallen that might be there will have escaped."; - scr_popup("Hunt the Fallen",text,"fallen",""); - scr_event_log("","Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to investigate."); - var star_alert = instance_create(star.x+16,star.y-24,obj_star_event); - star_alert.image_alpha=1; - star_alert.image_speed=1; - star_alert.col="purple"; } \ No newline at end of file From 25b3491ea9d02ab0fb0c621088df6e357812a5d2 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 7 May 2025 11:54:39 +0100 Subject: [PATCH 047/155] fix: Destroy colour_pick on area change (#807) --- scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml | 3 +++ scripts/scr_livery_setup/scr_livery_setup.gml | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml index a6b76ffc76..7cc3a51022 100644 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml @@ -677,6 +677,9 @@ function colour_picker(xx,yy, max_width=400) constructor{ static create_texture_surface = function(texture_set, sprite_draw_args){ var texture_names = struct_get_names(texture_set); var total_width = sprite_draw_args.frame_width * array_length(texture_names); + if (sprite_draw_args.frame_height <= 0 || total_width <= 0){ + exit; + } _texture_offset = [0,0]; texture_coords = []; diff --git a/scripts/scr_livery_setup/scr_livery_setup.gml b/scripts/scr_livery_setup/scr_livery_setup.gml index d0bc83a284..e4942e9680 100644 --- a/scripts/scr_livery_setup/scr_livery_setup.gml +++ b/scripts/scr_livery_setup/scr_livery_setup.gml @@ -52,6 +52,7 @@ function scr_livery_setup(){ draw_set_halign(fa_center); if (comp_toggle.draw()){ comp_toggle.company_view = !comp_toggle.company_view; + livery_picker.colour_pick=false; if (!comp_toggle.company_view){ company_liveries[livery_picker.role_set] = variable_clone(livery_picker.map_colour); livery_picker.role_set = 0; @@ -405,7 +406,10 @@ function scr_livery_setup(){ var onceh=0; if (complex_depth_selection=i) and (onceh=0){complex_depth_selection=0;onceh=1;} - else if (complex_depth_selection!=i) and (onceh=0){complex_depth_selection=i;onceh=1;} + else if (complex_depth_selection!=i) and (onceh=0){ + complex_depth_selection=i; + onceh=1; + } } draw_text_transformed(cur_button.cords[0]+30,cur_button.cords[1]+4,cur_button.text,0.4,0.4,0); } @@ -470,6 +474,7 @@ function scr_livery_setup(){ } livery_picker.shuffle_dummy(); livery_picker.reset_image(); + livery_picker.colour_pick=false; } } } From e8526bdcf475d7e75df406e214de207a787445dd Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Wed, 7 May 2025 20:04:56 +0100 Subject: [PATCH 048/155] fix: Scouts starting with Black Carapace (#808) --- scripts/scr_initialize_custom/scr_initialize_custom.gml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 36cd928254..c996565383 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -2819,6 +2819,7 @@ function scr_initialize_custom() { } break; case "scouts": + _unit_type = "scout"; _rolename = roles.scout; _erole = eROLE.Scout; break; @@ -2974,6 +2975,7 @@ function scr_initialize_custom() { _wep2 = wep2[defaults_slot][eROLE.Terminator]; } break; + // VEHICLES case "rhinos": From 568b7d8035f1988dde0038574426f6a053a6c002 Mon Sep 17 00:00:00 2001 From: Rathowm <3449985213@qq.com> Date: Thu, 8 May 2025 20:57:38 +0800 Subject: [PATCH 049/155] fix: Pistol modifier inconsistent with description (#811) --- scripts/scr_marine_struct/scr_marine_struct.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index c79dc37087..b7d02c1a79 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -1735,7 +1735,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} secondary_modifier = 0; } else { secondary_modifier = 0.6; - side_arm_data = "Pistol: x0.8"; + side_arm_data = "Pistol: x0.6"; } } else if (secondary_weapon.has_tag("flame")) { secondary_modifier = 0.3; From ce87a6d03caa6cf248bde72684a89d5ce65a9b54 Mon Sep 17 00:00:00 2001 From: Rathowm <3449985213@qq.com> Date: Fri, 9 May 2025 07:27:54 +0800 Subject: [PATCH 050/155] fix: Range multiplier not applied to range attack (#810) --- scripts/scr_marine_struct/scr_marine_struct.gml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index b7d02c1a79..dd3872b92d 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -1550,6 +1550,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} explanation_string += $"Secondary: +{second_attack}#"; } } + final_range_attack = floor(final_range_attack * range_multiplyer); ranged_damage_data = [final_range_attack, explanation_string, carry_data, primary_weapon, secondary_weapon]; return ranged_damage_data; }; From 285eb9b4b5ff7193fa6acf1d6ae9ca671614d20b Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 11 May 2025 19:37:32 +0300 Subject: [PATCH 051/155] ci: Attempt to fix commit checking and old build deletion (#816) --- .github/workflows/release_dev.yml | 111 +++++++++++++++--------------- 1 file changed, 57 insertions(+), 54 deletions(-) diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index aa32251903..e7a5c8d757 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -36,32 +36,55 @@ jobs: # manual override if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then - echo "Manually triggered → build." + echo "Manually triggered → build." echo "needed=true" >> $GITHUB_OUTPUT exit 0 fi # determine commit range since last tag + # Use 2>/dev/null to suppress error if no tags exist LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") if [ -n "$LAST_TAG" ]; then RANGE="$LAST_TAG..HEAD" + echo "Checking commits in range: $RANGE (since last tag '$LAST_TAG')" else - RANGE="HEAD" + RANGE="HEAD" # If no tags, check all commits up to HEAD + echo "No previous tags found. Checking all commits up to HEAD." fi - echo "Commit range: $RANGE" + + # Check if there are *any* commits in the range. + # git log -n 1 --format=%H will return the latest commit SHA if there's at least one. + # If the range is empty (HEAD is same as LAST_TAG), it returns nothing. + COMMITS_IN_RANGE=$(git log $RANGE -n 1 --format=%H 2>/dev/null || echo "") + + if [ -z "$COMMITS_IN_RANGE" ]; then + echo "No new commits found in the range '$RANGE'. HEAD is likely the same as the last tag ($LAST_TAG)." + echo "Skipping build as no changes since the last tagged build." + # needed is already defaulted to false, so we just exit. + exit 0 + fi + + # If we reached here, there are new commits in the range. + echo "New commits found in range '$RANGE'. Checking their messages." # collect all commit messages in range ALL_MSGS=$(git log $RANGE --pretty=%B) echo "Messages in range:" - echo "$ALL_MSGS" + # Use sed to indent messages for clarity in logs + echo "$ALL_MSGS" | sed 's/^/ /' - # only skip if every message matches exclude pattern + # only build if at least one message does NOT match exclude pattern + # The -v option inverts the match; -E enables extended regex; -q suppresses output. + # The overall command exits successfully (0) if a non-matching line is found. EXCLUDE="^(docs|chore|style|ci)" if echo "$ALL_MSGS" | grep -vEq "$EXCLUDE"; then - echo "Found non-excluded commit → build needed." + echo "Found at least one commit message not matching the exclude pattern '$EXCLUDE'." + echo "Build needed." echo "needed=true" >> $GITHUB_OUTPUT else - echo "All commits are docs/chore/style/ci → skipping build." + echo "All new commit messages match the exclude pattern '$EXCLUDE'." + echo "Skipping build." + # needed is already defaulted to false. fi prepare_release: @@ -90,66 +113,46 @@ jobs: echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT echo "build_date=$DATE_TAG" >> $GITHUB_OUTPUT - - name: Cleanup old releases (debug mode) - run: | - set -euo pipefail - - #— Produce TAG_NAME earlier in your workflow: - TAG_NAME="${{ steps.tag_info.outputs.tag_name }}" - echo "DEBUG: TAG_NAME='${TAG_NAME}'" - - BRANCH_SUFFIX="${TAG_NAME%%/*}" - PREFIX="${BRANCH_SUFFIX}/" - echo "DEBUG: PREFIX='${PREFIX}'" - - echo "All releases:" - gh release list --limit 100 | awk '{print $1}' - - echo "Releases matching prefix:" - MATCHING=$(gh release list --limit 100 | awk '{print $1}' | grep "^${PREFIX}" || true) - echo "$MATCHING" | cat -n - - # Only delete if we actually matched anything - if [ -n "$MATCHING" ]; then - COUNT=0 - KEEP=10 - IFS=$'\n' - for TAG in $MATCHING; do - COUNT=$((COUNT+1)) - if [ "$COUNT" -gt "$KEEP" ]; then - echo "Deleting: $TAG" - # gh release delete "$TAG" --cleanup-tag -y - fi - done - unset IFS - else - echo "No releases to delete for prefix '$PREFIX'" - fi - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Cleanup old releases run: | - # tag_name looks like: branch-name/date + set -euo pipefail # Exit immediately if a command exits with a non-zero status + + # tag_name looks like: branch-name/date (e.g., main/2025-05-10-2220) TAG_NAME="${{ steps.tag_info.outputs.tag_name }}" - BRANCH_SUFFIX="${TAG_NAME%%/*}" - PREFIX="${BRANCH_SUFFIX}/" - echo "Checking releases with prefix: $PREFIX" + # Extract the branch prefix from the tag name (e.g., "main/") + # This assumes your tag format is always 'branch-name/date' + BRANCH_PREFIX="${TAG_NAME%%/*}/" - # Get tags starting with the prefix, sort reverse chronologically (best effort with default sort) - # Using gh release list is more reliable than just git tags if releases exist - TAGS=$(gh release list --limit 100 | awk '{print $1}' | grep "^${PREFIX}" | sort -r) + echo "Checking releases with prefix: $BRANCH_PREFIX" + + # Get tag names starting with the prefix from the gh release list, sort reverse chronologically by tag name. + # Use || true at the end of the pipe to prevent the step from failing if no releases match the prefix + TAGS_TO_PROCESS=$(gh release list --limit 100 --json tagName | jq -r '.[].tagName' | grep "^${BRANCH_PREFIX}" | sort -r || true) + + if [ -z "$TAGS_TO_PROCESS" ]; then + echo "No releases found matching prefix '${BRANCH_PREFIX}'. No cleanup needed." + exit 0 + fi COUNT=0 RELEASES_TO_KEEP=10 # How many releases per branch prefix to keep - for TAG in $TAGS; do + echo "Found releases matching prefix '${BRANCH_PREFIX}'. Will keep the latest $RELEASES_TO_KEEP." + + IFS=$'\n' # Set IFS to newline to correctly iterate over tags + for TAG in $TAGS_TO_PROCESS; do COUNT=$((COUNT + 1)) if [ $COUNT -gt $RELEASES_TO_KEEP ]; then echo "Deleting old release+tag: $TAG" - gh release delete "$TAG" -y --cleanup-tag || echo "Failed to delete release $TAG, maybe already deleted?" + # gh release delete "$TAG" -y --cleanup-tag command deletes the release AND the associated git tag + # Use || echo to log a non-fatal warning if deletion fails (e.g., release already gone) + # gh release delete "$TAG" -y --cleanup-tag || echo "Warning: Failed to delete release $TAG. It may have been deleted already." + else + echo "Keeping release+tag: $TAG (it's within the latest $RELEASES_TO_KEEP)" fi done + unset IFS # Reset IFS + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needs permissions to delete releases/tags From fadef5ab54dd9264410078f82e5a84b22ff5c920 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 14 May 2025 13:51:58 +0100 Subject: [PATCH 052/155] remove ship arrays --- ChapterMaster.yyp | 1 + objects/obj_controller/Alarm_5.gml | 12 +- objects/obj_controller/KeyPress_73.gml | 1 - objects/obj_controller/Step_0.gml | 18 +- objects/obj_dropdown_sel/Draw_0.gml | 4 +- objects/obj_ini/Create_0.gml | 1 + scripts/scr_add_artifact/scr_add_artifact.gml | 5 +- scripts/scr_add_vehicle/scr_add_vehicle.gml | 7 +- .../scr_apothecary_ground.gml | 7 +- scripts/scr_company_load/scr_company_load.gml | 7 +- scripts/scr_company_view/scr_company_view.gml | 27 +- .../scr_fleet_advisor/scr_fleet_advisor.gml | 340 +++++++++--------- .../scr_ini_ship_cleanup.gml | 1 - .../scr_player_fleet_combat_functions.gml | 3 +- .../scr_player_fleet_functions.gml | 1 - .../scr_player_ship_functions.gml | 108 ++++-- .../scr_ship_weapon_struct.gml | 6 +- .../scr_unit_quick_find_pane.gml | 3 +- .../scr_vehicle_count/scr_vehicle_count.gml | 3 +- .../a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png | Bin 11076 -> 10308 bytes .../7e9c9e28-a54e-4389-8a37-9735f9adc44f.png | Bin 11076 -> 10308 bytes .../a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png | Bin 0 -> 10308 bytes .../7e9c9e28-a54e-4389-8a37-9735f9adc44f.png | Bin 0 -> 10308 bytes .../spr_ship_weapon_macro_cannon.yy | 92 +++++ 24 files changed, 390 insertions(+), 257 deletions(-) create mode 100644 sprites/spr_ship_weapon_macro_cannon/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png create mode 100644 sprites/spr_ship_weapon_macro_cannon/layers/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890/7e9c9e28-a54e-4389-8a37-9735f9adc44f.png create mode 100644 sprites/spr_ship_weapon_macro_cannon/spr_ship_weapon_macro_cannon.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 885aa931aa..51b8250e3f 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1519,6 +1519,7 @@ {"id":{"name":"spr_ship_veng","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},}, {"id":{"name":"spr_ship_void","path":"sprites/spr_ship_void/spr_ship_void.yy",},}, {"id":{"name":"spr_ship_warden","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},}, + {"id":{"name":"spr_ship_weapon_macro_cannon","path":"sprites/spr_ship_weapon_macro_cannon/spr_ship_weapon_macro_cannon.yy",},}, {"id":{"name":"spr_shutter_button","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},}, {"id":{"name":"spr_sister_hospitaler","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},}, {"id":{"name":"spr_sister_of_battle","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},}, diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 6226408290..80e04e13d0 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -268,12 +268,9 @@ for (var c = 0; c < 11; c++){ // STC Bonuses if (obj_controller.stc_ships>=6){ //self healing ships logic - for (var v=0; v 0) { cooldown = 8; var b = selecting_ship; - + var _ship = obj_ini.ship_data[b]; var unit, company, unit_id; for (var q = 0; q < array_length(display_unit); q++) { if ((man[q] == "man") && (ma_loc[q] == selecting_location) && (ma_wid[q] < 1) && (man_sel[q] != 0)) { @@ -798,12 +799,11 @@ try { } unit_id = unit.marine_number; company = unit.company; - obj_ini.loc[company][unit_id] = obj_ini.ship_location[b]; + obj_ini.loc[company][unit_id] = _ship.location; unit.ship_location = -1; unit.planet_location = unload; obj_ini.uid[company][unit_id] = 0; - - ma_loc[q] = obj_ini.ship_location[b]; + ma_loc[q] = _ship.location; ma_lid[q] = -1; ma_wid[q] = unload; } else if ((man[q] == "vehicle") && (ma_loc[q] == selecting_location) && (ma_wid[q] < 1) && (man_sel[q] != 0)) { @@ -812,12 +812,12 @@ try { } var unit_id = display_unit[q][1]; var company = display_unit[q][0]; - obj_ini.veh_loc[company][unit_id] = obj_ini.ship_location[b]; + obj_ini.veh_loc[company][unit_id] = _ship.location; obj_ini.veh_lid[company][unit_id] = -1; obj_ini.veh_wid[company][unit_id] = unload; obj_ini.veh_uid[company][unit_id] = 0; - ma_loc[q] = obj_ini.ship_location[b]; + ma_loc[q] = _ship.location; ma_lid[q] = -1; ma_wid[q] = unload; } diff --git a/objects/obj_dropdown_sel/Draw_0.gml b/objects/obj_dropdown_sel/Draw_0.gml index c6de74a804..e3db280490 100644 --- a/objects/obj_dropdown_sel/Draw_0.gml +++ b/objects/obj_dropdown_sel/Draw_0.gml @@ -102,8 +102,8 @@ if (opened=1){ obj_controller.fest_sid=option_id[ii]; obj_controller.fest_wid=0; if (option_id[ii]>0){ - if (obj_controller.fest_warp=0) and (obj_ini.ship_location[option_id[ii]]="Warp") then obj_controller.fest_warp=1; - if (obj_controller.fest_warp=1) and (obj_ini.ship_location[option_id[ii]]!="Warp") then obj_controller.fest_warp=0; + var _ship = obj_ini.ship_data[option_id[ii]]; + obj_controller.fest_warp = _ship.location == "Warp"; obj_controller.fest_attend=scr_event_dudes(0,0,"",option_id[ii]); } if (option[ii]="None Selected"){obj_controller.fest_sid=0;obj_controller.fest_attend="";} diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 23e9553c34..60bdfb9a92 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -28,6 +28,7 @@ penitent_end=0; man_size=0; home_planet = 2; artifact_struct = array_create(200); +flagship = 0; // Equipment- maybe the bikes should go here or something? yes they should equipment = {}; diff --git a/scripts/scr_add_artifact/scr_add_artifact.gml b/scripts/scr_add_artifact/scr_add_artifact.gml index 4ccb449881..f15f5219d5 100644 --- a/scripts/scr_add_artifact/scr_add_artifact.gml +++ b/scripts/scr_add_artifact/scr_add_artifact.gml @@ -333,10 +333,11 @@ function ArtifactStruct(Index) constructor { identifiable = 1; } if (sid() >= 500) { - if (obj_ini.ship_location[ship_id()] == obj_ini.home_name) { + var _ship = obj_ini.ship_data[ship_id()]; + if (_ship.location == obj_ini.home_name) { identifiable = 1; } - if (obj_ini.ship_class[ship_id()] == "Battle Barge") { + if (_ship.class == "Battle Barge") { identifiable = 1; } } diff --git a/scripts/scr_add_vehicle/scr_add_vehicle.gml b/scripts/scr_add_vehicle/scr_add_vehicle.gml index 0affcd9b9b..3e3a83d8ed 100644 --- a/scripts/scr_add_vehicle/scr_add_vehicle.gml +++ b/scripts/scr_add_vehicle/scr_add_vehicle.gml @@ -40,14 +40,17 @@ function scr_add_vehicle(vehicle_type, target_company, weapon1, weapon2, weapon3 backup = i; } } + if (first != 0) { + var _ship = obj_ini.ship_data[first]; obj_ini.veh_lid[target_company][good] = first; - obj_ini.veh_loc[target_company][good] = obj_ini.ship_location[first]; + obj_ini.veh_loc[target_company][good] = _ship.location; obj_ini.veh_wid[target_company][good] = 0; obj_ini.ship_carrying[first] += 1; } else if ((first == 0) && (backup != 0)) { + var _ship = obj_ini.ship_data[backup]; obj_ini.veh_lid[target_company][good] = backup; - obj_ini.veh_loc[target_company][good] = obj_ini.ship_location[backup]; + obj_ini.veh_loc[target_company][good] = _ship.location; obj_ini.veh_wid[target_company][good] = 0; obj_ini.ship_carrying[backup] += 1; } else if ((first == 0) && (backup == 0)) { diff --git a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml index 1b6b871564..cbe071efd1 100644 --- a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml +++ b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml @@ -76,7 +76,8 @@ function calculate_full_chapter_spread(){ if (obj_ini.veh_race[company][v]!=0){ if(obj_ini.veh_lid[company][v]>-1){ veh_location = obj_ini.veh_lid[company][v]; - var _ship_loc = obj_ini.ship_location[veh_location]; + var _ship = obj_ini.ship_data[veh_location]; + var _ship_loc = _ship.location; if (_ship_loc == "Warp" || _ship_loc=="Lost"){ if instance_exists(obj_p_fleet){ with (obj_p_fleet){ @@ -90,9 +91,9 @@ function calculate_full_chapter_spread(){ } } } - } else if (obj_ini.ship_location[veh_location] != ""){ + } else if (_ship_loc != ""){ array_slot=eSystemLoc.orbit; - key_val=obj_ini.ship_location[veh_location]; + key_val=_ship_loc; } } if (obj_ini.veh_wid[company][v]>0){ diff --git a/scripts/scr_company_load/scr_company_load.gml b/scripts/scr_company_load/scr_company_load.gml index 2e077f65c2..addb38c8cb 100644 --- a/scripts/scr_company_load/scr_company_load.gml +++ b/scripts/scr_company_load/scr_company_load.gml @@ -3,13 +3,14 @@ function scr_company_load(ship_loc) { with (obj_controller){ reset_ship_manage_arrays(); - var ships = array_length(obj_ini.ship); + var ships = array_length(obj_ini.ship_data); for (var i = 0; i < ships; i++) { - if (obj_ini.ship[i] != "" && obj_ini.ship_location[i] == ship_loc){ + var _ship = obj_ini.ship_data[selecting_ship]; + if (obj_ini.ship[i] != "" && _ship.location == ship_loc){ array_push(sh_ide, i); array_push(sh_name, obj_ini.ship[i]); array_push(sh_class, obj_ini.ship_class[i]); - array_push(sh_loc, obj_ini.ship_location[i]); + array_push(sh_loc, _ship.location); array_push(sh_uid, obj_ini.ship_uid[i]); array_push(sh_hp, $"{round(obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100}% HP") array_push(sh_cargo, obj_ini.ship_carrying[i]); diff --git a/scripts/scr_company_view/scr_company_view.gml b/scripts/scr_company_view/scr_company_view.gml index da5972464c..c94a36bba9 100644 --- a/scripts/scr_company_view/scr_company_view.gml +++ b/scripts/scr_company_view/scr_company_view.gml @@ -103,7 +103,8 @@ function add_vehicle_to_manage_arrays(unit){ array_push(ma_wid,obj_ini.veh_wid[unit[0]][unit[1]]); array_push(ma_race,obj_ini.veh_race[unit[0]][unit[1]]); if (obj_ini.veh_lid[unit[0]][unit[1]]>-1){ - array_push(ma_loc,obj_ini.ship_location[obj_ini.veh_lid[unit[0]][unit[1]]]); + var _ship = obj_ini.ship_data[fetch_deep_array(obj_ini.veh_lid,unit)]; + array_push(ma_loc,_ship.location); } else { array_push(ma_loc,obj_ini.veh_loc[unit[0]][unit[1]]); } @@ -152,14 +153,16 @@ function scr_company_view(company) { if (unit.name() != "") { unit_loc = unit.marine_location(); - // Check if unit is on a lost ship - if ( - unit_loc[0] == location_types.ship && - obj_ini.ship_location[unit_loc[1]] == "Lost" - ) { - continue; + // Check if unit is on a lost ship + if (unit_loc[0] == location_types.ship){ + var _ship = obj_ini.ship_data[unit_loc[1]]; + if (_ship.location == "Lost"){ + continue; + } } + // Check if unit is on a lost ship + mans += 1; add_man_to_manage_arrays(unit); var go = 0, op = 0; @@ -190,11 +193,11 @@ function scr_company_view(company) { } // Check if unit is on a lost ship - if ( - obj_ini.veh_lid[company][i] > -1 && - obj_ini.ship_location[obj_ini.veh_lid[company][i]] == "Lost" - ) { - continue + if (obj_ini.veh_lid[company][i]){ + var _ship = obj_ini.ship_data[obj_ini.veh_lid[company][i]]; + if (_ship.location == "Lost"){ + continue; + } } add_vehicle_to_manage_arrays([company, i]); diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index f8bbb5de54..bb2012c3e0 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -79,202 +79,202 @@ function scr_fleet_advisor(){ // TODO: Probably a good idea to turn this whole interactive list/sheet generating logic into a constructor, that can be reused on many screens. // I have no passion for this atm. - if (instance_exists(cn)) { - var _columns = { - name: { - w: 176, - text: "Name", - h_align: fa_left, - }, - class: { - w: 154, - text: "Class", - h_align: fa_left, - }, - location: { - w: 130, - text: "Location", - h_align: fa_left, - }, - hp: { - w: 44, - text: "HP", - h_align: fa_right, - }, - carrying: { - w: 84, - text: "Carrying", - h_align: fa_right, - }, - }; - - var _column_x = xx + 953; - var _header_offset = 80; - var _columns_array = ["name", "class", "location", "hp", "carrying"]; - - for (var i = 0; i < array_length(_columns_array); i++) { - with(_columns[$ _columns_array[i]]) { - x1 = _column_x; - _column_x += w; - x2 = x1 + w; - y1 = yy + _header_offset; - header_y = (y1 - 2); - switch (h_align) { - case fa_right: - header_x = x2; - break; - case fa_center: - header_x = (x1 + x2) / 2; - break; - case fa_left: - default: - header_x = x1; - break; - } - draw_set_halign(h_align); - draw_text(header_x, header_y, text); + + var _columns = { + name: { + w: 176, + text: "Name", + h_align: fa_left, + }, + class: { + w: 154, + text: "Class", + h_align: fa_left, + }, + location: { + w: 130, + text: "Location", + h_align: fa_left, + }, + hp: { + w: 44, + text: "HP", + h_align: fa_right, + }, + carrying: { + w: 84, + text: "Carrying", + h_align: fa_right, + }, + }; + + var _column_x = xx + 953; + var _header_offset = 80; + var _columns_array = ["name", "class", "location", "hp", "carrying"]; + + for (var i = 0; i < array_length(_columns_array); i++) { + with(_columns[$ _columns_array[i]]) { + x1 = _column_x; + _column_x += w; + x2 = x1 + w; + y1 = yy + _header_offset; + header_y = (y1 - 2); + switch (h_align) { + case fa_right: + header_x = x2; + break; + case fa_center: + header_x = (x1 + x2) / 2; + break; + case fa_left: + default: + header_x = x1; + break; } + draw_set_halign(h_align); + draw_text(header_x, header_y, text); } - draw_set_halign(fa_left); + } + draw_set_halign(fa_left); - var _row_height = 20; - var _row_gap = 2; - for (var i = ship_current; i < ship_current + 34; i++) { - if (i>= array_length(obj_ini.ship)) then continue; - if (obj_ini.ship[i] != "") { - var _row_y = _columns[$ "name"].y1 + _row_height + (i * (_row_height + _row_gap)); - draw_rectangle(xx + 950, _row_y, xx + 1546, _row_y + _row_height, 1); - - var _goto_button = { - x1: _columns.location.x1 - 20, - y1: _row_y + 4, - sprite: spr_view_small, - click: function() { - return point_and_click([x1, y1, x2, y2]); - } - }; - with(_goto_button) { - w = sprite_get_width(sprite); - h = sprite_get_height(sprite); - x2 = x1 + w; - y2 = y1 + h; - draw_sprite(sprite, 0, x1, y1); - } + var _row_height = 20; + var _row_gap = 2; + for (var i = ship_current; i < ship_current + 34; i++) { + if (i>= array_length(obj_ini.ship)) then continue; + if (obj_ini.ship[i] != "") { + var _row_y = _columns[$ "name"].y1 + _row_height + (i * (_row_height + _row_gap)); + draw_rectangle(xx + 950, _row_y, xx + 1546, _row_y + _row_height, 1); - with(_columns) { - name.contents = string_truncate(obj_ini.ship[i], _columns.name.w - 6); - class.contents = obj_ini.ship_class[i]; - location.contents = obj_ini.ship_location[i]; - hp.contents = $"{round(obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i] * 100)}%"; - carrying.contents = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"; + var _goto_button = { + x1: _columns.location.x1 - 20, + y1: _row_y + 4, + sprite: spr_view_small, + click: function() { + return point_and_click([x1, y1, x2, y2]); } + }; + with(_goto_button) { + w = sprite_get_width(sprite); + h = sprite_get_height(sprite); + x2 = x1 + w; + y2 = y1 + h; + draw_sprite(sprite, 0, x1, y1); + } - for (var g = 0; g < array_length(_columns_array); g++) { - with(_columns[$ _columns_array[g]]) { - draw_set_halign(h_align); - switch (h_align) { - case fa_right: - draw_text(x2, _row_y, contents); - break; - case fa_center: - draw_text((x1 + x2) / 2, _row_y, contents); - break; - case fa_left: - default: - draw_text(x1, _row_y, contents); - break; - } - } + with(_columns) { + name.contents = string_truncate(obj_ini.ship[i], _columns.name.w - 6); + class.contents = obj_ini.ship_class[i]; + location.contents = obj_ini.ship_location[i]; + hp.contents = $"{round(obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i] * 100)}%"; + carrying.contents = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"; + } + + for (var g = 0; g < array_length(_columns_array); g++) { + with(_columns[$ _columns_array[g]]) { + draw_set_halign(h_align); + switch (h_align) { + case fa_right: + draw_text(x2, _row_y, contents); + break; + case fa_center: + draw_text((x1 + x2) / 2, _row_y, contents); + break; + case fa_left: + default: + draw_text(x1, _row_y, contents); + break; + } } + } - if scr_hit(xx + 950, _row_y, xx + 1546, _row_y + _row_height) { - if (cn.temp[101] != obj_ini.ship[i]) { - cn.temp[101] = obj_ini.ship[i]; - cn.temp[102] = obj_ini.ship_class[i]; + if scr_hit(xx + 950, _row_y, xx + 1546, _row_y + _row_height) { + var _struct = obj_ini.ship_data[i]; + if (temp[101] != obj_ini.ship[i]) { + temp[101] = obj_ini.ship[i]; + temp[102] = obj_ini.ship_class[i]; - cn.temp[103] = string(obj_ini.ship_hp[i]); - cn.temp[104] = string(obj_ini.ship_maxhp[i]); - cn.temp[105] = string(obj_ini.ship_shields[i] * 100); + temp[103] = string(obj_ini.ship_hp[i]); + temp[104] = string(obj_ini.ship_maxhp[i]); + temp[105] = string(obj_ini.ship_shields[i] * 100); - cn.temp[106] = string(obj_ini.ship_speed[i]); + temp[106] = string(obj_ini.ship_speed[i]); - cn.temp[107] = string(obj_ini.ship_front_armour[i]); - cn.temp[108] = string(obj_ini.ship_other_armour[i]); + temp[107] = string(obj_ini.ship_front_armour[i]); + temp[108] = string(obj_ini.ship_other_armour[i]); - cn.temp[109] = string(obj_ini.ship_turrets[i]); + temp[109] = string(array_length(_struct.turrets)); - cn.temp[110] = obj_ini.ship_weapons[i]; + temp[110] = obj_ini.ship_weapons[i]; - cn.temp[118] = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"; - cn.temp[119] = ""; - if (obj_ini.ship_carrying[i] > 0) then cn.temp[119] = scr_ship_occupants(i); - } - tooltip_draw($"Carrying ({cn.temp[118]}): {cn.temp[119]}"); - if (_goto_button.click()) { - with(obj_p_fleet) { - var _fleet_ships = fleet_full_ship_array(); - if (array_contains(_fleet_ships, i)){ - obj_controller.x = x; - obj_controller.y = y; - obj_controller.menu = 0; - with(obj_fleet_show) { - instance_destroy(); - } - instance_create(x, y, obj_fleet_show); - } + temp[118] = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"; + temp[119] = ""; + if (obj_ini.ship_carrying[i] > 0) then temp[119] = scr_ship_occupants(i); + } + tooltip_draw($"Carrying ({temp[118]}): {temp[119]}"); + if (_goto_button.click()) { + with(obj_p_fleet) { + var _fleet_ships = fleet_full_ship_array(); + if (array_contains(_fleet_ships, i)){ + obj_controller.x = x; + obj_controller.y = y; + obj_controller.menu = 0; + with(obj_fleet_show) { + instance_destroy(); + } + instance_create(x, y, obj_fleet_show); } } } } } + } - if (cn.temp[101] != "") { - draw_set_font(fnt_40k_30b); - draw_set_halign(fa_center); - draw_text_transformed(xx + 622, yy + 434, cn.temp[101], 0.75, 0.75, 0); - draw_text_transformed(xx + 622, yy + 464, cn.temp[102], 0.5, 0.5, 0); - - draw_set_color(c_gray); - draw_rectangle(xx + 488, yy + 492, xx + 756, yy + 634, 1); - var ships = ["Battle Barge", "Strike Cruiser","Gladius","Hunter"]; - var ship_im = 0; - for (var i=0;i0){ obj_ini.ship_class[index]="Battle Barge"; obj_ini.ship_size[index]=3; @@ -278,17 +289,21 @@ function new_player_ship(type, start_loc="home", new_name=""){ obj_ini.ship_front_armour[index]=6; obj_ini.ship_other_armour[index]=6; obj_ini.ship_shields[index]=12; - add_weapon_to_ini_ship(index, "Weapons Battery", {facing : "left", firing_arc: 30}); - add_weapon_to_ini_ship(index, "Weapons Battery", {facing : "right", firing_arc: 30}); - add_weapon_to_ini_ship(index, "Light Weapons Battery", {facing : "front"}); - add_weapon_to_ini_ship(index, "Thunderhawk Launch Bays"); - add_weapon_to_ini_ship(index, "Macro Bombardment Cannons"); - add_weapon_to_ini_ship(index, "Torpedoes", {barrel_count:4}); + with(_struct){ + left_broad_positions = [[56, 16],[65, 16],[74,16],[83, 16]]; + right_broad_positions = [[56, 37],[65, 37],[74,37],[83, 37]]; + add_weapon_to_ship("Weapons Battery", {facing : "left", firing_arc: 30}); + add_weapon_to_ship("Weapons Battery", {facing : "right", firing_arc: 30}); + add_weapon_to_ship("Light Weapons Battery", {facing : "front"}); + add_weapon_to_ship("Thunderhawk Launch Bays"); + add_weapon_to_ship("Macro Bombardment Cannons"); + add_weapon_to_ship("Torpedoes", {barrel_count:4}); + } obj_ini.ship_capacity[index]=600; obj_ini.ship_carrying[index]=0; obj_ini.ship_contents[index]=""; - obj_ini.ship_turrets[index]=3; + _struct.turrets = [{},{},{}]; } if (string_count("Strike Cruiser",type)>0){ @@ -302,27 +317,29 @@ function new_player_ship(type, start_loc="home", new_name=""){ obj_ini.ship_front_armour[index]=6; obj_ini.ship_other_armour[index]=6; obj_ini.ship_shields[index]=6; - obj_ini.ship_data[index].left_broad_positions = [[56, 16],[65, 16],[74,16],[83, 16]]; - obj_ini.ship_data[index].right_broad_positions = [[56, 37],[65, 37],[74,37],[83, 37]]; - var _broadsl = obj_ini.ship_data[index].left_broad_positions; - var _broadsr = obj_ini.ship_data[index].right_broad_positions; - for (var i=0;i0){ obj_ini.ship_class[index]="Gladius"; @@ -334,12 +351,16 @@ function new_player_ship(type, start_loc="home", new_name=""){ obj_ini.ship_front_armour[index]=5; obj_ini.ship_other_armour[index]=5; obj_ini.ship_shields[index]=1; - add_weapon_to_ini_ship(index, "Light Weapons Battery"); - + with(_struct){ + add_weapon_to_ship("Light Weapons Battery"); + turrets = [{}]; + hp = 200; + max_hp = 200; + } obj_ini.ship_capacity[index]=30; obj_ini.ship_carrying[index]=0; obj_ini.ship_contents[index]=""; - obj_ini.ship_turrets[index]=1; + } if (string_count("Hunter",type)>0){ obj_ini.ship_class[index]="Hunter"; @@ -351,17 +372,22 @@ function new_player_ship(type, start_loc="home", new_name=""){ obj_ini.ship_front_armour[index]=5; obj_ini.ship_other_armour[index]=5; obj_ini.ship_shields[index]=1; - add_weapon_to_ini_ship(index, "Torpedoes"); - add_weapon_to_ini_ship(index, "Light Weapons Battery"); + with(_struct){ + add_weapon_to_ship("Torpedoes"); + add_weapon_to_ship("Light Weapons Battery"); + turrets = [{}]; + hp = 200; + max_hp = 200; + } obj_ini.ship_capacity[index]=25; obj_ini.ship_carrying[index]=0; obj_ini.ship_contents[index]=""; - obj_ini.ship_turrets[index]=1; } if (string_count("Gloriana",type)>0){ obj_ini.ship[index]=new_name; obj_ini.ship_size[index]=3; + obj_ini.ship_class[index]="Gloriana"; @@ -374,15 +400,19 @@ function new_player_ship(type, start_loc="home", new_name=""){ obj_ini.ship_other_armour[index]=8; obj_ini.ship_shields[index]=24; - add_weapon_to_ini_ship(index, "Lance Battery", {facing : "right"}); - add_weapon_to_ini_ship(index, "Lance Battery",{facing : "left"}); - add_weapon_to_ini_ship(index, "Lance Battery",{facing : "front"}); - add_weapon_to_ini_ship(index, "Plasma Cannon"); - add_weapon_to_ini_ship(index, "Macro Bombardment Cannons"); + with(_struct){ + add_weapon_to_ship("Lance Battery", {facing : "right"}); + add_weapon_to_ship("Lance Battery",{facing : "left"}); + add_weapon_to_ship("Lance Battery",{facing : "front"}); + add_weapon_to_ship("Plasma Cannon"); + add_weapon_to_ship("Macro Bombardment Cannons"); + turrets = [{},{},{},{},{},{},{},{}]; + hp = 2024000; + max_hp = 200; + } obj_ini.ship_capacity[index]=800; obj_ini.ship_carrying[index]=0; obj_ini.ship_contents[index]=""; - obj_ini.ship_turrets[index]=8; } return index; } diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index ef77064493..86c4e3eb2b 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -235,10 +235,14 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ instance_activate_object(obj_p_ship); instance_activate_object(obj_al_ship); } + if (instance_exists(target)){ + draw_set_color(c_red); + draw_line(x, y, target.x, target.y); + } } static draw_weapon_firing_arc = function(){ var _tangent_direction = weapon_direction(); - var _facing = facing + var _facing = facings var _max_distance = range; diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index c8229ff8a5..23e6f39e93 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -726,7 +726,8 @@ function unload_selection(){ boba.loading_name=selecting_location; boba.depth=self.depth-50; // sel_uid=obj_ini.ship_uid[selecting_ship]; - scr_company_load(obj_ini.ship_location[selecting_ship]); + var _ship = obj_ini.ship_data[selecting_ship]; + scr_company_load(_ship.location); } } } diff --git a/scripts/scr_vehicle_count/scr_vehicle_count.gml b/scripts/scr_vehicle_count/scr_vehicle_count.gml index 1cc616be17..7d24c7ea71 100644 --- a/scripts/scr_vehicle_count/scr_vehicle_count.gml +++ b/scripts/scr_vehicle_count/scr_vehicle_count.gml @@ -35,7 +35,8 @@ function scr_vehicle_count(role, location="") { } } else if (_ship == -1 && _planet == 0) { if (_v_ship > -1) { - if (obj_ini.ship_location[_v_ship] == _location) { + var _shipstruct = obj_ini.ship_data[selecting_ship]; + if (_shipstruct.location == _location) { is_at_loc = true; } } else if (_loc == _location) { diff --git a/sprites/spr_ship_stri/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png b/sprites/spr_ship_stri/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png index f7c8e431c0f4b6059dc9f66f6b02a1c7ee8347ef..69eade3752927290b227df3fc5812493fab90f36 100644 GIT binary patch literal 10308 zcmZ{qWl$VExVC}f?(R^e$fAqe;;t|54vVuui)(R*;tmB$ad#_Tr0C-AE(I3-`u#aG z=f{~$a?d1lCo@knlgyPTT0>193!NMt4h{}WQ9(xQpN9Rbyr{_k+9thDf`3A5rJ$t> z2j|NK2NxU;2lw=^EBFWw&Wj5U?!+7pPB;?|j>IjuLsRtM0J5dBybRp?|1X8z<*9IR z%mRusQaYbk&btkoa+kagA4CrQr6;{krw9(NLut{_OBG_f=C{64t~Q7yq&6*Bd?hLe z=uzKfPD$tAB$*l*7`O{Z?;=3}J|dR$4H;`{rEMQuD?_?=M1yHjjeqy$jb!)!c>3?$Adb6cr)e4}=Nn;gyf>?V#K-%R?fO*PUfB;$wV4t|6U8Mfj~aR*NX)M8jY#2;qqsyjSi=D{ga;*DzBmIOUe~I6=sTX={O7&P z*90Wx_e5GHKGz=agJs(hb_fOd_Q9`M0?os$FNsP>RN(D6$ZdR#`1+P8d&!J0XG~+P zEO)IMb(gBxI*hR;jpy4(8>pet{5WUpx6;u7cc6`w8|; z((w^Z7i23jI7n@T*WyeYdoBB94xj%;$>k^9R(E*w+^lc!u_mSH9m; zygvY1@h`l9LCD2jJ5COpB&Ir9@ITLM&FF|g9jM2&lsI&>SRZEVhRS=cI>V~~ZjHcT z2nH!t2>-*q8wQh$TSZ;-)y{2@?^)nvKOp;MjU&t~JDcqScE(yl5bnmMiBV#uLT)jO zn*-qje$?KGa1))K!d_JRma$lA(iJ7*f$601{Dje@yZO|LaQig-L@t z;ejLkPA&YO|JKA_0}>_O%nzD%u+_DXE^KWmC_?IXJ)pp9{|VzZ9%J)urYDz5+;^NJ zKg;t*y0o8IOQAGF`hi?OmHtJvlpBi31!?6>r4W~^b3bU>C6Q9vSzPIg4m-T?e(86O9+DYiW=oNoyZ zUulHzxAfj8-nYTi?3~VjD){S&MfLtPQcJ0)k}F#h)@z_zB_kj!3B|e1d?vi1UJT_Y z2lHvB;i7n9$D?!p4sw1wI|Ya`htt~g5eru@icL?OgwUNk6>NOIRag52h=erqPOcYZ z|7{=>)hbn$3YAStvY-tSYsX7d6kJs?FzIT!N)~8FRzV-$AsW6yFQG;JA^26qzwUhn zu#;Y{0i(O&?G4c;_2>SwTcv(_W!H!wXu4w?JMF(Kq8DwQtdoJKPx;YZXOqi_j+;0x z2^C%meW0U{G``sc*y^YM{PtQbC`+2SvVuho6%&7kF$V=L>f0}zgq`!)K5$|rvoq&aJ0->{D_n3n~BuakpCW~!OGF1Lqw0Kgd zeTlb9@8aMA3_5%G$&VIsgKPN&%_Z~muQ_XCC2SB3Ls8@@iQ4#-aD#SwYTrV}LY%qQ zoWn*!lC&?jr}QD*LgB;~D#9E4<#O7F^$h;f26n_+cWh+ z{QDuzJ5-S!`#f7azjsEz_sOby_HhH{pw!Ire3nh(hJByJJ@Q_Y3k!YUB9457MnbKr zUDCKW#I11;nOPwWZdsqH^O^CJfPW6?)U_HEqGm79it7@xHqU?=aB`V)O%(BS5F+b# zz97*{()@O3?)Liow|1jC7k6&?5t;btn*&>P9HR<5o00R|Q@S&-iq-K74uo24j*>?% z6G%z%fEtF(BM?U}mZ0xy8P{(+l4MFfa=g<){iA^dPZpKVHNH@S`yedmNIj{4omnmZ zOyauUoJF0cjOVp)WYg~Hu`*dq{&4fcpPf2rK{)+9As`*=akI zEM{;{e_$Dr{gDXdZ0S)c;!(120=NLDx9+jdhUt;OZueBOzDPXRvY{)V@-r+vEK~3& zN*8R{X=tJBm~r2tcEYPE0AhaUzx6KRTyuJWUx6@FXrg_s_m`bhIycEY)7Ky zD9EQY6aN_&dK?5k4pHsjm=cpD1Q+WB?L9Vm**RZBD|7Gj6?ZQ@5xA>(WVNcV8_I;j zCEMDUy9@IC4#qocr=Q0trXBL=OF`f(T&$CH2@wyy#i1Eabr$EO*>e@#CLCU{N=-gyF6GDg)Bw~rah4ULvAgNsP` z4gm#zyZO1N1>~6BYJP8JB%9xPM8hvTQ0e+gOC3VFiLEd-Q}D~b639PrKmXz$C;R-o zPVq9AVeZZ*$1ly zPhFtmUyMq3lgWgB{n|#cOO${OEk|VZ#_xWcp&#s-ezPk_mLG1rpHfa^#^KJkwN3o} zc5oKac!>*+CK#c7d|9g$i?kDb7-)sQU!@v%^6>d>HTDW9`$fm+2qq_ z5@J-&W=~ndGd@^f&0cr3ff?72+c=wnPyGZqb$-6tAYj;`(C36O4ScJos&*m>YBoQ_ ziIgUbDdT$dfC81ii5tpSw5*bJ&Z(y-P_aa$^tT}O7we>Vq+GR9w{vtJywhwM$-JW9 zeurgI%U((&ErV`np_-7`8~|I8-8 zyn!uJ7x&EHe|n|c?wAy<(8@(41R64$+NIo_1Gnw4!VAzb8Pa)%LZ|0LqyhIJRj3Ot zKfTuR&a;7>JhIyhWiu_E+Q)(G_P|@F&7eck1TEwCmQdB$(s z#<4eqTA!L)!Y!1_R}kAHG!2}5Vkar!9cm+{)Mg$3)(zAB3EmA$mGAhNyTeBxFU10Z z($)Yhis9h$zB&Q5Q`D$dW8EktYBBQ;rk>FNCC5#Uhyt~#jCdf_S;p@j9uaMt%s7mS zGFG>rif4up^1L(n5@?~w$CeOuRF$=U;V(a%e`#int;;)?d`WeB#NFtFFFpV=MbE6H zFt)zJ!-Fj2WCgw*o4iqH60UC)n{-DTEz7ojv7l?aSqfqpYwkprp0w3)NfuOW_qPcf z+Q)kF54pbwwj1M(5Nz30xVoe|l9H0q*3``WaAlxU^lFs*+#FJAVo|5Hr`PjRu~wvhJOF8Th(-+rNp3e?g4dZfSF|H#p)T;J6pVKq>x) zRFfN!wO}KyyPx^`*Y2_3EFf~SnS3xzdyg_PKHXU~btsip_!w`Do9AOeQFkJ)92KVk zN>YM6VE#ylA-vCvNb61;DBP?-hb#OG2kDDhsF56Y9Ia2@*;40U^2~!zK=i&z%T9Rn zI$bMSGcq_$LWT}J2Pl)Xt5h~VqDd0MHVKzvqDw1=3-$iNpH@_AxFXT05A3W6v4?i< z#w4eQ?ysUKO91zPBbI?NORuOj{AyRB-T*!e)fhA*%ml1@@Pqq?-??lq=qn?(zUZ@< z+%R&biy4Ds?Vr`Q;N$8!eKQ#%rXxt_QJoa)2MVxqDJ;OVeQeEW2!zb~Q88tv(wR$$ zUkX>|5r$v0nivzuO=^V}CY&R%DfXIr=fCvL0$e_faqAlD?%<;>6Nr;;(g>*yh>cyU zs_0kOtR&RzU!|o)PWWByCt^K;b}CSlByqKhS>3DR;Fh_PC18*rbRlis)=ZpKC~ECZ z%6~(vyYIFmEJUWAjtdT1ZwqEmSbrnT-%a85>X3@UW>Dyav~ZTx-^Kk4kfyqC#relI z5PTLSO4w_v7bcziLYvhVb2@T#fo%e=*9u9fI|!JV3F3GPo+QRgke4O*PLH8Hs&O-x zby66Vt5p@ju9LzElPT`EFNI4XpL8UVQW){=dR-LxY>`ov%$^=IF*SSI6qY$E*5}JR zbSoDnCo%n1qhdpLJd3l^bm&R?Oz5ssJ5pUd;x~4EgRa%}er@CXwLy#SQstQ+{^mp9 z{UP51s}V^-uL#%YvS^|G!>8{Ys$>b-3deQ(f3=4eL81F7wSd{9&!~AC$FdMZFCE() zzUYbtLkPL^)m$K=IY<4vTqOUR5}pM?ia9~5cM@pJ7MYAp1jM?jK65mWKb+k}vZI`6 z8W@^z!&1sYePObr**fO0U!rpY@j;*wH~zeJf>p>S1$ zyKWD1Mnk$~*0F`p-LJbnn_RjE#uq$MnIk=(k|P(tO|2M}cklelJ+w>qncXgor*m@V zI1YOI_0b5reu0*(iJx>ClSWxX31K^Koacv!JMcUBE=n z$oqtK!Fz2pBg6x+b+w3)pmsG!-6me6IEI7M{~Pmzt1)dD?ZUS_UzFWX;m+J^U<;nq zQXU*N3D0lwKlYjtHp`%E^p|^4est9}^!&sY>;zKrWx5%@jq)A!ic}d8H@MP)G3>i) zc-r(tJ<5?2#C<`Q%2DNhsdO$U{vMCQoIW^xg`w6bR?ywKf@* zd^=f(3#c~c@(Z*{TBr9bq@gv1D-`PZHdHfR^s~s3XvMIG5a(ub zSomDxN%)fcmzo77vl){>3(onYKbu}(_R;M!Jwp?#qh;J z2XBRL#rb5wb)FWPQi&6iNEc5%jfE|qJ6TF$ z%#=z|%xYKX3-%=|2^e#I@}Z)fJHzblME+(k=t`n{=7CIw@^_ArA9CM`yby7X#4XtD zvATU}Loo92;HVVM)P}|-FwN}{VV!HJno_cidmK$uYYT@8g<#G}-af0W=@3tNqSn0n zqZ44x@C6$fpIq9yMQg8w!bS)b3C;Eo?PI$FFiRvheJd&weS7+t;*xiN@C7$Um^cM> zZUb?f781jSwtge1Sex)0yRMKx)Phw{{aR3p)c+bD6k>d<@ycC%ZINm%k}3Aq^HRb>I^QL|AFPh* zqWQUv1g3ZQm@<90P^&2ZLzf;zRJMDZfboYD{+hH29sQ^~Qs_>gXD~3%NVUD?>~(y9 z()0uT)71o2j@KXIS#@8A%ctb`u%( zv#$jR_1qB@5b!*^^PmjaqT@8lE-bMcA0yY5tZhs%3&0xrd*uDi0SR8JF(JVhg9+_W zb@qI2j%nzQoDnE1Zvt8Snj_IxB0@*#Fn=b%@>*)Yx3xUlaxuMN13sN;1 zc^UwUk|zEntjd4^TsmXLFYF>YB=v&UvEmMG(QH)VRc^VQ3C<;_B&-=@{;afozdiXmy(=F!bVpFf`D@VB_;4?^L88wJHIa1TsKSs-eXM!0;SGpR$h79NQ+f9A#LlC52^i64^!zaZ%LB8!cEiE!#k zRppLfW@V@uUif_WGBky>sPC8lhecA55BiIy6FJ`EV$w3A9?ZTvT7WZncUuR$@P&s* zJEU;+K_NXh$%Te*;N0#tZH~D_M&kCNzW_9IIW$8acg&j!4J`gW`B$;VXi^Ln4M_Km z`fnvcX%&V(YyZYLJ2@7}eAcLn`+U2`KLbi*chyJo%&0>tnakt8(|T+Yl>dzgwJ54M z%4yi9di7wE_fP{L(u%#fl|G`mFV=XqBF6S&hk#5+q=Y(PDk#CvFX{t1kWwncSF-T$NOST@D}6f4frti0Lc*^z5>uhgDUA=0{)-`A6en-n#c0c*sg^SsH2@ zq7{}fzj1qyV)wEIM+>7QWhTqC|N}t!I?#VkC{#`foG7_4r!Zpy(-;cCBAIK36Rp7Bfl- zQR7f8OE><<+=8I~F!$$T^n=34DI5Da7r*ZA<@=N!Z9LlC+mE#1G}^K)oVVo%`)JB6 zV?24r;ORT-h$>}3zKajA07=0m@N!CUeE^!Px~tt`B>iymYClT;Q!NSzDEf+Rp86KP z%J&ZuaCb9(I{aIbT(?kLJbO$9m&JH?IngeP9FpMIiYla9wJwbstJ?8eU8FHkiYAP% zunNws`ygz31gHqyuFB!i&h<}f>Xw4)%MWqvw8+^@K`ZM&o8aF&-WdYIRIiX9b`IE} zrd0bjtiNA|os7*yiJZ-PBv{XI#;pp(hp#lEivib^(J2Ue2&kcmEk-898Le&p0TC|6 z+_O?>Z9R*9)i3Cd<}{h4%j=8@z0=FedhU$oNLm|eclvP=-c=EFu?uJ*nDs~^@822B zszcMl9^Yg6VcWUPsRM*RClnZYIe=-lvpCkbr=R$&V^d{w?&suMHg-EJlLpL&CiVrd zi=vBKLT?f6#yygke|rU~d`@ZCvfNH@ejfkikii!402iAq>7&8fI4m+68 zHgkV!i+149a9h3mp}Mn(EN%7d&MPG2PqbL;UfzNV`ELyPGkq*V$Qz*fS;LJ@XT;YDe^h=hq6l1lTBM(%XH$tO&E{tk645Tjbm z$d3qQEH3G@wN|3^&PQT75N>>0S<3%Y0c$b}z@}AA725PfYpLBZa6YYl`xALl-Kk26 z*}bxp2L_rxGt(I6C8!=Yw2Nwjcja}RnN{2)+0x2!=t`w)d&27x_KBc=*10cN;=-!} z_Wa&QPM|<*!V$oIthsA!ojC_nft}kYmR@q;e zYTsXq=FqCTb1&usPy2CL$r6ix!8*;-{D#Y&gQ*F9u6jo~_M9DGUe(Dba&1OXWD-}C zGTb};2Fe((OLCks`Uf;h&s6dc;Kgh#uwb(wcz~4x1SVylP|G!!rBRh6az+(!dY1Nlt;my9KXe zHMy^JdC*xCf1)fQb?+M~>+gti4+OT0<`Ezy@R^t|LNd+n_U7xQI+eI!0z=Uf#>#{i+8`nzYDIaa@7{xd*T%T&)y9f<>-q|C1_&yl5V`BZpRYbGcDM)(fK1 z{l)jy`|R&-TASzY-3=`9^5kMsSIsr|`F>=xyv5)5a9kdsRL&LpDUqP1YVXtBUgEn6 zkJU(23+JrJvmNTOqzkDl1jmpfhSvcx(Z9Asf_=ghCxP;sZ81 zsFNL`BH47Q6Youq-2z;2DkMllxw27&4)C&@bOgkwlH5q;AG*1|&p}1kyPsYf;ZA1o zV#l>q7AsqqxaEq&uqacv_LSNJv5ysAERiIbk0As+%Lv_*x8^uSUP_MaMt?cG8M{xf zflE^otH#fdU~=%K*s8wYrBy9j3#T}RQ-FW1oS)V9^8K*958?P3+$RapTFo|-`@b)| zBz5>0EV zH5FzmwN2W`_dbiao^HL_ofzfZDr1lo81;UBV_xKV5o`x@5i(O}PV9RMD$TM=2!pW$ z@i=(+fUTr1>{@86>{!&2ahFWHB08n!Gcv}{RqqiMD-TagwO#j+c8Y)ns(`Jm-xsNb z>Mzf2Y<6`bdZgmlG_$K+;rd@NvMA`Og{0K5QYdohDoh!IZrGx@iUaR+F#Za>Jra2J z4Sy(jTdUj|>{b8H6}*V-SyjDp%Q!4a3P#)##$UqIM|8Jz;Xgp1KNpV+gdr=ThpMR< zoO4Y@*m>h%#M!hg_xZ95`%3R(Bj6Aa4LL*)bO>dH zO0h&J4)zRM^D`Y=rpp)dma^62n!tkI|Ges6sIyHLPL9X(zrcrRH3Z>@HJkGf+lT7} zENY#K@U^v|Tk*A#r9m{5)`a`}i)V0A9{-@bngs?*g|FUfDFT5l2R<#{7qH(ko%e#u zo#FxG)BDe5#(`g$L|!YG`LLtCb(a?m`$@1VBHRrFznlG}Bhps}Zv)~<;*-wx!(E#~OoYT?8fpdjt;N$R_c)GyCz(w~IqD)0H7`Nh7ZZCO5%ukB zzXr=^+m@!U$fRw}voEIpgOKlJFh6T5)rN4hx`PSQ=)tQBh|zec(1lp_89aaJrq-+7?6L#AxW@j= zoRNtygPFt54Zv7$eHU+lYB~mx8YQ`nIZL9NuY%Cm(>7G6f{5;ByKJLc4g@Q9(m^e{ ziTJ;$4u&txX0U&FV6(gIbT#N9-SxP9c#iMmzq|y}AE&E7H}%DiQSGz$2;AXDH^bNT zJb&=)FW+n|lcejJZ_OM!-7M}{P{)jg-6okS)Ea$>SYG>e zZTAoR-0N-@D{?!~5Q5sFe01mh^-NibM&Rjo*!J>x@}__Nm))T`&DUXo-m}=~I|_AE zb1Y`l3G`o5-A9P5KE&DrVk2zjVe?Pmc({1@Ik@;axcPLrc!l}+g?RfLd++VBcZp3DDT)+D^=3(i<;a#L%d%xF zvK`xTT$0dn$|kdu>|`~&zwLi=_KPP+{^S#_CNrCn#xuU3&-pyy;R3{a_uTV6=e-NQ z@WOL$2VywJ=tKz1A|IEumv<7Hxe!Xl`pD)D!C1ZB1hhq;dt5kSy~* z@8kTwJ*CBqbd0*{G%}lChNbUqDE)J=wp>SW_!>^^E@AWNB32I1VsT{#Q;XAZhKA6v z`Z10kKZd3G0W8k+Vqv-$^HbfJo$Mm?V1D`$=B9eEINOK$g%RZVO2OBcg`fBFe&3$b zlG5Caed1@Zjeh}i&n?J2V^9azAv2ah=LjM#ry7c!S||xJYZ(&w>EOz8pwU^NGg}`+ zAK99$Fj%u-&dPzwp2Kdf4kv657X*CK_eA)Q-eUPGMr3aVFQW)4`eGz0a*&jkPg^Hs zc>|;re;W#pK$?rD&K0v5AE^yB*r@+pvy2KsNI}rGociC74F(dD9ilo2xKu4#85rhh$U5U)AM! zp&`s85(pf_;OT3@H`J3lbP_2l!PAz}dx#*qDtbEJl6cS71V?d1OlDIUR_3RKPf@u1HOjXBfacTx1A|xogqa)vjG5Q|8GTp& z7kWqU;7+C&x3zAJ^_)R=&D;}bu%O@|RP=egoGwW7r(o#1LuG=LB5xFm&Nq;#4?*G@ zhPrAG98w2OE&-lRqPA$`9y>;$`f5PlbU!d>Ud+6PI55v0;&~^M{)UAJrs#ZB%C}(~{ha(kCq$(iP|y4diG~Wu{PWOv z-U8QDM+CVIk$(yY;=X%?Fgd*NPW%Xtsn202qntJV8FHt-K;G<^EZlQHhjaGlaLnx^ zcYYu4#jlWm=$G&;?jvvE7jQ3-sh+6^uT7xhCyouPg8)H6zyZT9?cOmFGeS@U-regWIx|r zORs0LK0uP&50S1A;vgBsfd`0}W|NO7fU@KWVg;Gt=|bS!njtSc3{HytJ4J|OK0ll! zv+Z*;%c(31BU-u}(A-&%rjB~lwb!Adr4H`$5@=odkUHBT${hs9)Q$v0 z6ATqJ>s=j4%w`~WcA&8D6gZkvaO{JW9?I!toJV3tIpQ;_AkA)ryKNgO_D;kq@{v`$ z3`5y0RO4Tw`s|-z$}ahv$-tKx7^Oasd0L+gTL8|w*{7bwB!QAlUB**YDK*{9$n>5k z{w=Px34*{uXbOg5t671x{sPj+K8Lj7G9{}T1V*kx+jttHvP~pLCPVLC_I1_RXOA%Y zDQ)Tb$R|i~^dmjA15@=8)E@smTF?9=`L}<<#+^T*Yi8@&kRduY&bYF(fr~Gn#Ely# z2zxAEd+j7%y>S{>UOkJm*Un&mi@Zc=0wN~^uJ15-{&lGRW02*vA<4G^nX3oxrZps4 zI*?p?4k;vk{@%0TSbM>7j6><}gRlD}M1eKL5s|X%R=**`7c3bJS;4=V4BEVQn z^#nO8$51x;%2WHO>=nqZoqy_8%iPci3VP2x@pBSQH4v6=LR-inyM7I+)n}mWd7Jia zfKP+(>AQ^d%5?||<`K=$povn9)Y@}Iig%&xd+#yi?Ki=*G$YkLNd4x{CYvUc&wNUdH|VVcdW4D&D#OLtK9|jLUCa$I;7I zkyY9czP3kd1xa=z(x{)e za~HzGRm5f1BKsRC&cj|c4_npjx2T+jxj1qu ze-K=;<}XwzK9T3wS)I?OgvN7{{5^9Mm^-$FBYP{@K64l+&aLD0#R!hz=;<{~ZY-d7 zXaG4yDl4VP*h5!=2E2 z+ldUvAuQTNTt+2D)MXgU=b$Ds1a|&_G;`pI2Yeuw$3zTTLQ2|xOrns9O%&ZS1jpg& z*g;G@mx)Q>G4VX z12HUF66H>43&vm!jv=dN3FeY9xSQAEZa4&6#XMY%>+rT5hQiqeuF?fV@hEcZ7U61M zgSUMH`5h5#vfDiJ2-dPOXmTo^@5MJwP97X(Rq$5TBfq)<`IR+rmxbUgDTkxD6c&FG zbe=-A4)o)4_!Qo_c?xrj<4DX~L~8d>Anl`QHS;M#-P72+atU|tlCr!T#s}|R!+Uox zBYf>RbcKCzwjLw1w1xQ0YS^onV5yjeyx}5pM_z?cWq%?WqB$Z)Lh@+{&7yhx$1qn+ z!d|-ySLYe%Lo@L79EX@JRSwnCv3{%}YDh|C#3f7L`?@Iy~LSp!N-*c<3zLeP>|qyi88N0>fu$9idiuN8W|Yp{funj3@}grT_irGhXb!=?T_lr1Oz}>Wft;gK zaRF(4_mI~A9t$azgjkXO`5EY7sShWLHBJbN0)FP_KlOBbu{@8_`B~h%e+M6Z{4Q2E$R7|HM4cZ)*#03h`|iV4H-zD}H7xHO!P<#O zIJC72=HLts7$uCHUT|GAh)XY~G%*5=yOCUW3AyoFnmKN8I6}lGq##l01y@&vBtqm; zw$wvjrC^a=8kd~g3v=ZXyo0a6)_wx+t}V!Nn^C=Z2g=Yfq*iQGpMK;vte{}$4g3habT2!5Qw)tzh0c*#Y@+vUL1b-2^X_lp>o^K+{Y{ve-wj&jG3(sRCM(sF?SOD%48ivTt zKw&F{+3Sa+&<9s(A@a(LNnMIy_4&b(*}ze_5U(nvSzrWDBU&_a#5-*l|E;!~umH zQItZWs4PTTTajSy1V>#0IY}!&r-$VA3`+(>XbHJp7a?!H20`Hhk)aBWtM{Ov=Rv-9%um~eF;it-bQxyB9Y;B zn1>%JL-|A)#y~$xnU~OY_)YX|yovs!chI^>-(RkKzSmb0lK9N(&L*Y~P9w`#hU&3X z(0l4h?iy)!S72=SE)0c~9E`Q(fV=4N05Q87sX9MQL>9fx1yxohE9a`>Wk~X;U_baZ zvR8fw!`yF>IrTMk)4zgw;kU3Z{sy+iU&B26D_G}#4cqk3;9U4Qna+KrWOpFeH-lJ; zVzH4clljw#wlpFts|!&%eTb(BnxHO*jP^%ndn(n|2pQB=hm8%VNEvp(%jpJBUyicr zo6y&7K|q6@>>Pl#ip(v=PYEf7uy_@btD~$klu*>mpFoO#7HOV7*3?RUBcwW~AkS{c zfT0+2dR@`}I{BINaMmrLcJ5 zD7>w!^x6?9g1dB1TiJagT@ftRtE?GylYuPlUW2umzPqj*39>9kqRV5X1}`JjI+=LB zlF?dRj3nL8q?!GUHmjJ0+7@6`mO|QZd+Ifoe>E9~s2pTCJT%)2P}sZ6u0qOaeHSuE z9|FTyU~afXrYI7PreP?ZhoGu{3lTPk$Xm}O%C6gpOC>Tyz7KgFRnZWl^p!ZEtEBQ_LtgV7szx`U%L_qjDW(!SLKq?yBvK6i z6q=zgklAzvWy7aoBvZ|`cEVV-in@)D&~V~6a87>=F%iFX;yUbg#}JsK=)L?E%9p-E z*`a+DQ+l&huKjI^BZezw;ze2}PN-#KlU0nIVwRFa(TcBTVg*`;oG=reqG7b&T9UUy z2s6EKwh-f8y-2UVMrN)Zw#E}kFIq!7nImmr0@}hUC`wM!3|dBB+YaQ8E~HmogVH+= zd&?Q5m|LJHhwSXQ1V{TNWHn!eq4pdyN_Sx{KLbtUn~-#U0!`a{XsF)C@rHv4RUD@Q zSt3)}0`Kru6fiH-EW3vMfiSA)Z@}As5&1Mw*5(})^D=C32S^8|{AuOl$^AwsKPQpxxPy_7skne#~X5h2NM@N{J;q!f`FSOPDr6x@psL)0y7MNLrmGOxTc9kM0Z-{9Wocm-3`N$CMj*`UN4(e?j!BX-i9!v- zm1Hnn@gs2P`GJ_kZ?CB88+Q@h{58BQB+K1*agpR{#nA!h#7FR~ehv5XFX37uEPsux zna|0oGcZ-sm)80rqXQQhLNL^jYj(H7R5p$bnk6dl0DIY4n%%$>M{2EN(}37q2~+(p zB)KCfJoJ0iZ9hcS(T6Bo{}X~#F2>5Yu;m_tzv~0Yx<5r()gE3g>B1kj&fseKAdH?F za8zETQC7DFr?FnxgB@Q7Jl@C(seU9{+99`hVAEcM4ofW*+1)to?Leou8@YqW5m>r} zjQT?mY5bVUsmBZ%%;3~lm}tC+lQUN_zWo-|WDX-&Lz7f~Xlu`t*&{Pbs**_lMCI;5 z9&;P!3_qH!rFeg0761Fjn|Ls_juuB1^l1)AC@yO2ExWBmc&SVIZN08RNpB&XR? z#OxwUk%vT5CZW-Xw&8xXj|`xl8AMg*7{sO~a6M!&b=4ToAH{Zd6YPO`RvGfBTy&rQ zEhNY`lmEDknyp`<>&)*^vhs5%C|TJm*U@_T#~3~R zC5yq6zd-2F7f7|%qi2#~-}{0rFb!MJHCTFHfu6GO$;<%eYz;8AT}IB}Ysl$+39iAb zaQ0t8R`1JDcm~MitdL2pfw6oVsU&@d>J2IvO+jQxRymEi099OtM8U$Ql!r0s2%3{_O)-)f)1AKv*0cd7@G?U_Za z!h-~B4-_=`N3!eivY`lW@(d|t&=Ru-AgBF%<}wUZX;9G2h&&##*TdFvgd*b}(rXVw zOr_(5t^nhOTgd78DH!h>RvI@kLMBa3F;VO!WuQ`~Au`CRw53v1jSQ-W(nS8)TX4~P zSF!^5dVC50=jPjZ&^3lpQ$B*qEGWtON8Ts2x08zXu-iC^86wXpVp1{?MFf3OnhR|W zmCWK6jLeOLnV-Pu!X%mp$*<_EDHR=rA~S>?OC9c{yOHgiMCsrjkzo}T>t7+eVI4zb zgIM2~$C0Ci%>}Hj&tdiOEV4qAP}iJAaP?Q{IscE8R(=JUXA(LZoBYN#6m=d&QP*+! zJ5RyZ{1Q#-!iVz*$Jx(%;YE^(D4sGLotzeqgn;DKT)Pc{o^pPAF?$(VO=J)lt0AU?aWt$!LS~Got05V4 zBdg^!gw_sZG`$HO`G`y^1ra}?Z@mX+?aRokxr$8kB9gA3K-YQ~2dO^4Qq+SPGJ(p{ zJ#h3P%HA80hK?hPX0(e;TRN4H)ZkHa_*=Ap8{V3euo01@v_H50989DDn)Zv(_3T2? zd=Ap`V<>F7NcI0MDBAA8+H@V(mdntUQfkO!wBFOa)96i2@?Y+ZPCJs}Xpyc9Pp)zrv{$3|64X?vhN0GH`55a*w~Qdy9ikqbepn#RNj0VOL@Ru7elL5QA8L2t#bO2qH(dQr~BFMUb3{B^|$mqBS_teKkp!0|! zLd98|5JwUmM>#)^5=;z9c#JY1u`+rsHHTd@kdWpB}VqUBxko!nj!;fs)yJ=OcTlhXQ&UZ z%6??!2a%B*LXvv{Nv>HcF*ISwK&pqngsSEuJncuJ^K~MTCRIGebB?{AjjJ3h8ENt$ zJUT{hdJ&!TgHTspA$59%O5*EmWEJO*LP(|V??Q%1npi%ziB76-24?_LHywy32!2Ej zR6Zib3_YfqpHT*7ZW}A7B6}yPNQh)J2!$aJ>9!K2P)${kE9Ymm!#wg1%zdwuPq_wb z=T#Q=zSm&uy9s0WO&GceWRP?OO~*}ymhL0FaT#%B#Nrz+6RseRlpvZsLNuMYsO%oZ z(n(4nwNeHT(~0jQ1Gmn`#&q%+j@BLU?aef>-Qd!|IJ#a!R{bgj{yFM12ni8US3xRP zbco{SAtaIe*VJ8vl#)dxN$?!qP!|vxM(+?|2EnCrmX=Y3zDz&l&OV3&3zR|@Y1a1A z0FeCV_CikITT*=z(IOq1XEKD7lsOP!7 zffSW*f}b~vjN)my+qRHGCpr=nxs=tN{jbu1oM12aCKI{k&Mt~<>yQ*5WY-)dW(2<> z!y-xd6u9;_q?0l@N8chc3?b1}ixiay1w?)+{SBf2Q6!bqYsQwVNG8>bT!<1A86wvi z5_2cO^BqBgu@Uh~9~*HK87#=`%S2sc( zT_|sELS98BTE>RZFfxP|rXPA|J`%KLnGdP8OGED+k4^kqlt;lyc`>(^pVf3J;N?=`tx(J5uW}J|cra3x2Ae zl29QO#XFBKNt2vM)HHAAr|eBQb=753%imDE-au&T6=deOLsL4B%<_3?{Qc1QdSR$q zf`*9myt(i~pvZ$jzzrUs-(A_>f`zSPIC}m9wlAE;vGZrKd+7qsgs#e4Uzqq4pMF{%I!XbDMrDG`HapE-vzdKCf{A@~V}6%{D1sz9K! z9R9LWGDbGUlKWOt%#u*bNisE4yd9yMPAb8XAUa+^1Sn<~$s|%7i>LY-Szw#u9${Ay zMV5aoZ!UrVAso`LH~B^44-DG|_Ts|&_qXgm*oPB&8N{bDk)oK(Z38&$?;$o#9|8)|90 zz>*=b^b1r^z64XpJM6s)rGFWr$yZ>ijjRRz0Ae!A0*Z#R_BWuO{Vlt=B}rHM{MF&l zO-1Fw=qrM)Ac(9$39^eKpvQ$l*b9nb@c3c&2T3Ug@$#!@aq0Rw+$(^L= zG*2L-M8?Kn)q)@1IFBE`auQdr?&8WzJGe#&U){m=myg5b4wCb(L1rl#BOldv-#DDD zYv9YDdw>xJ5PP>Uvd%D~43RXETCl(-0xlWIH2)Y}6ZatWO*~QtGM(n;OXQ&jsVog3Ij58L zC%W2G;F{~%wTda;NpM6O_U2OLf{@fr5u5ytzU?(K&Yj3(?jqQ~i;U`vl%noY936qN zVioEDm7c%~>qDgVm!TT^5b4ZMkUsJ;dy_0y^qlWe{JAxc4q$9;7KgUxarpQmHclL* zXcWOAEbkn`;L;?59W8Jam!Yn&4>bcrs2?1Hfd)3Y^b74W=0EXdM8)wLfu$L7{IrKr z6p>?-QunpK0r=VvBPNa$j!xjQ`|LG`;VA2W7?mIhN5!XvRnBH2*%lH-8Q~a?ARLpJ zx-ZQer}$R;Fe;wM{$NL%8@U+wBgChu!m-pRnj;FQk^+e>wGZR@%5W@K99DUIp|9CR zEH{<@jyN2hC<_1JKn(l-^z3Tr3I>r~F$q`WDs9KdsaMx4@1u`d_VTqWXZmM7+nJz4}yrcbWR zgVI8dTw{Pd(+-7>V01%e$cD=728SYIg1&(@fttVs#jUr|cJU8T*@~Y?hJ-|(U#!af zi`UYfEhy<+eq3vl5~BPTlR9iMWjy{>mOQ%-zV6+p)?=}$5}t|op4vz2=|ooB#V7U= z8AGISiwKOojH1z3k=MEbFDX`G&ko8*FQD=8`zU8Fz|*=8TVX3a%}eliZNpFB>oIzc z({=~>q>ld1EyzqIh))tR9DXX3z!fveLM4;PO?fs1iHS?_ukUT+<=0-qt=kt_+>YSR zWxVm`6}^}7iK}oRNk$$ZtpG7X6GZxA%HUb-vbH#p z2@*>My;jH)MvzIy(L^3VS4Ua88@k{$IqxxK5*gZw4C%JNeL<|;S_MbV(^o#rZ8c;v z{{=D_O5o_f`P4qCrZQx8Tzz7n_%tuLR9@^fvn`bek!)*buYGW&W(YI#5g58mv6A91 z#nu>}oV{|%CnGAL1SFu+l|m6VCASBBXFr6-GUPTau_-9>W18Nb4=}j<0XmMngVJW^ z*_q5hO${1*+R!u7iSFSJbPl$oW1t-^gj(94Ut0sczZfz%W&PYCBp906?mF*(|TiIEm` zb=06RSd281XI{p)zi%*CEReyPLMkPJ*kmnCRYz#60Y~NppK`seZW9UW0Qiwx-c(y< zGz*dqHHhVF*j2<*S0A(kZ=vYu*AN>D{$m)Ze?{Xt`XHqAqIS2CGAuyWdIK6t2#W5v zhzzwT=syp6;RM9xJCuwf94|J9 z6C~!a)Zh)Pbhc-AZgO2&`@!-O6ql7CP+Ww9U=e(@%_n$^ijkG)L%P)ier6G31>d@U zX{LKWy<{0$-#iU)CJl5IVp4SAM-JT50C{#Jl8n{tiX;WeC6{DXRYs;xngz8da^t51 z%Jv^ZS$gncOrrQZ^DFG+!(IC4J zI5S8_(pd*n$p~vAGyL6j&bpw@?<91PYBnH6?S{@>hYYLzR#8I(vhuzADJdy`zeOxh zYe`ZwBgt?wa=n`|mQEsP@&W8qKY^;{4LC}-QQ}{Mt}YDy=qIqxe1`0~&yh3p5qSF2 zzhEg(o^?x@-36Y#oig*g5CsoINb%1|kJBkrb1jV|jqk9ll2Y9aj6Lr_;OK>A>Jw;& zA5gs~N9gd+P(i5O`~{k5U*q;y zsHT3A*COv}+WF-pZ2uB1$A5|T6JMix{b%UfyobfjEnK{O4CgN$!`Aj8NK*fuCrM=a zc~0L=G@tk#1}^*_-DiJ??u!pmxA#XfFYn^Cy#@~yS!g3tF@85cy|cS<_!5qv>TLNek7|Hy|nBg2Y80q5XBr@WV(S z{}~ja4J0IgcNF2z&EgG0)f|Ry_{T7gehky-M=&uzhH2z|7>4e{NLyoM+kX#+zPl_k z$t!5P?^0QO0NoJ1kNM_3%!jZt4`A)Tjogks7#;qHCbJ=Iv6;d`vGCcP8?Mq77U_$^ z5`95fVyoFtuiS)!Bws{nAx9H{M_U55y&D1=I3Z$~=|k*F>w7WQZ9+>BC0eu0!A%|;YQhA6HQNlD4zCGnBKNde{R|8(T| zFWCgv7FG#TC@Dm4gDZRAdANe*;bW zvvJ|yx4&*lY2JNJ^%+F&At-}K9+9E%KE)&-me*Ht;`|PFP94VXnRT4Lu!S=hj^gb3 zqd0SZ6KBqC;MCa-oIHC3d$ip>eFVEF4`Xb46hg-^WZBI)wzG^=r`K_k#bFkEr`ND| zY7Hj{yL&6t=O8wYE?|9Q4&x(T;QSyu%zH8VJ9q8kKTV7Lf2PQfZ6bal@(;vB8aJ}Z zc{^(&zfN9e;c6l@MzBOU#BL*(VIwzr)OyQ9xl$R{xv11+*rCX3LRxk`JhhYXH6QvG zE#Jcb4ZO7svMpH;?V7Z(QY8598?pZkEkRj;)3EmZ2=@Mup9)jkn-HfL{l{4s@O^vX1x~7M zpQkB&DD{jZz5E!`C~B(8x1eiz1;+O4Ftof3edA^58qOoL?kqBEPb0JbEL0_Hh~sPb z55#i)0!tSXWlr{|?mVRjvHXnizYJ|SAvXDYMfi{2BERxUQssqtnu0J_?IYxexhi)! zQJxd#$ZX+6r6bItyd9gY3de9|?0`mdg#JjXh~=xlulxVT_J09(&)xWF#193!NMt4h{}WQ9(xQpN9Rbyr{_k+9thDf`3A5rJ$t> z2j|NK2NxU;2lw=^EBFWw&Wj5U?!+7pPB;?|j>IjuLsRtM0J5dBybRp?|1X8z<*9IR z%mRusQaYbk&btkoa+kagA4CrQr6;{krw9(NLut{_OBG_f=C{64t~Q7yq&6*Bd?hLe z=uzKfPD$tAB$*l*7`O{Z?;=3}J|dR$4H;`{rEMQuD?_?=M1yHjjeqy$jb!)!c>3?$Adb6cr)e4}=Nn;gyf>?V#K-%R?fO*PUfB;$wV4t|6U8Mfj~aR*NX)M8jY#2;qqsyjSi=D{ga;*DzBmIOUe~I6=sTX={O7&P z*90Wx_e5GHKGz=agJs(hb_fOd_Q9`M0?os$FNsP>RN(D6$ZdR#`1+P8d&!J0XG~+P zEO)IMb(gBxI*hR;jpy4(8>pet{5WUpx6;u7cc6`w8|; z((w^Z7i23jI7n@T*WyeYdoBB94xj%;$>k^9R(E*w+^lc!u_mSH9m; zygvY1@h`l9LCD2jJ5COpB&Ir9@ITLM&FF|g9jM2&lsI&>SRZEVhRS=cI>V~~ZjHcT z2nH!t2>-*q8wQh$TSZ;-)y{2@?^)nvKOp;MjU&t~JDcqScE(yl5bnmMiBV#uLT)jO zn*-qje$?KGa1))K!d_JRma$lA(iJ7*f$601{Dje@yZO|LaQig-L@t z;ejLkPA&YO|JKA_0}>_O%nzD%u+_DXE^KWmC_?IXJ)pp9{|VzZ9%J)urYDz5+;^NJ zKg;t*y0o8IOQAGF`hi?OmHtJvlpBi31!?6>r4W~^b3bU>C6Q9vSzPIg4m-T?e(86O9+DYiW=oNoyZ zUulHzxAfj8-nYTi?3~VjD){S&MfLtPQcJ0)k}F#h)@z_zB_kj!3B|e1d?vi1UJT_Y z2lHvB;i7n9$D?!p4sw1wI|Ya`htt~g5eru@icL?OgwUNk6>NOIRag52h=erqPOcYZ z|7{=>)hbn$3YAStvY-tSYsX7d6kJs?FzIT!N)~8FRzV-$AsW6yFQG;JA^26qzwUhn zu#;Y{0i(O&?G4c;_2>SwTcv(_W!H!wXu4w?JMF(Kq8DwQtdoJKPx;YZXOqi_j+;0x z2^C%meW0U{G``sc*y^YM{PtQbC`+2SvVuho6%&7kF$V=L>f0}zgq`!)K5$|rvoq&aJ0->{D_n3n~BuakpCW~!OGF1Lqw0Kgd zeTlb9@8aMA3_5%G$&VIsgKPN&%_Z~muQ_XCC2SB3Ls8@@iQ4#-aD#SwYTrV}LY%qQ zoWn*!lC&?jr}QD*LgB;~D#9E4<#O7F^$h;f26n_+cWh+ z{QDuzJ5-S!`#f7azjsEz_sOby_HhH{pw!Ire3nh(hJByJJ@Q_Y3k!YUB9457MnbKr zUDCKW#I11;nOPwWZdsqH^O^CJfPW6?)U_HEqGm79it7@xHqU?=aB`V)O%(BS5F+b# zz97*{()@O3?)Liow|1jC7k6&?5t;btn*&>P9HR<5o00R|Q@S&-iq-K74uo24j*>?% z6G%z%fEtF(BM?U}mZ0xy8P{(+l4MFfa=g<){iA^dPZpKVHNH@S`yedmNIj{4omnmZ zOyauUoJF0cjOVp)WYg~Hu`*dq{&4fcpPf2rK{)+9As`*=akI zEM{;{e_$Dr{gDXdZ0S)c;!(120=NLDx9+jdhUt;OZueBOzDPXRvY{)V@-r+vEK~3& zN*8R{X=tJBm~r2tcEYPE0AhaUzx6KRTyuJWUx6@FXrg_s_m`bhIycEY)7Ky zD9EQY6aN_&dK?5k4pHsjm=cpD1Q+WB?L9Vm**RZBD|7Gj6?ZQ@5xA>(WVNcV8_I;j zCEMDUy9@IC4#qocr=Q0trXBL=OF`f(T&$CH2@wyy#i1Eabr$EO*>e@#CLCU{N=-gyF6GDg)Bw~rah4ULvAgNsP` z4gm#zyZO1N1>~6BYJP8JB%9xPM8hvTQ0e+gOC3VFiLEd-Q}D~b639PrKmXz$C;R-o zPVq9AVeZZ*$1ly zPhFtmUyMq3lgWgB{n|#cOO${OEk|VZ#_xWcp&#s-ezPk_mLG1rpHfa^#^KJkwN3o} zc5oKac!>*+CK#c7d|9g$i?kDb7-)sQU!@v%^6>d>HTDW9`$fm+2qq_ z5@J-&W=~ndGd@^f&0cr3ff?72+c=wnPyGZqb$-6tAYj;`(C36O4ScJos&*m>YBoQ_ ziIgUbDdT$dfC81ii5tpSw5*bJ&Z(y-P_aa$^tT}O7we>Vq+GR9w{vtJywhwM$-JW9 zeurgI%U((&ErV`np_-7`8~|I8-8 zyn!uJ7x&EHe|n|c?wAy<(8@(41R64$+NIo_1Gnw4!VAzb8Pa)%LZ|0LqyhIJRj3Ot zKfTuR&a;7>JhIyhWiu_E+Q)(G_P|@F&7eck1TEwCmQdB$(s z#<4eqTA!L)!Y!1_R}kAHG!2}5Vkar!9cm+{)Mg$3)(zAB3EmA$mGAhNyTeBxFU10Z z($)Yhis9h$zB&Q5Q`D$dW8EktYBBQ;rk>FNCC5#Uhyt~#jCdf_S;p@j9uaMt%s7mS zGFG>rif4up^1L(n5@?~w$CeOuRF$=U;V(a%e`#int;;)?d`WeB#NFtFFFpV=MbE6H zFt)zJ!-Fj2WCgw*o4iqH60UC)n{-DTEz7ojv7l?aSqfqpYwkprp0w3)NfuOW_qPcf z+Q)kF54pbwwj1M(5Nz30xVoe|l9H0q*3``WaAlxU^lFs*+#FJAVo|5Hr`PjRu~wvhJOF8Th(-+rNp3e?g4dZfSF|H#p)T;J6pVKq>x) zRFfN!wO}KyyPx^`*Y2_3EFf~SnS3xzdyg_PKHXU~btsip_!w`Do9AOeQFkJ)92KVk zN>YM6VE#ylA-vCvNb61;DBP?-hb#OG2kDDhsF56Y9Ia2@*;40U^2~!zK=i&z%T9Rn zI$bMSGcq_$LWT}J2Pl)Xt5h~VqDd0MHVKzvqDw1=3-$iNpH@_AxFXT05A3W6v4?i< z#w4eQ?ysUKO91zPBbI?NORuOj{AyRB-T*!e)fhA*%ml1@@Pqq?-??lq=qn?(zUZ@< z+%R&biy4Ds?Vr`Q;N$8!eKQ#%rXxt_QJoa)2MVxqDJ;OVeQeEW2!zb~Q88tv(wR$$ zUkX>|5r$v0nivzuO=^V}CY&R%DfXIr=fCvL0$e_faqAlD?%<;>6Nr;;(g>*yh>cyU zs_0kOtR&RzU!|o)PWWByCt^K;b}CSlByqKhS>3DR;Fh_PC18*rbRlis)=ZpKC~ECZ z%6~(vyYIFmEJUWAjtdT1ZwqEmSbrnT-%a85>X3@UW>Dyav~ZTx-^Kk4kfyqC#relI z5PTLSO4w_v7bcziLYvhVb2@T#fo%e=*9u9fI|!JV3F3GPo+QRgke4O*PLH8Hs&O-x zby66Vt5p@ju9LzElPT`EFNI4XpL8UVQW){=dR-LxY>`ov%$^=IF*SSI6qY$E*5}JR zbSoDnCo%n1qhdpLJd3l^bm&R?Oz5ssJ5pUd;x~4EgRa%}er@CXwLy#SQstQ+{^mp9 z{UP51s}V^-uL#%YvS^|G!>8{Ys$>b-3deQ(f3=4eL81F7wSd{9&!~AC$FdMZFCE() zzUYbtLkPL^)m$K=IY<4vTqOUR5}pM?ia9~5cM@pJ7MYAp1jM?jK65mWKb+k}vZI`6 z8W@^z!&1sYePObr**fO0U!rpY@j;*wH~zeJf>p>S1$ zyKWD1Mnk$~*0F`p-LJbnn_RjE#uq$MnIk=(k|P(tO|2M}cklelJ+w>qncXgor*m@V zI1YOI_0b5reu0*(iJx>ClSWxX31K^Koacv!JMcUBE=n z$oqtK!Fz2pBg6x+b+w3)pmsG!-6me6IEI7M{~Pmzt1)dD?ZUS_UzFWX;m+J^U<;nq zQXU*N3D0lwKlYjtHp`%E^p|^4est9}^!&sY>;zKrWx5%@jq)A!ic}d8H@MP)G3>i) zc-r(tJ<5?2#C<`Q%2DNhsdO$U{vMCQoIW^xg`w6bR?ywKf@* zd^=f(3#c~c@(Z*{TBr9bq@gv1D-`PZHdHfR^s~s3XvMIG5a(ub zSomDxN%)fcmzo77vl){>3(onYKbu}(_R;M!Jwp?#qh;J z2XBRL#rb5wb)FWPQi&6iNEc5%jfE|qJ6TF$ z%#=z|%xYKX3-%=|2^e#I@}Z)fJHzblME+(k=t`n{=7CIw@^_ArA9CM`yby7X#4XtD zvATU}Loo92;HVVM)P}|-FwN}{VV!HJno_cidmK$uYYT@8g<#G}-af0W=@3tNqSn0n zqZ44x@C6$fpIq9yMQg8w!bS)b3C;Eo?PI$FFiRvheJd&weS7+t;*xiN@C7$Um^cM> zZUb?f781jSwtge1Sex)0yRMKx)Phw{{aR3p)c+bD6k>d<@ycC%ZINm%k}3Aq^HRb>I^QL|AFPh* zqWQUv1g3ZQm@<90P^&2ZLzf;zRJMDZfboYD{+hH29sQ^~Qs_>gXD~3%NVUD?>~(y9 z()0uT)71o2j@KXIS#@8A%ctb`u%( zv#$jR_1qB@5b!*^^PmjaqT@8lE-bMcA0yY5tZhs%3&0xrd*uDi0SR8JF(JVhg9+_W zb@qI2j%nzQoDnE1Zvt8Snj_IxB0@*#Fn=b%@>*)Yx3xUlaxuMN13sN;1 zc^UwUk|zEntjd4^TsmXLFYF>YB=v&UvEmMG(QH)VRc^VQ3C<;_B&-=@{;afozdiXmy(=F!bVpFf`D@VB_;4?^L88wJHIa1TsKSs-eXM!0;SGpR$h79NQ+f9A#LlC52^i64^!zaZ%LB8!cEiE!#k zRppLfW@V@uUif_WGBky>sPC8lhecA55BiIy6FJ`EV$w3A9?ZTvT7WZncUuR$@P&s* zJEU;+K_NXh$%Te*;N0#tZH~D_M&kCNzW_9IIW$8acg&j!4J`gW`B$;VXi^Ln4M_Km z`fnvcX%&V(YyZYLJ2@7}eAcLn`+U2`KLbi*chyJo%&0>tnakt8(|T+Yl>dzgwJ54M z%4yi9di7wE_fP{L(u%#fl|G`mFV=XqBF6S&hk#5+q=Y(PDk#CvFX{t1kWwncSF-T$NOST@D}6f4frti0Lc*^z5>uhgDUA=0{)-`A6en-n#c0c*sg^SsH2@ zq7{}fzj1qyV)wEIM+>7QWhTqC|N}t!I?#VkC{#`foG7_4r!Zpy(-;cCBAIK36Rp7Bfl- zQR7f8OE><<+=8I~F!$$T^n=34DI5Da7r*ZA<@=N!Z9LlC+mE#1G}^K)oVVo%`)JB6 zV?24r;ORT-h$>}3zKajA07=0m@N!CUeE^!Px~tt`B>iymYClT;Q!NSzDEf+Rp86KP z%J&ZuaCb9(I{aIbT(?kLJbO$9m&JH?IngeP9FpMIiYla9wJwbstJ?8eU8FHkiYAP% zunNws`ygz31gHqyuFB!i&h<}f>Xw4)%MWqvw8+^@K`ZM&o8aF&-WdYIRIiX9b`IE} zrd0bjtiNA|os7*yiJZ-PBv{XI#;pp(hp#lEivib^(J2Ue2&kcmEk-898Le&p0TC|6 z+_O?>Z9R*9)i3Cd<}{h4%j=8@z0=FedhU$oNLm|eclvP=-c=EFu?uJ*nDs~^@822B zszcMl9^Yg6VcWUPsRM*RClnZYIe=-lvpCkbr=R$&V^d{w?&suMHg-EJlLpL&CiVrd zi=vBKLT?f6#yygke|rU~d`@ZCvfNH@ejfkikii!402iAq>7&8fI4m+68 zHgkV!i+149a9h3mp}Mn(EN%7d&MPG2PqbL;UfzNV`ELyPGkq*V$Qz*fS;LJ@XT;YDe^h=hq6l1lTBM(%XH$tO&E{tk645Tjbm z$d3qQEH3G@wN|3^&PQT75N>>0S<3%Y0c$b}z@}AA725PfYpLBZa6YYl`xALl-Kk26 z*}bxp2L_rxGt(I6C8!=Yw2Nwjcja}RnN{2)+0x2!=t`w)d&27x_KBc=*10cN;=-!} z_Wa&QPM|<*!V$oIthsA!ojC_nft}kYmR@q;e zYTsXq=FqCTb1&usPy2CL$r6ix!8*;-{D#Y&gQ*F9u6jo~_M9DGUe(Dba&1OXWD-}C zGTb};2Fe((OLCks`Uf;h&s6dc;Kgh#uwb(wcz~4x1SVylP|G!!rBRh6az+(!dY1Nlt;my9KXe zHMy^JdC*xCf1)fQb?+M~>+gti4+OT0<`Ezy@R^t|LNd+n_U7xQI+eI!0z=Uf#>#{i+8`nzYDIaa@7{xd*T%T&)y9f<>-q|C1_&yl5V`BZpRYbGcDM)(fK1 z{l)jy`|R&-TASzY-3=`9^5kMsSIsr|`F>=xyv5)5a9kdsRL&LpDUqP1YVXtBUgEn6 zkJU(23+JrJvmNTOqzkDl1jmpfhSvcx(Z9Asf_=ghCxP;sZ81 zsFNL`BH47Q6Youq-2z;2DkMllxw27&4)C&@bOgkwlH5q;AG*1|&p}1kyPsYf;ZA1o zV#l>q7AsqqxaEq&uqacv_LSNJv5ysAERiIbk0As+%Lv_*x8^uSUP_MaMt?cG8M{xf zflE^otH#fdU~=%K*s8wYrBy9j3#T}RQ-FW1oS)V9^8K*958?P3+$RapTFo|-`@b)| zBz5>0EV zH5FzmwN2W`_dbiao^HL_ofzfZDr1lo81;UBV_xKV5o`x@5i(O}PV9RMD$TM=2!pW$ z@i=(+fUTr1>{@86>{!&2ahFWHB08n!Gcv}{RqqiMD-TagwO#j+c8Y)ns(`Jm-xsNb z>Mzf2Y<6`bdZgmlG_$K+;rd@NvMA`Og{0K5QYdohDoh!IZrGx@iUaR+F#Za>Jra2J z4Sy(jTdUj|>{b8H6}*V-SyjDp%Q!4a3P#)##$UqIM|8Jz;Xgp1KNpV+gdr=ThpMR< zoO4Y@*m>h%#M!hg_xZ95`%3R(Bj6Aa4LL*)bO>dH zO0h&J4)zRM^D`Y=rpp)dma^62n!tkI|Ges6sIyHLPL9X(zrcrRH3Z>@HJkGf+lT7} zENY#K@U^v|Tk*A#r9m{5)`a`}i)V0A9{-@bngs?*g|FUfDFT5l2R<#{7qH(ko%e#u zo#FxG)BDe5#(`g$L|!YG`LLtCb(a?m`$@1VBHRrFznlG}Bhps}Zv)~<;*-wx!(E#~OoYT?8fpdjt;N$R_c)GyCz(w~IqD)0H7`Nh7ZZCO5%ukB zzXr=^+m@!U$fRw}voEIpgOKlJFh6T5)rN4hx`PSQ=)tQBh|zec(1lp_89aaJrq-+7?6L#AxW@j= zoRNtygPFt54Zv7$eHU+lYB~mx8YQ`nIZL9NuY%Cm(>7G6f{5;ByKJLc4g@Q9(m^e{ ziTJ;$4u&txX0U&FV6(gIbT#N9-SxP9c#iMmzq|y}AE&E7H}%DiQSGz$2;AXDH^bNT zJb&=)FW+n|lcejJZ_OM!-7M}{P{)jg-6okS)Ea$>SYG>e zZTAoR-0N-@D{?!~5Q5sFe01mh^-NibM&Rjo*!J>x@}__Nm))T`&DUXo-m}=~I|_AE zb1Y`l3G`o5-A9P5KE&DrVk2zjVe?Pmc({1@Ik@;axcPLrc!l}+g?RfLd++VBcZp3DDT)+D^=3(i<;a#L%d%xF zvK`xTT$0dn$|kdu>|`~&zwLi=_KPP+{^S#_CNrCn#xuU3&-pyy;R3{a_uTV6=e-NQ z@WOL$2VywJ=tKz1A|IEumv<7Hxe!Xl`pD)D!C1ZB1hhq;dt5kSy~* z@8kTwJ*CBqbd0*{G%}lChNbUqDE)J=wp>SW_!>^^E@AWNB32I1VsT{#Q;XAZhKA6v z`Z10kKZd3G0W8k+Vqv-$^HbfJo$Mm?V1D`$=B9eEINOK$g%RZVO2OBcg`fBFe&3$b zlG5Caed1@Zjeh}i&n?J2V^9azAv2ah=LjM#ry7c!S||xJYZ(&w>EOz8pwU^NGg}`+ zAK99$Fj%u-&dPzwp2Kdf4kv657X*CK_eA)Q-eUPGMr3aVFQW)4`eGz0a*&jkPg^Hs zc>|;re;W#pK$?rD&K0v5AE^yB*r@+pvy2KsNI}rGociC74F(dD9ilo2xKu4#85rhh$U5U)AM! zp&`s85(pf_;OT3@H`J3lbP_2l!PAz}dx#*qDtbEJl6cS71V?d1OlDIUR_3RKPf@u1HOjXBfacTx1A|xogqa)vjG5Q|8GTp& z7kWqU;7+C&x3zAJ^_)R=&D;}bu%O@|RP=egoGwW7r(o#1LuG=LB5xFm&Nq;#4?*G@ zhPrAG98w2OE&-lRqPA$`9y>;$`f5PlbU!d>Ud+6PI55v0;&~^M{)UAJrs#ZB%C}(~{ha(kCq$(iP|y4diG~Wu{PWOv z-U8QDM+CVIk$(yY;=X%?Fgd*NPW%Xtsn202qntJV8FHt-K;G<^EZlQHhjaGlaLnx^ zcYYu4#jlWm=$G&;?jvvE7jQ3-sh+6^uT7xhCyouPg8)H6zyZT9?cOmFGeS@U-regWIx|r zORs0LK0uP&50S1A;vgBsfd`0}W|NO7fU@KWVg;Gt=|bS!njtSc3{HytJ4J|OK0ll! zv+Z*;%c(31BU-u}(A-&%rjB~lwb!Adr4H`$5@=odkUHBT${hs9)Q$v0 z6ATqJ>s=j4%w`~WcA&8D6gZkvaO{JW9?I!toJV3tIpQ;_AkA)ryKNgO_D;kq@{v`$ z3`5y0RO4Tw`s|-z$}ahv$-tKx7^Oasd0L+gTL8|w*{7bwB!QAlUB**YDK*{9$n>5k z{w=Px34*{uXbOg5t671x{sPj+K8Lj7G9{}T1V*kx+jttHvP~pLCPVLC_I1_RXOA%Y zDQ)Tb$R|i~^dmjA15@=8)E@smTF?9=`L}<<#+^T*Yi8@&kRduY&bYF(fr~Gn#Ely# z2zxAEd+j7%y>S{>UOkJm*Un&mi@Zc=0wN~^uJ15-{&lGRW02*vA<4G^nX3oxrZps4 zI*?p?4k;vk{@%0TSbM>7j6><}gRlD}M1eKL5s|X%R=**`7c3bJS;4=V4BEVQn z^#nO8$51x;%2WHO>=nqZoqy_8%iPci3VP2x@pBSQH4v6=LR-inyM7I+)n}mWd7Jia zfKP+(>AQ^d%5?||<`K=$povn9)Y@}Iig%&xd+#yi?Ki=*G$YkLNd4x{CYvUc&wNUdH|VVcdW4D&D#OLtK9|jLUCa$I;7I zkyY9czP3kd1xa=z(x{)e za~HzGRm5f1BKsRC&cj|c4_npjx2T+jxj1qu ze-K=;<}XwzK9T3wS)I?OgvN7{{5^9Mm^-$FBYP{@K64l+&aLD0#R!hz=;<{~ZY-d7 zXaG4yDl4VP*h5!=2E2 z+ldUvAuQTNTt+2D)MXgU=b$Ds1a|&_G;`pI2Yeuw$3zTTLQ2|xOrns9O%&ZS1jpg& z*g;G@mx)Q>G4VX z12HUF66H>43&vm!jv=dN3FeY9xSQAEZa4&6#XMY%>+rT5hQiqeuF?fV@hEcZ7U61M zgSUMH`5h5#vfDiJ2-dPOXmTo^@5MJwP97X(Rq$5TBfq)<`IR+rmxbUgDTkxD6c&FG zbe=-A4)o)4_!Qo_c?xrj<4DX~L~8d>Anl`QHS;M#-P72+atU|tlCr!T#s}|R!+Uox zBYf>RbcKCzwjLw1w1xQ0YS^onV5yjeyx}5pM_z?cWq%?WqB$Z)Lh@+{&7yhx$1qn+ z!d|-ySLYe%Lo@L79EX@JRSwnCv3{%}YDh|C#3f7L`?@Iy~LSp!N-*c<3zLeP>|qyi88N0>fu$9idiuN8W|Yp{funj3@}grT_irGhXb!=?T_lr1Oz}>Wft;gK zaRF(4_mI~A9t$azgjkXO`5EY7sShWLHBJbN0)FP_KlOBbu{@8_`B~h%e+M6Z{4Q2E$R7|HM4cZ)*#03h`|iV4H-zD}H7xHO!P<#O zIJC72=HLts7$uCHUT|GAh)XY~G%*5=yOCUW3AyoFnmKN8I6}lGq##l01y@&vBtqm; zw$wvjrC^a=8kd~g3v=ZXyo0a6)_wx+t}V!Nn^C=Z2g=Yfq*iQGpMK;vte{}$4g3habT2!5Qw)tzh0c*#Y@+vUL1b-2^X_lp>o^K+{Y{ve-wj&jG3(sRCM(sF?SOD%48ivTt zKw&F{+3Sa+&<9s(A@a(LNnMIy_4&b(*}ze_5U(nvSzrWDBU&_a#5-*l|E;!~umH zQItZWs4PTTTajSy1V>#0IY}!&r-$VA3`+(>XbHJp7a?!H20`Hhk)aBWtM{Ov=Rv-9%um~eF;it-bQxyB9Y;B zn1>%JL-|A)#y~$xnU~OY_)YX|yovs!chI^>-(RkKzSmb0lK9N(&L*Y~P9w`#hU&3X z(0l4h?iy)!S72=SE)0c~9E`Q(fV=4N05Q87sX9MQL>9fx1yxohE9a`>Wk~X;U_baZ zvR8fw!`yF>IrTMk)4zgw;kU3Z{sy+iU&B26D_G}#4cqk3;9U4Qna+KrWOpFeH-lJ; zVzH4clljw#wlpFts|!&%eTb(BnxHO*jP^%ndn(n|2pQB=hm8%VNEvp(%jpJBUyicr zo6y&7K|q6@>>Pl#ip(v=PYEf7uy_@btD~$klu*>mpFoO#7HOV7*3?RUBcwW~AkS{c zfT0+2dR@`}I{BINaMmrLcJ5 zD7>w!^x6?9g1dB1TiJagT@ftRtE?GylYuPlUW2umzPqj*39>9kqRV5X1}`JjI+=LB zlF?dRj3nL8q?!GUHmjJ0+7@6`mO|QZd+Ifoe>E9~s2pTCJT%)2P}sZ6u0qOaeHSuE z9|FTyU~afXrYI7PreP?ZhoGu{3lTPk$Xm}O%C6gpOC>Tyz7KgFRnZWl^p!ZEtEBQ_LtgV7szx`U%L_qjDW(!SLKq?yBvK6i z6q=zgklAzvWy7aoBvZ|`cEVV-in@)D&~V~6a87>=F%iFX;yUbg#}JsK=)L?E%9p-E z*`a+DQ+l&huKjI^BZezw;ze2}PN-#KlU0nIVwRFa(TcBTVg*`;oG=reqG7b&T9UUy z2s6EKwh-f8y-2UVMrN)Zw#E}kFIq!7nImmr0@}hUC`wM!3|dBB+YaQ8E~HmogVH+= zd&?Q5m|LJHhwSXQ1V{TNWHn!eq4pdyN_Sx{KLbtUn~-#U0!`a{XsF)C@rHv4RUD@Q zSt3)}0`Kru6fiH-EW3vMfiSA)Z@}As5&1Mw*5(})^D=C32S^8|{AuOl$^AwsKPQpxxPy_7skne#~X5h2NM@N{J;q!f`FSOPDr6x@psL)0y7MNLrmGOxTc9kM0Z-{9Wocm-3`N$CMj*`UN4(e?j!BX-i9!v- zm1Hnn@gs2P`GJ_kZ?CB88+Q@h{58BQB+K1*agpR{#nA!h#7FR~ehv5XFX37uEPsux zna|0oGcZ-sm)80rqXQQhLNL^jYj(H7R5p$bnk6dl0DIY4n%%$>M{2EN(}37q2~+(p zB)KCfJoJ0iZ9hcS(T6Bo{}X~#F2>5Yu;m_tzv~0Yx<5r()gE3g>B1kj&fseKAdH?F za8zETQC7DFr?FnxgB@Q7Jl@C(seU9{+99`hVAEcM4ofW*+1)to?Leou8@YqW5m>r} zjQT?mY5bVUsmBZ%%;3~lm}tC+lQUN_zWo-|WDX-&Lz7f~Xlu`t*&{Pbs**_lMCI;5 z9&;P!3_qH!rFeg0761Fjn|Ls_juuB1^l1)AC@yO2ExWBmc&SVIZN08RNpB&XR? z#OxwUk%vT5CZW-Xw&8xXj|`xl8AMg*7{sO~a6M!&b=4ToAH{Zd6YPO`RvGfBTy&rQ zEhNY`lmEDknyp`<>&)*^vhs5%C|TJm*U@_T#~3~R zC5yq6zd-2F7f7|%qi2#~-}{0rFb!MJHCTFHfu6GO$;<%eYz;8AT}IB}Ysl$+39iAb zaQ0t8R`1JDcm~MitdL2pfw6oVsU&@d>J2IvO+jQxRymEi099OtM8U$Ql!r0s2%3{_O)-)f)1AKv*0cd7@G?U_Za z!h-~B4-_=`N3!eivY`lW@(d|t&=Ru-AgBF%<}wUZX;9G2h&&##*TdFvgd*b}(rXVw zOr_(5t^nhOTgd78DH!h>RvI@kLMBa3F;VO!WuQ`~Au`CRw53v1jSQ-W(nS8)TX4~P zSF!^5dVC50=jPjZ&^3lpQ$B*qEGWtON8Ts2x08zXu-iC^86wXpVp1{?MFf3OnhR|W zmCWK6jLeOLnV-Pu!X%mp$*<_EDHR=rA~S>?OC9c{yOHgiMCsrjkzo}T>t7+eVI4zb zgIM2~$C0Ci%>}Hj&tdiOEV4qAP}iJAaP?Q{IscE8R(=JUXA(LZoBYN#6m=d&QP*+! zJ5RyZ{1Q#-!iVz*$Jx(%;YE^(D4sGLotzeqgn;DKT)Pc{o^pPAF?$(VO=J)lt0AU?aWt$!LS~Got05V4 zBdg^!gw_sZG`$HO`G`y^1ra}?Z@mX+?aRokxr$8kB9gA3K-YQ~2dO^4Qq+SPGJ(p{ zJ#h3P%HA80hK?hPX0(e;TRN4H)ZkHa_*=Ap8{V3euo01@v_H50989DDn)Zv(_3T2? zd=Ap`V<>F7NcI0MDBAA8+H@V(mdntUQfkO!wBFOa)96i2@?Y+ZPCJs}Xpyc9Pp)zrv{$3|64X?vhN0GH`55a*w~Qdy9ikqbepn#RNj0VOL@Ru7elL5QA8L2t#bO2qH(dQr~BFMUb3{B^|$mqBS_teKkp!0|! zLd98|5JwUmM>#)^5=;z9c#JY1u`+rsHHTd@kdWpB}VqUBxko!nj!;fs)yJ=OcTlhXQ&UZ z%6??!2a%B*LXvv{Nv>HcF*ISwK&pqngsSEuJncuJ^K~MTCRIGebB?{AjjJ3h8ENt$ zJUT{hdJ&!TgHTspA$59%O5*EmWEJO*LP(|V??Q%1npi%ziB76-24?_LHywy32!2Ej zR6Zib3_YfqpHT*7ZW}A7B6}yPNQh)J2!$aJ>9!K2P)${kE9Ymm!#wg1%zdwuPq_wb z=T#Q=zSm&uy9s0WO&GceWRP?OO~*}ymhL0FaT#%B#Nrz+6RseRlpvZsLNuMYsO%oZ z(n(4nwNeHT(~0jQ1Gmn`#&q%+j@BLU?aef>-Qd!|IJ#a!R{bgj{yFM12ni8US3xRP zbco{SAtaIe*VJ8vl#)dxN$?!qP!|vxM(+?|2EnCrmX=Y3zDz&l&OV3&3zR|@Y1a1A z0FeCV_CikITT*=z(IOq1XEKD7lsOP!7 zffSW*f}b~vjN)my+qRHGCpr=nxs=tN{jbu1oM12aCKI{k&Mt~<>yQ*5WY-)dW(2<> z!y-xd6u9;_q?0l@N8chc3?b1}ixiay1w?)+{SBf2Q6!bqYsQwVNG8>bT!<1A86wvi z5_2cO^BqBgu@Uh~9~*HK87#=`%S2sc( zT_|sELS98BTE>RZFfxP|rXPA|J`%KLnGdP8OGED+k4^kqlt;lyc`>(^pVf3J;N?=`tx(J5uW}J|cra3x2Ae zl29QO#XFBKNt2vM)HHAAr|eBQb=753%imDE-au&T6=deOLsL4B%<_3?{Qc1QdSR$q zf`*9myt(i~pvZ$jzzrUs-(A_>f`zSPIC}m9wlAE;vGZrKd+7qsgs#e4Uzqq4pMF{%I!XbDMrDG`HapE-vzdKCf{A@~V}6%{D1sz9K! z9R9LWGDbGUlKWOt%#u*bNisE4yd9yMPAb8XAUa+^1Sn<~$s|%7i>LY-Szw#u9${Ay zMV5aoZ!UrVAso`LH~B^44-DG|_Ts|&_qXgm*oPB&8N{bDk)oK(Z38&$?;$o#9|8)|90 zz>*=b^b1r^z64XpJM6s)rGFWr$yZ>ijjRRz0Ae!A0*Z#R_BWuO{Vlt=B}rHM{MF&l zO-1Fw=qrM)Ac(9$39^eKpvQ$l*b9nb@c3c&2T3Ug@$#!@aq0Rw+$(^L= zG*2L-M8?Kn)q)@1IFBE`auQdr?&8WzJGe#&U){m=myg5b4wCb(L1rl#BOldv-#DDD zYv9YDdw>xJ5PP>Uvd%D~43RXETCl(-0xlWIH2)Y}6ZatWO*~QtGM(n;OXQ&jsVog3Ij58L zC%W2G;F{~%wTda;NpM6O_U2OLf{@fr5u5ytzU?(K&Yj3(?jqQ~i;U`vl%noY936qN zVioEDm7c%~>qDgVm!TT^5b4ZMkUsJ;dy_0y^qlWe{JAxc4q$9;7KgUxarpQmHclL* zXcWOAEbkn`;L;?59W8Jam!Yn&4>bcrs2?1Hfd)3Y^b74W=0EXdM8)wLfu$L7{IrKr z6p>?-QunpK0r=VvBPNa$j!xjQ`|LG`;VA2W7?mIhN5!XvRnBH2*%lH-8Q~a?ARLpJ zx-ZQer}$R;Fe;wM{$NL%8@U+wBgChu!m-pRnj;FQk^+e>wGZR@%5W@K99DUIp|9CR zEH{<@jyN2hC<_1JKn(l-^z3Tr3I>r~F$q`WDs9KdsaMx4@1u`d_VTqWXZmM7+nJz4}yrcbWR zgVI8dTw{Pd(+-7>V01%e$cD=728SYIg1&(@fttVs#jUr|cJU8T*@~Y?hJ-|(U#!af zi`UYfEhy<+eq3vl5~BPTlR9iMWjy{>mOQ%-zV6+p)?=}$5}t|op4vz2=|ooB#V7U= z8AGISiwKOojH1z3k=MEbFDX`G&ko8*FQD=8`zU8Fz|*=8TVX3a%}eliZNpFB>oIzc z({=~>q>ld1EyzqIh))tR9DXX3z!fveLM4;PO?fs1iHS?_ukUT+<=0-qt=kt_+>YSR zWxVm`6}^}7iK}oRNk$$ZtpG7X6GZxA%HUb-vbH#p z2@*>My;jH)MvzIy(L^3VS4Ua88@k{$IqxxK5*gZw4C%JNeL<|;S_MbV(^o#rZ8c;v z{{=D_O5o_f`P4qCrZQx8Tzz7n_%tuLR9@^fvn`bek!)*buYGW&W(YI#5g58mv6A91 z#nu>}oV{|%CnGAL1SFu+l|m6VCASBBXFr6-GUPTau_-9>W18Nb4=}j<0XmMngVJW^ z*_q5hO${1*+R!u7iSFSJbPl$oW1t-^gj(94Ut0sczZfz%W&PYCBp906?mF*(|TiIEm` zb=06RSd281XI{p)zi%*CEReyPLMkPJ*kmnCRYz#60Y~NppK`seZW9UW0Qiwx-c(y< zGz*dqHHhVF*j2<*S0A(kZ=vYu*AN>D{$m)Ze?{Xt`XHqAqIS2CGAuyWdIK6t2#W5v zhzzwT=syp6;RM9xJCuwf94|J9 z6C~!a)Zh)Pbhc-AZgO2&`@!-O6ql7CP+Ww9U=e(@%_n$^ijkG)L%P)ier6G31>d@U zX{LKWy<{0$-#iU)CJl5IVp4SAM-JT50C{#Jl8n{tiX;WeC6{DXRYs;xngz8da^t51 z%Jv^ZS$gncOrrQZ^DFG+!(IC4J zI5S8_(pd*n$p~vAGyL6j&bpw@?<91PYBnH6?S{@>hYYLzR#8I(vhuzADJdy`zeOxh zYe`ZwBgt?wa=n`|mQEsP@&W8qKY^;{4LC}-QQ}{Mt}YDy=qIqxe1`0~&yh3p5qSF2 zzhEg(o^?x@-36Y#oig*g5CsoINb%1|kJBkrb1jV|jqk9ll2Y9aj6Lr_;OK>A>Jw;& zA5gs~N9gd+P(i5O`~{k5U*q;y zsHT3A*COv}+WF-pZ2uB1$A5|T6JMix{b%UfyobfjEnK{O4CgN$!`Aj8NK*fuCrM=a zc~0L=G@tk#1}^*_-DiJ??u!pmxA#XfFYn^Cy#@~yS!g3tF@85cy|cS<_!5qv>TLNek7|Hy|nBg2Y80q5XBr@WV(S z{}~ja4J0IgcNF2z&EgG0)f|Ry_{T7gehky-M=&uzhH2z|7>4e{NLyoM+kX#+zPl_k z$t!5P?^0QO0NoJ1kNM_3%!jZt4`A)Tjogks7#;qHCbJ=Iv6;d`vGCcP8?Mq77U_$^ z5`95fVyoFtuiS)!Bws{nAx9H{M_U55y&D1=I3Z$~=|k*F>w7WQZ9+>BC0eu0!A%|;YQhA6HQNlD4zCGnBKNde{R|8(T| zFWCgv7FG#TC@Dm4gDZRAdANe*;bW zvvJ|yx4&*lY2JNJ^%+F&At-}K9+9E%KE)&-me*Ht;`|PFP94VXnRT4Lu!S=hj^gb3 zqd0SZ6KBqC;MCa-oIHC3d$ip>eFVEF4`Xb46hg-^WZBI)wzG^=r`K_k#bFkEr`ND| zY7Hj{yL&6t=O8wYE?|9Q4&x(T;QSyu%zH8VJ9q8kKTV7Lf2PQfZ6bal@(;vB8aJ}Z zc{^(&zfN9e;c6l@MzBOU#BL*(VIwzr)OyQ9xl$R{xv11+*rCX3LRxk`JhhYXH6QvG zE#Jcb4ZO7svMpH;?V7Z(QY8598?pZkEkRj;)3EmZ2=@Mup9)jkn-HfL{l{4s@O^vX1x~7M zpQkB&DD{jZz5E!`C~B(8x1eiz1;+O4Ftof3edA^58qOoL?kqBEPb0JbEL0_Hh~sPb z55#i)0!tSXWlr{|?mVRjvHXnizYJ|SAvXDYMfi{2BERxUQssqtnu0J_?IYxexhi)! zQJxd#$ZX+6r6bItyd9gY3de9|?0`mdg#JjXh~=xlulxVT_J09(&)xWF#HV?~SVD3#G3=2z}B6 z3X!R-eKZ!2rSK7Yxsx=%elbh__C3jk_;_EcU7u>(>s$N%;k(A#<>iec$zhsnP0eaDlV|Gank znt-JIo=B_2@7m*iuxvZR4xs?wKKK<&qIsD0B~b~B3BDZ%xs8tzU*8gCFPYKhjA@LO z<*rqu?ot(7hcULK@qYVg12r_--?jky*nOz}%h5~`*PxL!ss#@R2C_zLQdb%Al@B<( zKV_J=iMDf@yEPCg`B4uUhG8$xI4Ecsl|F4$u@}^b17d;naCzbUx}2WJ>wLK!zl1KH zJ3|U<{VNHT6n`SoJzXM&E}ROgEuF4TZ(J(Am5v6$ORsI1pO;C}UpSSd(H`^LPq1f_ zj*n=%AX|yUL24ts7H8VnYuP7r`28gu8KTVw6~^kXy{+ z=0LasAGJ3k+{9+5uosoSWh_>jbVZ4JU^*#0KVdZKZa%dl+&)b|PrQdtn5f&@y1nN@ zc;N`YQ;YoPzcsPffJ8|*^Mhs`Y<2CU3tJlsiU8iO2NYQCKVjU)V{E?7^yE@W_>NQL zXL;U8m-Z8DDU@bNKalIE(!Yq6@<0)}A+4OL6cTcE?gve~BtWH|#g(q;u)_=Qm)@wI z!x+BhovokU`>S`axjnj+Wly~X`0|P_@4L=yju6nWcGHO{MxOVr-45brx{ccngJ-A2 z`)2Mq=J^Nquylk#PIXph)_ul^p9t`iHGMs+`}J)JJlPdHS1Tb5jdq;=&(aU4=f?g3 zpR)w|)%FIIL>Y6GvN*OVyFN) zm|rsu7sU%Z9-Z@dkn`KwDVG>?IITTDu}Jlz`1G_%2;I3;!N%uXb+u1ik&s5d$@PNl zzYSz!TBWMMP}!s;3)&FzcDyu2p;Z+FldhJlWWi=+74+d9qTws_5?aI`LSIGw>)uzm zcGAl=V01Tpy&>A9{yblHtJF`g>>BX{O?PZ#r~P+D^`fnlbu#euDL=aFY;qgX@es!) zp~5Sn4|MdA#y6V)TK)8&-(HJ_WJwcOR#e7{ z-$k@~(28$Yg3I2oDqH~0))nABl=RJFH4o%*id!2d8Mb~f4-`{Y= zUM=kcLW)XyzeayhIYqWyN`35%6>t&g zh`ukC>VImenzw%6;PGzpA)YGei6iQ*6h;b+tKXpz47pp^(wD^vvDHqyO7hCuywWDJ5?4-a%`H% zEXpn0!wYQlBqDeq%~=ckhJAd&yetTKwfyV%{&@FvGNdk}0IgUmC^Kaa`n-nD-wr|( z@+? z95xb?qf@r9B+2Vpr!>Ph|U%xdvx zlGpX-Eb266ysv#Dn|4o+mC54rhnp`4G%xy#9#2PhYWs4D{*0t?33x8lc&$(EY5cN2 zKN$M~!}`VgC4)>%XSmMBrT2q#go#09KIRW7P+e}#-~@z$C*Hg^<-0`+Xj5$YR{x;% z-N`}$4(WIpLu306+>rm*kU03`wJGdma$sYIrI_Lu?#L1nMWY=1@(2Oe_$I|3UeHiY zv2p*npJbmpQXq3|ifYFyMw&H|6+-yrnnxk~(H?d`W3Y_TU1EP|#@OUuOxg1A{jdX^ z-VfnQN@Lg?3U7Wk88vymKWDm>vo2c26bii^O{^8@lo-Kf}VqG6jF4 zbisz5h8D_>8TTz}C%l@1OWg1Lx85b3YrRJPdh_KKpCk!4#4tXBO|V7_Ow8hoKdmXG zwN=scL!{oeld7T1Q2zU=|H)^(j~t?+@KpzN-__oj3^s@A#T{K=wY}BbFb}ki?MSp7 zh4__b;y=SekAuL+A*%fwQ{qyD;9{Miy~idmJLhX?W$t~x;_ihf0#6mMtXB1PLz!^6 zR9pLUcR`-t!FXrw^z#_Sv_l?!DF}R}T;dtvc{ZsgakpbSM)F!=A=OtP>8X6F?8X&D~VI7{nzAwGFqU_ z@SQ&HqbSqN6rEZgeKJ~mKvXy7_%uWKujwbD1kVYfJ5R2aj8V13?PG>=L!+h3;35+K zL#_h9-Td6s0&>i5HNUqqlFjeDV&Rt^sC0d$r4FGy#8#M^Dfs1I3FIGmo`3O-lYM?( zr+AsmFn4E@W0}-h<`n@96C~1DJ|w9R!^@MVFxr%F>@>4wC~9GW=)-^M$EJMyyel5c zuP#{eFGi)i$z;O6er==JB}&4EmLoEH<9EN!&=2-ZzuA=|%MZ8RPbsG{N7@NJ475VuuTqUWdHMae8hZtm{i5S@1QoO=rQa`t0zN7D z>u$X1iHSTTaT<4t_+4#p76e@WCBenkXJeW2ht2QJqi)R5ZM??5U;n!y0G9{DX!}C( zlNf0@)aA{v4@`;Ts^?FqI)gyoB{9D7tuyWxSwJOh!Sdk&%s7r{a0K zq&Stc*;AItj1SgVv)3JMK*sgsHqK_?Q$GPtou6+u2oQEC{5c^^1K;YYs+|aenk@iv zBBjY<%D5gqpg^T>;(_uPEvqD*bL!~{RxA-I{VhoS#X9L7DOau3?Hrv4?=)LRGOy_O z-^uEsBD%0;YSzSIq-Ky_i>=OJfvZbXSl`n9Ntt4c%plyF=?@-Lc021It-e#ig>T9c6=n!s5*K8=OZ*TKHHz+dBRYCj7bgqL(I==gS>} zH?T$O;-2~YPp@>_9h0IJTDe$+U_(YzJJ8KJaN7N8FVO?pk>_N5~>r+!pxP?;r3SxVNrh$`B>?8%eLv6&A+N|T>x?#FM!MkCp@*N*@clhb!fh-Ux zZ4H-2F&tdpS0{jWiW=2wtQ%!SEoR=q)H51a$#Ih-qF`+*BOVBKmhpRsM?{+@GY+Go zjMeR@;+Y|YJnszt1X?Kau_Xi@Rb{PT+;SeUs9bOaX0$liw^)y(K9P4 zjIFQm@F2@LS;23|CU4Z4gzFo{Cf(6S%d%}>Ea=*9mVy|@nmduDCv7!cl7$r8{cXaA z_OV|4L+Gix6?D}C> zyM$h%q8p&lA!$0HSq)kX4k0Khp_7Fyplv?iYX7S2o7a;XiQ4`U72*I1Bwep&SgAq< zCu>>EJtm;kVA(sn-wc+nix7vU;eUj;!UYvllEl)T>n5uaL(qc-Sg#im6mYEA-3d#= zoWsY9W|QKV%!VCNEVRORLoOnh7ty86RYTzo2i13#6l=ZV@lehrAZh8gGJby1LTABN z{rYuZh5p3Ft8)iD;+8NFm7X-Ftb3tImR2~;r&=p)SZYcN5v_K zl9V9NHGibT5Z>oSq;;na5NTGR!xj03gY?BL)JP6Hj@BpdY^n1vdFH_<0D9k~WhcCO zovxLv85x`=AwvhA1C+_x6_|~WXp)4mO~S31=+cVeLcM?RrxleNu1GBE13N21?4g~z zG0Ewn`>Pnr5|?|x5zD}srB_rMezmJ`ZvelAY7CkYW&&0{_`!X{?_4$)^pz1?U+h_2 zZWy`J#f-tR_Rnft@NxB=zL^XW(-EZes1C^bfdZ^t3JdUTA6qjT0wJ@0R7{zvbmkTo z0OHC#!tiTW6Jz3dNUhMqL~;Z-#a~nJ{FlC2fXjz5Ze2s&9elK90&&t!8X>g-v9U{4 z75(a(m4ur8tF)BJ3BQZ|M6D;#P6ca{B(GL6t9w-(+%i|P1P$_oE~Ks7nu(JN#jL$a z1#W0{_uY0xgvqqials+$ZNcmb>u-elyD5BL9l$7T28B*Y3uj6FUEIF_X{!5HoPS&c z!Dm6DM7*YYVbZxTv{`L2rz1xf*e2k5t&oJegMf*dAdaWtNn*SNd0BGr^cc#c8aHEE zCxt<|T2)c(Iv`G%OmV+`DO?Kqq$3GXVZ^uVby4)QMMhCFdwR^o)a+?fSmvmBpD*9g ztz49xPp(p7x;k!!hNOg&b-`MpHx>ncwwT|h3=!&a?KunM$OYWmW3F4>DcD* zM^`KuLdc!3<^mDTIqKKtA_dlz@GJ;Y%n4GxlR#Ux$Yf-qAl6OwnWK69;p`@o9pyyR zz|e#nmQoJt3zHqq)-iwmBF$W;Q%1_C`BWjTVg?K?Ei$*tg;ms#_5wzjhcRu!8Tl=H z3wF!)5HfPMI=hCx6}gT$Q%3W~jjT0z-9r zYn#k@ih&;pFw^+*hHoR(lKrLLkG+PcKR?m|nSY@XgpUU|%Pde7iZw|4IhX~6Fm$3A zIM=xE@D*5%W*t<@qoX=}v3xIKcVT>)5HwNo&a^(qnpGp1ChxF_OG+{R5@lkA!d(sS zx;@Al4e6Fy#}+wvzwY*Ia_JfvU+_d_j`Vm+j$HgUwPIA>z4I&g&@S0$cDpd1&dHhM zNGKDNYS@kk&Cr<}ah#m}wrR}c|0rGbZ5O`v1XX0$k_Ot!H=Dmb(?#3zxrm25c|2Y=< ze!!hCUQ2yUzhx>l{kaxr#!NdVY;17LcyHD>QpGAniS;7#5Hy1=mU{xQfWfu5jn&qO zP3K==Z?aqtXDb?W4gR)D)aqU-v**;NuK3&RYu>e~bOYV(^8QnHdT|J4_y-D106rqd z{$K1}>XP=47}Pb$M&Xl4hgQ_aMK@uak2`ZEk7PLICPsG8PokuRins)Z%9-JiA4_B5 zND87t3BSlO1Oyg%6HT&Qe{Bg;7SL^uD*2NJsyQUgXXpUO$!h_{ndw%(wjPvrDl_na|bXICdg?H z8Hc)M8GDCn(XBGih104c$;s=3-JHia4v?S2u&e_q!Tjcx04qRCwn~D-a6^N-xPHVU zG8jo|gp_O!%c5{kNBme*6D1V=dbmr0XJ_;rUFlQfa#l^x~mP_ zG%8)vz3Uz!Ns+lhOS>#BxVpv0nbF(-s zaxVEKa>?^c&4QBIj7hKs=ls#1O|P%=ydl3(@-Hbyo!WtR^QOV!GdVNhHe&hZe6aOETu4J zN~I`fwX5?5`;wIejJZDfP*Kj4VfJ<+f3p{KCD}dmK&C?ZJIBZmx$i_?n7Bsr7Hsxd z-M+LT6nS`XRElP5L*o*d=5~m%&OKC3DOJWZj;5)#g+qlxFy|z1pH-=(}Ctd8oU z1$c}Er+4?5GJUsDt0?|MmmWk^wtJj_34{~=nzRWW{ir)q=uV(#Ffh(YwY}x+b$ox) z^aK3U)dW#bIrc8pO z0N!zi5uBU*OxyiEvF)es^DaY()|Sw`N1kZ z%+ZBjRmR~7Z>2e>ZSYxvyeh3xLV9-&Q8UzwFVj0c#3Zp$w91-E`KT_UwsQ};Tya2x zYlgWP5hSe88{FI>sj^VMb*k(By=5?Xri%iY`;eS3^=sWom@xY42DkYcNeU2l6B+fh zuLS`0+z}EK^gO%spbXfe<21=GEU_9NBiEIxZA>r=z#92`5Kgm$Pp zdp6>w0QZML*z~+zK(B_tfsG5vC z4Y-PuCjKO>%7D4Jb;gQc*hOV>RhB^=tK*{H&++;TY+oJ&qgSTnwkPT+D`acfGx zwJy@fA<~U0hNNMeM>h|B{&1 zMVA)2+a?5Jpd{Ho;P$3CwoPis=XINL4-Nwio}SxP34U(rYA5uSq5<(e ztgHp)Z0ZcdbUxR_9xDCg;HeVItfi5kRD=0sz`J7kZf(97Vv6O;Q=e*bVG@>CtY7c* zWSm}tx3A&JV=vwIMhOD}7~V1b3ujI)?yz*%Gj`L@=kgUtrOWSR0yUfQN|#iaaOde@ zeiH5Mc&29@6>b4T`qKwK2r-bZKvszJ{8hVj*fKTA)-Kq@k4Zs52y}aq#m2rwIQ68e zawj0OGSmz&az1+*nnGIC_e=l7A}PoR{YBG>9B*+kX&F%uW?vmG$Qiu5t%F_o!po~2 zQn>n{kRF@lLc>3BZugot$6O*KdHc{`0GhcRnjw!n=F5Zz7XP07t5{<+DUON;p!-Js zx00Z=3PYc@e`B1T91CPVYgEN^zFp&=0j06K>LYn()S;Bh<#pd_JvIr-|3-vb6jdDM zG;CA7dN9d%sDTe@#a`S>AJNDE4{`o3b1q`su;RpC{SIQqTeTAQ%U3T=as!GuO2*@G-XgthU_dWv;S*a~cLrp`p z!V(cMZtqd-UbcX|D^ivneUAaPgEUNr_z?l;+X@jkx6rl_?9*Vl63r}L09L>4Gm(J^ zl3rki24dU7SG!G=C=cLzHaQ(`LL?+0ZMP&1WUH*fhsw%|iCwa25|?DIZM-zNLik7B zEL6?iB;#pVmPhEeP(U$qzXn;1wju1H59SM$b>kfwaq^u!ljsJ z7Kql?v)EVtg6?QelS#U~&X~|Uy{xR~&S;LLwV`&W9~a?W6+suffChqDk0kQ_ox!X+ zG%f7$J(eG~oy(j$K=^Y)fsvQPHO+Pw$NKj46Q6Z#s%*~voLtMsZf9lEfZ5Q*zTkCH zY*9=2Eu!7HN9yu#uMm~bDeYR8+v&~E%w!4nFKY59ZYDO zc|Ns8J8)>Yt=|1m-C0DIwt9Bw6PEEOTC8<1Z$X;ax@P`&fIjf$EKR+%<_!-|*G3q#dHwT3WNo)mGH7qgxyqlQCcq|VWNhl()^>5I~{NG3DcgxLmdmmsTMQx zBLW$VOZsfBl_YBvm=Pix=)L|#;Ps#0Qh zuk7T30jAH)G=_Nzs)r5jVw&Jxd0l5_757NCv~nD}Qt8^B@Op%OBB-Br?#q>g$f}^d zfcKFTDA1a4gzG-m+%>k&oP(*r&TXg9394+$Zz#z|6|sOkeXF=T1)BNsIu8e{>@Q5U z?=MAjXjR?07k7cD{Wz>-iABF)on~o%!|l$&)Pz1)y`vm^&Wf{r-HX|fDiK|H& z?wx)EWsKJ)InEgU0~)1gD)|TTS!sEYy-vUEj5PT}!VdfeAKeHP@x3cs2SqPe*CB7+ z7=jXF1}j$tU?)|Twbw^PkMeeD%|Hl;&5Q$HwK45snf+-)gGXv<;D^~Hr@-Ldf>-gH z+*i6h=&Xr9QI@c}_YKhcJEGhJf$gGs1PBRyChm)nOtZVa`Fg2NB_Wi+P_%@xZ16e1 z_igyN7p4UhI-7dGDqA9>98I3SQ{Hzy5e z#rM_w?C)+`o9FJ`4J`5Ul-lw^}#CH>3 ztC6S{&RNlCJJe$-7gARUjv+-1pBZTXE8e)Qki@_QUAGwE*n;bYY*0HA3U$}7z{_sZ5fGnB@gS9d=;r=D2NhfIetKzyJDI_Y z9oJG>tZZH4kt+_vqD^{8) zEKNzS8b3dR$-$T6tNMPIR<&p?oDvjH0sggeepcJd_rvl&gyUy$pCmzRHQP+?|Gw~! zt5@V=)dt?c)%A*rrR{Pn8yB~fJGz4DNttb7YaO7*9nH>{?z#IDHghbHRF&2+--GU( zhq`&&XD^2yW3v2aVwE2}JG#l(ujmCXT;KovX&R*Z_dYPJFbQzj*t~6DemTNBS=H0; zya(ute2$=_l3+oXMb@3Tbf>DHUwiBZn2G6qS3QSawB=0%Pdp>{AgAv1O6#J;DH(k!c_2pBsM zkAs&V&`RpUu7$SBjzujMcgeIXs#9t{BV+tr^&U~N^6<1&+jS3VrwCY}3fRi}eUVD2 z{_@<$W>+VwM=EhmGrQUquKxuii-Mk77^sGoLXksPVagD6!xqI|9C)9D@mKKek-)2O z_(Q?lTIJ4QuljfH;6-H5s_Knf#$hQ^FyfX7{t})(qPwMwzybRFxkOwb3|R?1R87U; zoO>$5&Kn0K&ZcF--{b!MaZvKu#l>lTP7}!o30Y8**XKz2{c8TLWQ4^QDY|8A&*1?d z5Ei`I{UQ?iW8x+D_oc_svikA|d8Rh4Ms|s=R=e?CKm0t}S9%v4L5F~7$RT>5LntE@ z$P%GA*fVG?z;tYxE?>x3%2tbO0ttV@G@IE-x7NlVDRsxElt3H~UFPq^}I#=6c_4YriRi7g-+X zgGrk`Il}ffOIrPrJKOt?#@?gM&)NSD>0Ou8&^gzXq;L+6MLPV>`Cu2QWAyORIs8;Ai2t zB5~`T;QfrZs|?z9ly)xpceEn6hJ7QHP`gV?%!~3>F*j=*>ly-i@g0<=Opaqm$Ya1 z3VMqhE-Sxw=XVX$3x?kP^9&Kk+0M78(Bs7e@cGosjrU)I0FSk4(8XyGPvPK!zkV;w z*n4k=Pvjy=^u=qce+DX@;x+axoETB9!!%WJ=` z?fzk(d)>`qMIHwlLQp%DpYB|so+&HQ2t3^m+g=_|-t@2kvO6@V`8v#{_bfj8jzZnk z9E;g>0{xd%_Yoqi53#m@*oatp*!&YXUT$6i4sHPs9)2BeJ`sKa5k4U{Zf+57ZhtN0 zzW-%#cC~h}{qlbsuyA_({~1{RX9b9ZvyCUj!rATr_85{El>GC+DaxwJ)PT%G{~uYz B2V(#L literal 0 HcmV?d00001 diff --git a/sprites/spr_ship_weapon_macro_cannon/layers/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890/7e9c9e28-a54e-4389-8a37-9735f9adc44f.png b/sprites/spr_ship_weapon_macro_cannon/layers/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890/7e9c9e28-a54e-4389-8a37-9735f9adc44f.png new file mode 100644 index 0000000000000000000000000000000000000000..69eade3752927290b227df3fc5812493fab90f36 GIT binary patch literal 10308 zcmZ{qWl$VExVC}f?(R^e$fAqe;;t|54vVuui)(R*;tmB$ad#_Tr0C-AE(I3-`u#aG z=f{~$a?d1lCo@knlgyPTT0>193!NMt4h{}WQ9(xQpN9Rbyr{_k+9thDf`3A5rJ$t> z2j|NK2NxU;2lw=^EBFWw&Wj5U?!+7pPB;?|j>IjuLsRtM0J5dBybRp?|1X8z<*9IR z%mRusQaYbk&btkoa+kagA4CrQr6;{krw9(NLut{_OBG_f=C{64t~Q7yq&6*Bd?hLe z=uzKfPD$tAB$*l*7`O{Z?;=3}J|dR$4H;`{rEMQuD?_?=M1yHjjeqy$jb!)!c>3?$Adb6cr)e4}=Nn;gyf>?V#K-%R?fO*PUfB;$wV4t|6U8Mfj~aR*NX)M8jY#2;qqsyjSi=D{ga;*DzBmIOUe~I6=sTX={O7&P z*90Wx_e5GHKGz=agJs(hb_fOd_Q9`M0?os$FNsP>RN(D6$ZdR#`1+P8d&!J0XG~+P zEO)IMb(gBxI*hR;jpy4(8>pet{5WUpx6;u7cc6`w8|; z((w^Z7i23jI7n@T*WyeYdoBB94xj%;$>k^9R(E*w+^lc!u_mSH9m; zygvY1@h`l9LCD2jJ5COpB&Ir9@ITLM&FF|g9jM2&lsI&>SRZEVhRS=cI>V~~ZjHcT z2nH!t2>-*q8wQh$TSZ;-)y{2@?^)nvKOp;MjU&t~JDcqScE(yl5bnmMiBV#uLT)jO zn*-qje$?KGa1))K!d_JRma$lA(iJ7*f$601{Dje@yZO|LaQig-L@t z;ejLkPA&YO|JKA_0}>_O%nzD%u+_DXE^KWmC_?IXJ)pp9{|VzZ9%J)urYDz5+;^NJ zKg;t*y0o8IOQAGF`hi?OmHtJvlpBi31!?6>r4W~^b3bU>C6Q9vSzPIg4m-T?e(86O9+DYiW=oNoyZ zUulHzxAfj8-nYTi?3~VjD){S&MfLtPQcJ0)k}F#h)@z_zB_kj!3B|e1d?vi1UJT_Y z2lHvB;i7n9$D?!p4sw1wI|Ya`htt~g5eru@icL?OgwUNk6>NOIRag52h=erqPOcYZ z|7{=>)hbn$3YAStvY-tSYsX7d6kJs?FzIT!N)~8FRzV-$AsW6yFQG;JA^26qzwUhn zu#;Y{0i(O&?G4c;_2>SwTcv(_W!H!wXu4w?JMF(Kq8DwQtdoJKPx;YZXOqi_j+;0x z2^C%meW0U{G``sc*y^YM{PtQbC`+2SvVuho6%&7kF$V=L>f0}zgq`!)K5$|rvoq&aJ0->{D_n3n~BuakpCW~!OGF1Lqw0Kgd zeTlb9@8aMA3_5%G$&VIsgKPN&%_Z~muQ_XCC2SB3Ls8@@iQ4#-aD#SwYTrV}LY%qQ zoWn*!lC&?jr}QD*LgB;~D#9E4<#O7F^$h;f26n_+cWh+ z{QDuzJ5-S!`#f7azjsEz_sOby_HhH{pw!Ire3nh(hJByJJ@Q_Y3k!YUB9457MnbKr zUDCKW#I11;nOPwWZdsqH^O^CJfPW6?)U_HEqGm79it7@xHqU?=aB`V)O%(BS5F+b# zz97*{()@O3?)Liow|1jC7k6&?5t;btn*&>P9HR<5o00R|Q@S&-iq-K74uo24j*>?% z6G%z%fEtF(BM?U}mZ0xy8P{(+l4MFfa=g<){iA^dPZpKVHNH@S`yedmNIj{4omnmZ zOyauUoJF0cjOVp)WYg~Hu`*dq{&4fcpPf2rK{)+9As`*=akI zEM{;{e_$Dr{gDXdZ0S)c;!(120=NLDx9+jdhUt;OZueBOzDPXRvY{)V@-r+vEK~3& zN*8R{X=tJBm~r2tcEYPE0AhaUzx6KRTyuJWUx6@FXrg_s_m`bhIycEY)7Ky zD9EQY6aN_&dK?5k4pHsjm=cpD1Q+WB?L9Vm**RZBD|7Gj6?ZQ@5xA>(WVNcV8_I;j zCEMDUy9@IC4#qocr=Q0trXBL=OF`f(T&$CH2@wyy#i1Eabr$EO*>e@#CLCU{N=-gyF6GDg)Bw~rah4ULvAgNsP` z4gm#zyZO1N1>~6BYJP8JB%9xPM8hvTQ0e+gOC3VFiLEd-Q}D~b639PrKmXz$C;R-o zPVq9AVeZZ*$1ly zPhFtmUyMq3lgWgB{n|#cOO${OEk|VZ#_xWcp&#s-ezPk_mLG1rpHfa^#^KJkwN3o} zc5oKac!>*+CK#c7d|9g$i?kDb7-)sQU!@v%^6>d>HTDW9`$fm+2qq_ z5@J-&W=~ndGd@^f&0cr3ff?72+c=wnPyGZqb$-6tAYj;`(C36O4ScJos&*m>YBoQ_ ziIgUbDdT$dfC81ii5tpSw5*bJ&Z(y-P_aa$^tT}O7we>Vq+GR9w{vtJywhwM$-JW9 zeurgI%U((&ErV`np_-7`8~|I8-8 zyn!uJ7x&EHe|n|c?wAy<(8@(41R64$+NIo_1Gnw4!VAzb8Pa)%LZ|0LqyhIJRj3Ot zKfTuR&a;7>JhIyhWiu_E+Q)(G_P|@F&7eck1TEwCmQdB$(s z#<4eqTA!L)!Y!1_R}kAHG!2}5Vkar!9cm+{)Mg$3)(zAB3EmA$mGAhNyTeBxFU10Z z($)Yhis9h$zB&Q5Q`D$dW8EktYBBQ;rk>FNCC5#Uhyt~#jCdf_S;p@j9uaMt%s7mS zGFG>rif4up^1L(n5@?~w$CeOuRF$=U;V(a%e`#int;;)?d`WeB#NFtFFFpV=MbE6H zFt)zJ!-Fj2WCgw*o4iqH60UC)n{-DTEz7ojv7l?aSqfqpYwkprp0w3)NfuOW_qPcf z+Q)kF54pbwwj1M(5Nz30xVoe|l9H0q*3``WaAlxU^lFs*+#FJAVo|5Hr`PjRu~wvhJOF8Th(-+rNp3e?g4dZfSF|H#p)T;J6pVKq>x) zRFfN!wO}KyyPx^`*Y2_3EFf~SnS3xzdyg_PKHXU~btsip_!w`Do9AOeQFkJ)92KVk zN>YM6VE#ylA-vCvNb61;DBP?-hb#OG2kDDhsF56Y9Ia2@*;40U^2~!zK=i&z%T9Rn zI$bMSGcq_$LWT}J2Pl)Xt5h~VqDd0MHVKzvqDw1=3-$iNpH@_AxFXT05A3W6v4?i< z#w4eQ?ysUKO91zPBbI?NORuOj{AyRB-T*!e)fhA*%ml1@@Pqq?-??lq=qn?(zUZ@< z+%R&biy4Ds?Vr`Q;N$8!eKQ#%rXxt_QJoa)2MVxqDJ;OVeQeEW2!zb~Q88tv(wR$$ zUkX>|5r$v0nivzuO=^V}CY&R%DfXIr=fCvL0$e_faqAlD?%<;>6Nr;;(g>*yh>cyU zs_0kOtR&RzU!|o)PWWByCt^K;b}CSlByqKhS>3DR;Fh_PC18*rbRlis)=ZpKC~ECZ z%6~(vyYIFmEJUWAjtdT1ZwqEmSbrnT-%a85>X3@UW>Dyav~ZTx-^Kk4kfyqC#relI z5PTLSO4w_v7bcziLYvhVb2@T#fo%e=*9u9fI|!JV3F3GPo+QRgke4O*PLH8Hs&O-x zby66Vt5p@ju9LzElPT`EFNI4XpL8UVQW){=dR-LxY>`ov%$^=IF*SSI6qY$E*5}JR zbSoDnCo%n1qhdpLJd3l^bm&R?Oz5ssJ5pUd;x~4EgRa%}er@CXwLy#SQstQ+{^mp9 z{UP51s}V^-uL#%YvS^|G!>8{Ys$>b-3deQ(f3=4eL81F7wSd{9&!~AC$FdMZFCE() zzUYbtLkPL^)m$K=IY<4vTqOUR5}pM?ia9~5cM@pJ7MYAp1jM?jK65mWKb+k}vZI`6 z8W@^z!&1sYePObr**fO0U!rpY@j;*wH~zeJf>p>S1$ zyKWD1Mnk$~*0F`p-LJbnn_RjE#uq$MnIk=(k|P(tO|2M}cklelJ+w>qncXgor*m@V zI1YOI_0b5reu0*(iJx>ClSWxX31K^Koacv!JMcUBE=n z$oqtK!Fz2pBg6x+b+w3)pmsG!-6me6IEI7M{~Pmzt1)dD?ZUS_UzFWX;m+J^U<;nq zQXU*N3D0lwKlYjtHp`%E^p|^4est9}^!&sY>;zKrWx5%@jq)A!ic}d8H@MP)G3>i) zc-r(tJ<5?2#C<`Q%2DNhsdO$U{vMCQoIW^xg`w6bR?ywKf@* zd^=f(3#c~c@(Z*{TBr9bq@gv1D-`PZHdHfR^s~s3XvMIG5a(ub zSomDxN%)fcmzo77vl){>3(onYKbu}(_R;M!Jwp?#qh;J z2XBRL#rb5wb)FWPQi&6iNEc5%jfE|qJ6TF$ z%#=z|%xYKX3-%=|2^e#I@}Z)fJHzblME+(k=t`n{=7CIw@^_ArA9CM`yby7X#4XtD zvATU}Loo92;HVVM)P}|-FwN}{VV!HJno_cidmK$uYYT@8g<#G}-af0W=@3tNqSn0n zqZ44x@C6$fpIq9yMQg8w!bS)b3C;Eo?PI$FFiRvheJd&weS7+t;*xiN@C7$Um^cM> zZUb?f781jSwtge1Sex)0yRMKx)Phw{{aR3p)c+bD6k>d<@ycC%ZINm%k}3Aq^HRb>I^QL|AFPh* zqWQUv1g3ZQm@<90P^&2ZLzf;zRJMDZfboYD{+hH29sQ^~Qs_>gXD~3%NVUD?>~(y9 z()0uT)71o2j@KXIS#@8A%ctb`u%( zv#$jR_1qB@5b!*^^PmjaqT@8lE-bMcA0yY5tZhs%3&0xrd*uDi0SR8JF(JVhg9+_W zb@qI2j%nzQoDnE1Zvt8Snj_IxB0@*#Fn=b%@>*)Yx3xUlaxuMN13sN;1 zc^UwUk|zEntjd4^TsmXLFYF>YB=v&UvEmMG(QH)VRc^VQ3C<;_B&-=@{;afozdiXmy(=F!bVpFf`D@VB_;4?^L88wJHIa1TsKSs-eXM!0;SGpR$h79NQ+f9A#LlC52^i64^!zaZ%LB8!cEiE!#k zRppLfW@V@uUif_WGBky>sPC8lhecA55BiIy6FJ`EV$w3A9?ZTvT7WZncUuR$@P&s* zJEU;+K_NXh$%Te*;N0#tZH~D_M&kCNzW_9IIW$8acg&j!4J`gW`B$;VXi^Ln4M_Km z`fnvcX%&V(YyZYLJ2@7}eAcLn`+U2`KLbi*chyJo%&0>tnakt8(|T+Yl>dzgwJ54M z%4yi9di7wE_fP{L(u%#fl|G`mFV=XqBF6S&hk#5+q=Y(PDk#CvFX{t1kWwncSF-T$NOST@D}6f4frti0Lc*^z5>uhgDUA=0{)-`A6en-n#c0c*sg^SsH2@ zq7{}fzj1qyV)wEIM+>7QWhTqC|N}t!I?#VkC{#`foG7_4r!Zpy(-;cCBAIK36Rp7Bfl- zQR7f8OE><<+=8I~F!$$T^n=34DI5Da7r*ZA<@=N!Z9LlC+mE#1G}^K)oVVo%`)JB6 zV?24r;ORT-h$>}3zKajA07=0m@N!CUeE^!Px~tt`B>iymYClT;Q!NSzDEf+Rp86KP z%J&ZuaCb9(I{aIbT(?kLJbO$9m&JH?IngeP9FpMIiYla9wJwbstJ?8eU8FHkiYAP% zunNws`ygz31gHqyuFB!i&h<}f>Xw4)%MWqvw8+^@K`ZM&o8aF&-WdYIRIiX9b`IE} zrd0bjtiNA|os7*yiJZ-PBv{XI#;pp(hp#lEivib^(J2Ue2&kcmEk-898Le&p0TC|6 z+_O?>Z9R*9)i3Cd<}{h4%j=8@z0=FedhU$oNLm|eclvP=-c=EFu?uJ*nDs~^@822B zszcMl9^Yg6VcWUPsRM*RClnZYIe=-lvpCkbr=R$&V^d{w?&suMHg-EJlLpL&CiVrd zi=vBKLT?f6#yygke|rU~d`@ZCvfNH@ejfkikii!402iAq>7&8fI4m+68 zHgkV!i+149a9h3mp}Mn(EN%7d&MPG2PqbL;UfzNV`ELyPGkq*V$Qz*fS;LJ@XT;YDe^h=hq6l1lTBM(%XH$tO&E{tk645Tjbm z$d3qQEH3G@wN|3^&PQT75N>>0S<3%Y0c$b}z@}AA725PfYpLBZa6YYl`xALl-Kk26 z*}bxp2L_rxGt(I6C8!=Yw2Nwjcja}RnN{2)+0x2!=t`w)d&27x_KBc=*10cN;=-!} z_Wa&QPM|<*!V$oIthsA!ojC_nft}kYmR@q;e zYTsXq=FqCTb1&usPy2CL$r6ix!8*;-{D#Y&gQ*F9u6jo~_M9DGUe(Dba&1OXWD-}C zGTb};2Fe((OLCks`Uf;h&s6dc;Kgh#uwb(wcz~4x1SVylP|G!!rBRh6az+(!dY1Nlt;my9KXe zHMy^JdC*xCf1)fQb?+M~>+gti4+OT0<`Ezy@R^t|LNd+n_U7xQI+eI!0z=Uf#>#{i+8`nzYDIaa@7{xd*T%T&)y9f<>-q|C1_&yl5V`BZpRYbGcDM)(fK1 z{l)jy`|R&-TASzY-3=`9^5kMsSIsr|`F>=xyv5)5a9kdsRL&LpDUqP1YVXtBUgEn6 zkJU(23+JrJvmNTOqzkDl1jmpfhSvcx(Z9Asf_=ghCxP;sZ81 zsFNL`BH47Q6Youq-2z;2DkMllxw27&4)C&@bOgkwlH5q;AG*1|&p}1kyPsYf;ZA1o zV#l>q7AsqqxaEq&uqacv_LSNJv5ysAERiIbk0As+%Lv_*x8^uSUP_MaMt?cG8M{xf zflE^otH#fdU~=%K*s8wYrBy9j3#T}RQ-FW1oS)V9^8K*958?P3+$RapTFo|-`@b)| zBz5>0EV zH5FzmwN2W`_dbiao^HL_ofzfZDr1lo81;UBV_xKV5o`x@5i(O}PV9RMD$TM=2!pW$ z@i=(+fUTr1>{@86>{!&2ahFWHB08n!Gcv}{RqqiMD-TagwO#j+c8Y)ns(`Jm-xsNb z>Mzf2Y<6`bdZgmlG_$K+;rd@NvMA`Og{0K5QYdohDoh!IZrGx@iUaR+F#Za>Jra2J z4Sy(jTdUj|>{b8H6}*V-SyjDp%Q!4a3P#)##$UqIM|8Jz;Xgp1KNpV+gdr=ThpMR< zoO4Y@*m>h%#M!hg_xZ95`%3R(Bj6Aa4LL*)bO>dH zO0h&J4)zRM^D`Y=rpp)dma^62n!tkI|Ges6sIyHLPL9X(zrcrRH3Z>@HJkGf+lT7} zENY#K@U^v|Tk*A#r9m{5)`a`}i)V0A9{-@bngs?*g|FUfDFT5l2R<#{7qH(ko%e#u zo#FxG)BDe5#(`g$L|!YG`LLtCb(a?m`$@1VBHRrFznlG}Bhps}Zv)~<;*-wx!(E#~OoYT?8fpdjt;N$R_c)GyCz(w~IqD)0H7`Nh7ZZCO5%ukB zzXr=^+m@!U$fRw}voEIpgOKlJFh6T5)rN4hx`PSQ=)tQBh|zec(1lp_89aaJrq-+7?6L#AxW@j= zoRNtygPFt54Zv7$eHU+lYB~mx8YQ`nIZL9NuY%Cm(>7G6f{5;ByKJLc4g@Q9(m^e{ ziTJ;$4u&txX0U&FV6(gIbT#N9-SxP9c#iMmzq|y}AE&E7H}%DiQSGz$2;AXDH^bNT zJb&=)FW+n|lcejJZ_OM!-7M}{P{)jg-6okS)Ea$>SYG>e zZTAoR-0N-@D{?!~5Q5sFe01mh^-NibM&Rjo*!J>x@}__Nm))T`&DUXo-m}=~I|_AE zb1Y`l3G`o5-A9P5KE&DrVk2zjVe?Pmc({1@Ik@;axcPLrc!l}+g?R":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_ship_weapon_macro_cannon", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":51.0, + "seqWidth":131.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":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_weapon_macro_cannon/spr_ship_weapon_macro_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":65, + "yorigin":25, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"NavalCombat", + "path":"texturegroups/NavalCombat", + }, + "type":0, + "VTile":false, + "width":131, +} \ No newline at end of file From 034d26e0e1c59b58ac60403a6cdc69dadcf0d308 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 14 May 2025 15:28:25 +0100 Subject: [PATCH 053/155] removemoreship arrays --- ChapterMaster.yyp | 1 + objects/obj_controller/Alarm_5.gml | 7 +- objects/obj_drop_select/Alarm_2.gml | 40 +++------- objects/obj_drop_select/Alarm_3.gml | 60 ++++----------- objects/obj_drop_select/Alarm_4.gml | 47 ++++-------- objects/obj_drop_select/Create_0.gml | 1 - scripts/scr_ShipStruct/scr_ShipStruct.gml | 16 ++++ scripts/scr_ShipStruct/scr_ShipStruct.yy | 13 ++++ .../scr_controller_helpers.gml | 21 +++--- .../scr_draw_management_unit.gml | 3 +- .../scr_drop_select_function.gml | 75 ++++--------------- .../scr_fleet_advisor/scr_fleet_advisor.gml | 7 +- .../scr_fleet_functions.gml | 3 +- .../scr_ini_ship_cleanup.gml | 6 +- .../scr_marine_struct/scr_marine_struct.gml | 16 ++-- .../scr_mechanicus_missions.gml | 3 +- .../scr_player_fleet_combat_functions.gml | 33 ++++---- .../scr_player_fleet_functions.gml | 5 +- .../scr_player_ship_functions.gml | 40 +++------- scripts/scr_roster/scr_roster.gml | 3 +- scripts/scr_special_view/scr_special_view.gml | 3 +- scripts/scr_start_load/scr_start_load.gml | 4 +- 22 files changed, 159 insertions(+), 248 deletions(-) create mode 100644 scripts/scr_ShipStruct/scr_ShipStruct.gml create mode 100644 scripts/scr_ShipStruct/scr_ShipStruct.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 51b8250e3f..f7c3fe8650 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -888,6 +888,7 @@ {"id":{"name":"scr_ship_count","path":"scripts/scr_ship_count/scr_ship_count.yy",},}, {"id":{"name":"scr_ship_occupants","path":"scripts/scr_ship_occupants/scr_ship_occupants.yy",},}, {"id":{"name":"scr_ship_weapon_struct","path":"scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.yy",},}, + {"id":{"name":"scr_ShipStruct","path":"scripts/scr_ShipStruct/scr_ShipStruct.yy",},}, {"id":{"name":"scr_shoot","path":"scripts/scr_shoot/scr_shoot.yy",},}, {"id":{"name":"scr_special_view","path":"scripts/scr_special_view/scr_special_view.yy",},}, {"id":{"name":"scr_specialist_point_handler","path":"scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy",},}, diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 80e04e13d0..163aafa36f 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -556,12 +556,13 @@ for(var i=1; i<=99; i++){ // Creates the ship var last_ship = new_player_ship(new_ship_event, ship_spawn.system.name); - add_ship_to_fleet(last_ship, _new_player_fleet) + add_ship_to_fleet(last_ship, _new_player_fleet); + var _ship = obj_ini.ship_data[last_ship]; // show_message(string(obj_ini.ship_class[last_ship])+":"+string(obj_ini.ship[last_ship])); - if (obj_ini.ship_size[last_ship]!=1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); - if (obj_ini.ship_size[last_ship]==1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} Escort '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); + if (_ship.size!=1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); + if (_ship.size==1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} Escort '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); var bob=instance_create(ship_spawn.system.x+16,ship_spawn.system.y-24,obj_star_event); bob.image_alpha=1; bob.image_speed=1; diff --git a/objects/obj_drop_select/Alarm_2.gml b/objects/obj_drop_select/Alarm_2.gml index f58e7404dc..ba2c1df43c 100644 --- a/objects/obj_drop_select/Alarm_2.gml +++ b/objects/obj_drop_select/Alarm_2.gml @@ -24,39 +24,17 @@ if (l_size>0) then l_size=l_size*-1; if (sh_target!=-50){ - var tump = 0; var i = 0; - for (var q = 0; q < sh_target.capital_number; q++){ - if (sh_target.capital[q]!="") and (obj_ini.ship_carrying[sh_target.capital_num[q]]>0){ - ship[i]=sh_target.capital[i]; + var _ships = fleet_full_ship_array(sh_target); + for (var q = 0; q < array_length(_ships); q++){ + var _ship_id = _ships[q]; + var _ship = _ships[_ship_id]; + if (obj_ini.ship_carrying[_ship_id]>0){ + ship[i]=_ship.name; ship_use[i]=0; - tump=sh_target.capital_num[i]; - ship_max[i]=obj_ini.ship_carrying[tump]; - ship_ide[i]=tump; - ship_size[i]=3; + ship_max[i]=obj_ini.ship_carrying[_ship_id]; + ship_ide[i]=_ship_id; i+=1; - } - } - for (var q = 0; q < sh_target.frigate_number; q++) { - if (sh_target.frigate[q]!="") and (obj_ini.ship_carrying[sh_target.frigate_num[q]]>0){ - ship[i]=sh_target.frigate[q]; - ship_use[i]=0; - tump=sh_target.frigate_num[q]; - ship_max[i]=obj_ini.ship_carrying[tump]; - ship_ide[i]=tump; - ship_size[i]=2; - i+=1; - } - } - for (var q = 0; q < sh_target.escort_number; q++) { - if (sh_target.escort[q]!="") and (obj_ini.ship_carrying[sh_target.escort_num[q]]>0){ - ship[i]=sh_target.escort[q]; - ship_use[i]=0; - tump=sh_target.escort_num[q]; - ship_max[i]=obj_ini.ship_carrying[tump]; - ship_ide[i]=tump; - ship_size[i]=1; - i+=1; - } + } } } diff --git a/objects/obj_drop_select/Alarm_3.gml b/objects/obj_drop_select/Alarm_3.gml index 7b04af3c23..d8e28247db 100644 --- a/objects/obj_drop_select/Alarm_3.gml +++ b/objects/obj_drop_select/Alarm_3.gml @@ -18,54 +18,22 @@ if (sh_target!=-50){ var tump;tump=0; var i, q, b;i=0;q=0;b=0; - repeat(sh_target.capital_number){ - b+=1; - if (sh_target.capital[b]!=""){ - i+=1; - ship[i]=sh_target.capital[i]; - - ship_use[i]=0; - tump=sh_target.capital_num[i]; - ship_max[i]=obj_ini.ship_carrying[tump]; - ship_ide[i]=tump; - ship_size[i]=3; - - purge_a+=3; - purge_b+=ship_max[i];purge_c+=ship_max[i]; - } - } - q=0; - repeat(sh_target.frigate_number){ - q+=1; - if (sh_target.frigate[q]!=""){ - i+=1; - ship[i]=sh_target.frigate[q]; - + + var i = 0; + var _ships = fleet_full_ship_array(sh_target); + for (var q = 0; q < array_length(_ships); q++){ + var _ship_id = _ships[q]; + var _ship = _ships[_ship_id]; + if (obj_ini.ship_carrying[_ship_id]>0){ + ship[i]=_ship.name; ship_use[i]=0; - tump=sh_target.frigate_num[q]; - ship_max[i]=obj_ini.ship_carrying[tump]; - ship_ide[i]=tump; - ship_size[i]=2; - - purge_a+=1; - purge_b+=ship_max[i];purge_c+=ship_max[i]; - } - } - q=0; - repeat(sh_target.escort_number){ - q+=1; - if (sh_target.escort[q]!="") and (obj_ini.ship_carrying[sh_target.escort_num[q]]>0){ + ship_max[i]=obj_ini.ship_carrying[_ship_id]; + ship_ide[i]=_ship_id; + purge_a += ship_bombard_score(_ship_id); + purge_b += ship_max[i]; + purge_c += ship_max[i]; i+=1; - ship[i]=sh_target.escort[q]; - - ship_use[i]=0; - tump=sh_target.escort_num[q]; - ship_max[i]=obj_ini.ship_carrying[tump]; - ship_ide[i]=tump; - ship_size[i]=1; - - purge_b+=ship_max[i];purge_c+=ship_max[i]; - } + } } } diff --git a/objects/obj_drop_select/Alarm_4.gml b/objects/obj_drop_select/Alarm_4.gml index 9236122bdd..ec5a7c9303 100644 --- a/objects/obj_drop_select/Alarm_4.gml +++ b/objects/obj_drop_select/Alarm_4.gml @@ -19,42 +19,21 @@ if (sh_target!=-50){ max_ships=sh_target.capital_number+sh_target.frigate_number+sh_target.escort_number; - var tump;tump=0; - - var i, q, b;i=0;q=0;b=0; - repeat(sh_target.capital_number){ - b+=1; - if (sh_target.capital[b]!=""){ - i+=1; - ship[i]=sh_target.capital[i]; - + var i = 0; + var _ships = fleet_full_ship_array(sh_target); + for (var q = 0; q < array_length(_ships); q++){ + var _ship_id = _ships[q]; + var _ship = _ships[_ship_id]; + if (obj_ini.ship_carrying[_ship_id]>0){ + ship[i]=_ship.name; ship_use[i]=0; - tump=sh_target.capital_num[i]; - ship_max[i]=obj_ini.ship_carrying[tump]; - ship_ide[i]=tump; - ship_size[i]=3; - - purge_a+=3; - purge_b+=ship_max[i]; - purge_c+=ship_max[i]; - } - } - q=0; - repeat(sh_target.frigate_number){ - q+=1; - if (sh_target.frigate[q]!=""){ + ship_max[i]=obj_ini.ship_carrying[_ship_id]; + ship_ide[i]=_ship_id; + purge_a += ship_bombard_score(_ship_id); + purge_b += ship_max[i]; + purge_c += ship_max[i]; i+=1; - ship[i]=sh_target.frigate[q]; - - ship_use[i]=0; - tump=sh_target.frigate_num[q]; - ship_max[i]=obj_ini.ship_carrying[tump]; - ship_ide[i]=tump; - ship_size[i]=2; - - purge_a+=1; - purge_b+=ship_max[i];purge_c+=ship_max[i]; - } + } } } diff --git a/objects/obj_drop_select/Create_0.gml b/objects/obj_drop_select/Create_0.gml index 617d106047..896354ab1a 100644 --- a/objects/obj_drop_select/Create_0.gml +++ b/objects/obj_drop_select/Create_0.gml @@ -71,7 +71,6 @@ if (action_if_number(obj_saveload, 0, 0)){ i=500; ship[i]="Local"; - ship_size[i]=0; ship_all[i]=0; ship_use[i]=0; ship_max[i]=0; diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml new file mode 100644 index 0000000000..e9bfc387e6 --- /dev/null +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -0,0 +1,16 @@ +function ShipStruct() constructor{ + features = []; + turrets = []; + weapons = []; + location = []; + owner = 0; + size = 1; + + static ship_self_heal = function(){ + if (hp<0){ + exit; + } else if (hp0){ + ship[i]=_ship.name; + ship_use[i]=0; + ship_max[i]=obj_ini.ship_carrying[_ship_id]; + ship_ide[i]=_ship_id; + purge_a += ship_bombard_score(_ship_id); purge_b += ship_max[i]; purge_c += ship_max[i]; - purge_d += ship_max[i]; - } - } - q = -1; - repeat(sh_target.frigate_number) { - q += 1; - if (sh_target.frigate[q] != "") { - i += 1; - ship[i] = sh_target.frigate[q]; - - ship_use[i] = 0; - tump = sh_target.frigate_num[q]; - ship_max[i] = obj_ini.ship_carrying[tump]; - ship_ide[i] = tump; - - ship_size[i] = 2; - - purge_a += 1; - purge_b += ship_max[i]; - purge_c += ship_max[i]; - purge_d += ship_max[i]; - } - } - q = -1; - repeat(sh_target.escort_number) { - q += 1; - if ((sh_target.escort[q] != "") && (obj_ini.ship_carrying[sh_target.escort_num[q]] > 0)) { - i += 1; - ship[i] = sh_target.escort[q]; - - ship_use[i] = 0; - tump = sh_target.escort_num[q]; - ship_max[i] = obj_ini.ship_carrying[tump]; - ship_ide[i] = tump; - - ship_size[i] = 1; - - purge_b += ship_max[i]; - purge_c += ship_max[i]; - purge_d += ship_max[i]; - } + i+=1; + } } } diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index bb2012c3e0..192473795e 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -160,12 +160,13 @@ function scr_fleet_advisor(){ y2 = y1 + h; draw_sprite(sprite, 0, x1, y1); } + var _ship = obj_ini.ship_data[i]; with(_columns) { name.contents = string_truncate(obj_ini.ship[i], _columns.name.w - 6); - class.contents = obj_ini.ship_class[i]; - location.contents = obj_ini.ship_location[i]; - hp.contents = $"{round(obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i] * 100)}%"; + class.contents = _ship.class; + location.contents = _ship.location; + hp.contents = $"{round(_ship.hp / _ship.max_hp * 100)}%"; carrying.contents = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"; } diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index 3427fe943c..589356de4f 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -206,7 +206,8 @@ function load_unit_to_fleet(fleet, unit){ if (obj_ini.ship_capacity[ship_ident]>obj_ini.ship_carrying[ship_ident]){ obj_ini.ship_carrying[ship_ident]+=unit.size; unit.planet_location=0; - obj_ini.loc[unit.company][unit.marine_number]=obj_ini.ship_location[ship_ident]; + var _ship = obj_ini.ship_data[ship_ident]; + obj_ini.loc[unit.company][unit.marine_number]=_ship.location; unit.ship_location=ship_ident; loaded=true; break diff --git a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml index 0ea0880a57..e9ca6f7bd3 100644 --- a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml +++ b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml @@ -4,6 +4,7 @@ function scr_kill_ship(index){ with(obj_ini){ var _units_on_ship = []; var _unit; + var _ship = ship_data[index]; for (var co=0;co<=companies;co++){ for (var i=0;i -1 ? ship_location : 0; //ship array position if (location_id < array_length(obj_ini.ship_location)) { - location_name = obj_ini.ship_location[location_id]; //location of ship + var _ship = obj_ini.ship_data[location_id]; + location_name = _ship.location; //location of ship } else { location_name = location_name == obj_ini.loc[company][marine_number]; } @@ -1912,7 +1913,8 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} get_unit_size(); // make sure marines size given it's current equipment is correct var current_location = marine_location(); var system = current_location[2]; - var target_ship_location = obj_ini.ship_location[ship]; + var _ship = obj_ini.ship_data[ship]; + var target_ship_location = _ship.location; set_last_ship(); if (assignment() != "none") { return "on assignment"; @@ -1944,7 +1946,9 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } else if (current_location[0] == location_types.ship) { //with this addition marines can now be moved between ships freely as long as they are in the same system var off_loading_ship = current_location[1]; - if ((obj_ini.ship_location[ship] == obj_ini.ship_location[off_loading_ship]) && ((obj_ini.ship_carrying[ship] + size) <= obj_ini.ship_capacity[ship])) { + var _ship = obj_ini.ship_data[ship]; + var _offload_ship = obj_ini.ship_data[off_loading_ship]; + if ((_ship.location == _offload_ship.location) && ((obj_ini.ship_carrying[ship] + size) <= obj_ini.ship_capacity[ship])) { obj_ini.ship_carrying[off_loading_ship] -= size; // remove from previous ship capacity ship_location = ship; // change marine location to new ship obj_ini.ship_carrying[ship] += size; //add marine capacity to new ship @@ -1969,7 +1973,8 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} set_last_ship(); if (current_location[0] == location_types.ship) { if (!array_contains(["Warp", "Terra", "Mechanicus Vessel", "Lost"], current_location[2]) && current_location[2] == system.name) { - obj_ini.loc[company][marine_number] = obj_ini.ship_location[current_location[1]]; + var _ship = obj_ini.ship_data[current_location[1]]; + obj_ini.loc[company][marine_number] = _ship.location; planet_location = planet_number; ship_location = -1; get_unit_size(); @@ -2032,7 +2037,8 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } } else if (ship == -1 && planet == 0) { if (ship_location > -1) { - if (obj_ini.ship_location[ship_location] == location) { + var _ship = obj_ini.ship_data[ship_location]; + if (_ship.location == location) { is_at_loc = true; } } else if (obj_ini.loc[company][marine_number] == location) { diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index b5d4efb5f9..51a5e0d7da 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -116,7 +116,8 @@ function mechanicus_missions_end_turn(planet){ techs_taken+=1; } if (unit.ship_location>-1){ - ship_planet=obj_ini.ship_location[unit.ship_location]; + var _ship = obj_ini.ship_data[unit.ship_location]; + ship_planet=_ship.location; if (ship_planet=name){ obj_ini.ship_carrying[unit.ship_location]-=scr_unit_size(obj_ini.armour[com][ide],obj_ini.role[com][ide],true); obj_ini.loc[com][ide]="Mechanicus Vessel";unit.planet_location=0;unit.ship_location=0; diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 93ea111f60..151c9d7df5 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -9,17 +9,19 @@ function add_fleet_ships_to_combat(fleet, combat){ try{ if (i>=array_length(_ships)) then break; _ship_id = _ships[i]; + var _ship_d = obj_ini.ship_data[i]; if (obj_ini.ship_hp[_ship_id]<=0 || obj_ini.ship[_ship_id]==""){ continue; } - if (obj_ini.ship_size[_ship_id]>=3) then combat.capital++; - if (obj_ini.ship_size[_ship_id]==2) then combat.frigate++; - if (obj_ini.ship_size[_ship_id]==1) then combat.escort++; + if (_ship_d.size>=3) then combat.capital++; + if (_ship_d.size==2) then combat.frigate++; + if (_ship_d.size==1) then combat.escort++; + + array_push(combat.ship_data , _ship_d); array_push(combat.ship_class, player_ships_class(_ship_id)); array_push(combat.ship, obj_ini.ship[_ship_id]); array_push(combat.ship_id, _ship_id); - array_push(combat.ship_size, obj_ini.ship_size[_ship_id]); array_push(combat.ship_leadership, 100); array_push(combat.ship_hp, obj_ini.ship_hp[_ship_id]); array_push(combat.ship_maxhp, obj_ini.ship_maxhp[_ship_id]); @@ -42,12 +44,13 @@ function add_fleet_ships_to_combat(fleet, combat){ function sort_ships_into_columns(combat){ var col = 5; with (combat){ - for (var k = 0;k=3)) then combat.column_num[col]+=1; - if ((combat.column[col-1]="capital" && combat.ship_size[k]>=3)) then combat.column_num[col-1]+=1; - if ((combat.column[col-2]="capital" && combat.ship_size[k]>=3)) then combat.column_num[col-2]+=1; - if ((combat.column[col-3]="capital" && combat.ship_size[k]>=3)) then combat.column_num[col-3]+=1; - if ((combat.column[col-4]="capital" && combat.ship_size[k]>=3)) then combat.column_num[col-4]+=1; + for (var k = 0;k=3)) then combat.column_num[col]+=1; + if ((combat.column[col-1]="capital" && _ship.size[k]>=3)) then combat.column_num[col-1]+=1; + if ((combat.column[col-2]="capital" && _ship.size[k]>=3)) then combat.column_num[col-2]+=1; + if ((combat.column[col-3]="capital" && _ship.size[k]>=3)) then combat.column_num[col-3]+=1; + if ((combat.column[col-4]="capital" && _ship.size[k]>=3)) then combat.column_num[col-4]+=1; if (combat.ship_class[k]=combat.column[col]) then combat.column_num[col]+=1; if (combat.ship_class[k]=combat.column[col-1]) then combat.column_num[col-1]+=1; @@ -55,11 +58,11 @@ function sort_ships_into_columns(combat){ if (combat.ship_class[k]=combat.column[col-3]) then combat.column_num[col-3]+=1; if (combat.ship_class[k]=combat.column[col-4]) then combat.column_num[col-4]+=1; - if ((combat.column[col]="escort" && combat.ship_size[k]=1)) then combat.column_num[col]+=1; - if ((combat.column[col-1]="escort" && combat.ship_size[k]=1)) then combat.column_num[col-1]+=1; - if ((combat.column[col-2]="escort" && combat.ship_size[k]=1)) then combat.column_num[col-2]+=1; - if ((combat.column[col-3]="escort" && combat.ship_size[k]=1)) then combat.column_num[col-3]+=1; - if ((combat.column[col-4]="escort" && combat.ship_size[k]=1)) then combat.column_num[col-4]+=1; + if ((combat.column[col]="escort" && _ship.size[k]=1)) then combat.column_num[col]+=1; + if ((combat.column[col-1]="escort" && _ship.size[k]=1)) then combat.column_num[col-1]+=1; + if ((combat.column[col-2]="escort" && _ship.size[k]=1)) then combat.column_num[col-2]+=1; + if ((combat.column[col-3]="escort" && _ship.size[k]=1)) then combat.column_num[col-3]+=1; + if ((combat.column[col-4]="escort" && _ship.size[k]=1)) then combat.column_num[col-4]+=1; } } diff --git a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml index 5fc154fd96..82a5b2902a 100644 --- a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml +++ b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml @@ -490,8 +490,9 @@ function set_fleet_location(location){ var temp; for (var i=0;i=0 && temp < array_length(obj_ini.ship_location)){ - obj_ini.ship_location[temp] = location; + if (temp>=0 && temp < array_length(obj_ini.ship_data)){ + var _ship = obj_ini.ship_data[temp]; + _ship.location = location; } } var unit; diff --git a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml index e9ae31f81d..a95c1ba589 100644 --- a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml +++ b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml @@ -115,12 +115,13 @@ function return_lost_ship(){ function get_player_ships(location="", name=""){ var _ships = []; - for (var i = 0;i0){ obj_ini.ship_class[index]="Battle Barge"; - obj_ini.ship_size[index]=3; obj_ini.ship_hp[index]=1200; obj_ini.ship_maxhp[index]=1200; obj_ini.ship_conditions[index]=""; @@ -298,6 +282,7 @@ function new_player_ship(type, start_loc="home", new_name=""){ add_weapon_to_ship("Thunderhawk Launch Bays"); add_weapon_to_ship("Macro Bombardment Cannons"); add_weapon_to_ship("Torpedoes", {barrel_count:4}); + size = 3; } obj_ini.ship_capacity[index]=600; @@ -308,7 +293,6 @@ function new_player_ship(type, start_loc="home", new_name=""){ if (string_count("Strike Cruiser",type)>0){ obj_ini.ship_class[index]="Strike Cruiser"; - obj_ini.ship_size[index]=2; obj_ini.ship_hp[index]=600; obj_ini.ship_maxhp[index]=600; obj_ini.ship_conditions[index]=""; @@ -334,6 +318,7 @@ function new_player_ship(type, start_loc="home", new_name=""){ } add_weapon_to_ship("Thunderhawk Launch Bays"); add_weapon_to_ship("Bombardment Cannons"); + size = 2; } obj_ini.ship_capacity[index]=250; @@ -386,8 +371,6 @@ function new_player_ship(type, start_loc="home", new_name=""){ } if (string_count("Gloriana",type)>0){ obj_ini.ship[index]=new_name; - obj_ini.ship_size[index]=3; - obj_ini.ship_class[index]="Gloriana"; @@ -407,8 +390,9 @@ function new_player_ship(type, start_loc="home", new_name=""){ add_weapon_to_ship("Plasma Cannon"); add_weapon_to_ship("Macro Bombardment Cannons"); turrets = [{},{},{},{},{},{},{},{}]; - hp = 2024000; - max_hp = 200; + hp = 2400; + max_hp = 2400; + size = 3; } obj_ini.ship_capacity[index]=800; obj_ini.ship_carrying[index]=0; diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml index 68be5a41cf..badfe21e91 100644 --- a/scripts/scr_roster/scr_roster.gml +++ b/scripts/scr_roster/scr_roster.gml @@ -306,7 +306,8 @@ function Roster() constructor{ if (obj_ini.veh_lid[co][i]>= array_length(obj_ini.ship_location)){ obj_ini.veh_lid[co][i] = -1; } - if (obj_ini.ship_location[obj_ini.veh_lid[co][i]] == roster_location){ + var _ship = obj_ini.ship_data[obj_ini.veh_lid[co][i]]; + if (_ship.location == roster_location){ _allow=true; } } diff --git a/scripts/scr_special_view/scr_special_view.gml b/scripts/scr_special_view/scr_special_view.gml index 2704832982..0f9e84ac89 100644 --- a/scripts/scr_special_view/scr_special_view.gml +++ b/scripts/scr_special_view/scr_special_view.gml @@ -38,7 +38,8 @@ function scr_special_view(command_group) { if (obj_ini.name[0][v]== ""){continue;} if (obj_ini.TTRPG[0][v].ship_location>-1){ var ham=obj_ini.TTRPG[0][v].ship_location; - if (obj_ini.ship_location[ham]=="Lost") then continue; + var _ship = obj_ini.ship_data[ham]; + if (_ship.location=="Lost") then continue; } unit = obj_ini.TTRPG[0][v]; diff --git a/scripts/scr_start_load/scr_start_load.gml b/scripts/scr_start_load/scr_start_load.gml index 889d251141..64204d8ac4 100644 --- a/scripts/scr_start_load/scr_start_load.gml +++ b/scripts/scr_start_load/scr_start_load.gml @@ -53,13 +53,13 @@ function scr_start_load(fleet, load_from_star, load_options) { function load_vehicles(_companies, _equip ,_ship, size){ obj_ini.veh_wid[_companies, _equip] = 0; obj_ini.veh_lid[_companies, _equip] = _ship; - obj_ini.veh_loc[_companies, _equip] = obj_ini.ship_location[_ship]; + var _ship = obj_ini.ship_data[_ship]; + obj_ini.veh_loc[_companies, _equip] = _ship.location; obj_ini.ship_carrying[_ship] += size; } var ship_size, _companies_loaded; _company_size = 0; var ship = 0; - //ship_size = obj_ini.ship_size[ship]; _companies_loaded = 1; var ship_return = 1; var ship_has_space =true; From d74a7e3281d4bfdd8e211060cc5883a8b9ad30e2 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 14 May 2025 21:30:43 +0100 Subject: [PATCH 054/155] improve ship storage --- objects/obj_bomb_select/Alarm_1.gml | 3 +- objects/obj_bomb_select/Alarm_4.gml | 42 ------------ objects/obj_controller/Step_0.gml | 4 +- objects/obj_drop_select/Alarm_2.gml | 40 ------------ objects/obj_drop_select/Alarm_3.gml | 39 ----------- objects/obj_drop_select/Alarm_4.gml | 2 +- objects/obj_dropdown_sel/Step_0.gml | 12 +++- objects/obj_pnunit/Alarm_6.gml | 5 +- scripts/scr_ShipStruct/scr_ShipStruct.gml | 12 ++++ .../scr_add_corruption/scr_add_corruption.gml | 3 + scripts/scr_add_vehicle/scr_add_vehicle.gml | 16 +++-- scripts/scr_company_load/scr_company_load.gml | 8 +-- scripts/scr_crusade/scr_crusade.gml | 3 +- .../scr_drop_select_function.gml | 4 +- .../scr_fleet_advisor/scr_fleet_advisor.gml | 8 +-- .../scr_fleet_functions.gml | 6 +- .../scr_ini_ship_cleanup.gml | 7 +- .../scr_marine_struct/scr_marine_struct.gml | 12 ++-- .../scr_mechanicus_missions.gml | 6 +- scripts/scr_mission_eta/scr_mission_eta.gml | 35 +--------- .../scr_player_fleet_combat_functions.gml | 3 - .../scr_player_fleet_functions.gml | 7 +- .../scr_player_ship_functions.gml | 34 ++++------ scripts/scr_return_ship/scr_return_ship.gml | 5 +- scripts/scr_roster/scr_roster.gml | 3 +- .../scr_specialist_training.gml | 3 +- scripts/scr_start_load/scr_start_load.gml | 65 ++++++++++--------- scripts/scr_ui_manage/scr_ui_manage.gml | 6 +- .../scr_unit_quick_find_pane.gml | 13 ++-- 29 files changed, 142 insertions(+), 264 deletions(-) delete mode 100644 objects/obj_bomb_select/Alarm_4.gml delete mode 100644 objects/obj_drop_select/Alarm_2.gml delete mode 100644 objects/obj_drop_select/Alarm_3.gml diff --git a/objects/obj_bomb_select/Alarm_1.gml b/objects/obj_bomb_select/Alarm_1.gml index b3d421e8ce..fa139306d7 100644 --- a/objects/obj_bomb_select/Alarm_1.gml +++ b/objects/obj_bomb_select/Alarm_1.gml @@ -13,9 +13,10 @@ bomb_b = _total_fleet_loaded; bomb_c = _total_fleet_loaded; for (var i=0;i 0){ array_push(ship_ide, _ships[i]); - array_push(ship_max, obj_ini.ship_carrying[_ships[i]]); + array_push(ship_max, _ship.carrying); array_push(ship, obj_ini.ship[_ships[i]]); array_push(ship_use, 0); array_push(ship_all, 0); diff --git a/objects/obj_bomb_select/Alarm_4.gml b/objects/obj_bomb_select/Alarm_4.gml deleted file mode 100644 index a047d8f63d..0000000000 --- a/objects/obj_bomb_select/Alarm_4.gml +++ /dev/null @@ -1,42 +0,0 @@ -// Sets the targets for the ships, handles bombardment -for(var i=0; i<31; i++){ - ship[i]=""; - ship_all[i]=0; - ship_use[i]=0; - ship_max[i]=0; - ship_ide[i]=-1; -} - -max_ships=sh_target.capital_number+sh_target.frigate_number+sh_target.escort_number; - -var tump=0; - -var i=-1; -for(var b=0; b -1 && b < array_length(obj_ini.ship_carrying)) { - obj_ini.ship_carrying[b] -= man_size; + if (b > -1 && b < array_length(obj_ini.ship_data)) { + obj_ini.ship_data.carrying -= man_size; } reset_ship_manage_arrays(); cooldown = 10; diff --git a/objects/obj_drop_select/Alarm_2.gml b/objects/obj_drop_select/Alarm_2.gml deleted file mode 100644 index ba2c1df43c..0000000000 --- a/objects/obj_drop_select/Alarm_2.gml +++ /dev/null @@ -1,40 +0,0 @@ - -var i;i=-1; -repeat(31){ - i+=1; - ship[i]=""; - ship_all[i]=0; - ship_use[i]=0; - ship_max[i]=0; - ship_ide[i]=-1; -} - -max_ships=0; -if (sh_target!=-50){ - max_ships=sh_target.capital_number+sh_target.frigate_number+sh_target.escort_number; -} - - -if (ship_max[500]!=0) then max_ships+=1; - -ship_all[500]=0; -ship_use[500]=0; -if (l_size>0) then l_size=l_size*-1; - - - -if (sh_target!=-50){ - var i = 0; - var _ships = fleet_full_ship_array(sh_target); - for (var q = 0; q < array_length(_ships); q++){ - var _ship_id = _ships[q]; - var _ship = _ships[_ship_id]; - if (obj_ini.ship_carrying[_ship_id]>0){ - ship[i]=_ship.name; - ship_use[i]=0; - ship_max[i]=obj_ini.ship_carrying[_ship_id]; - ship_ide[i]=_ship_id; - i+=1; - } - } -} diff --git a/objects/obj_drop_select/Alarm_3.gml b/objects/obj_drop_select/Alarm_3.gml deleted file mode 100644 index d8e28247db..0000000000 --- a/objects/obj_drop_select/Alarm_3.gml +++ /dev/null @@ -1,39 +0,0 @@ -var i;i=-1; -repeat(61){ - i+=1; - ship[i]=""; - ship_all[i]=0; - ship_use[i]=0; - ship_max[i]=0; - ship_ide[i]=-1; -} - -max_ships=0; - - -if (sh_target!=-50){ - max_ships=sh_target.capital_number+sh_target.frigate_number+sh_target.escort_number; - - - var tump;tump=0; - - var i, q, b;i=0;q=0;b=0; - - var i = 0; - var _ships = fleet_full_ship_array(sh_target); - for (var q = 0; q < array_length(_ships); q++){ - var _ship_id = _ships[q]; - var _ship = _ships[_ship_id]; - if (obj_ini.ship_carrying[_ship_id]>0){ - ship[i]=_ship.name; - ship_use[i]=0; - ship_max[i]=obj_ini.ship_carrying[_ship_id]; - ship_ide[i]=_ship_id; - purge_a += ship_bombard_score(_ship_id); - purge_b += ship_max[i]; - purge_c += ship_max[i]; - i+=1; - } - } -} - diff --git a/objects/obj_drop_select/Alarm_4.gml b/objects/obj_drop_select/Alarm_4.gml index ec5a7c9303..8005989a2f 100644 --- a/objects/obj_drop_select/Alarm_4.gml +++ b/objects/obj_drop_select/Alarm_4.gml @@ -27,7 +27,7 @@ if (sh_target!=-50){ if (obj_ini.ship_carrying[_ship_id]>0){ ship[i]=_ship.name; ship_use[i]=0; - ship_max[i]=obj_ini.ship_carrying[_ship_id]; + ship_max[i]=_ship.carrying; ship_ide[i]=_ship_id; purge_a += ship_bombard_score(_ship_id); purge_b += ship_max[i]; diff --git a/objects/obj_dropdown_sel/Step_0.gml b/objects/obj_dropdown_sel/Step_0.gml index 96569f16d9..6bbe04167c 100644 --- a/objects/obj_dropdown_sel/Step_0.gml +++ b/objects/obj_dropdown_sel/Step_0.gml @@ -159,9 +159,15 @@ if (option[1]=""){ // Present ship options if (obj_controller.fest_planet=0){ - repeat(70){q+=1;thatone=false; - if (obj_ini.ship[q]!="") and (obj_ini.ship_carrying[q]>0){ - works+=1;option[works]=obj_ini.ship[q];option_id[works]=q;options+=1;thatone=false; + for(q=0;q0) then obj_ncombat.world_size+=man_size; - if (unit.ship_location>-1) then obj_ini.ship_carrying[unit.ship_location]-=man_size; + if (unit.ship_location>-1){ + var _ship = obj_ini.ship_data[unit.ship_location] + _ship.carrying-=man_size; + } // scr_kill_unit(unit.company,unit.marine_number); } diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index e9bfc387e6..f1d3305e3a 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -5,6 +5,10 @@ function ShipStruct() constructor{ location = []; owner = 0; size = 1; + capacity = 0; + carrying = 0; + hp = 0; + max_hp = 0; static ship_self_heal = function(){ if (hp<0){ @@ -13,4 +17,12 @@ function ShipStruct() constructor{ hp = min(max_hp,hp+round(max_hp*0.06)); } } + + static free_space = function(){ + return capacity - carrying; + } + + static has_space = function(required = 1){ + return free_space() >= required; + } } \ No newline at end of file diff --git a/scripts/scr_add_corruption/scr_add_corruption.gml b/scripts/scr_add_corruption/scr_add_corruption.gml index fd70036c87..bea4159e16 100644 --- a/scripts/scr_add_corruption/scr_add_corruption.gml +++ b/scripts/scr_add_corruption/scr_add_corruption.gml @@ -8,7 +8,10 @@ function scr_add_corruption(is_fleet, modifier_type) { var shi,m,co,ide, unit; shi=0;m=0;co=0;ide=0; ships = []; + if (is_fleet=true){ + var _ships = fleet_full_ship_array(sh_target); + for (var i=0;i0) then array_push(ships, capital_num[i]); } diff --git a/scripts/scr_add_vehicle/scr_add_vehicle.gml b/scripts/scr_add_vehicle/scr_add_vehicle.gml index 3e3a83d8ed..ff1874d4d0 100644 --- a/scripts/scr_add_vehicle/scr_add_vehicle.gml +++ b/scripts/scr_add_vehicle/scr_add_vehicle.gml @@ -31,12 +31,16 @@ function scr_add_vehicle(vehicle_type, target_company, weapon1, weapon2, weapon3 if (obj_ini.fleet_type != ePlayerBase.home_world) { // Need a more elaborate ship_carrying += here for the different types of units - var first = 0, backup = 0, i = 0; - for (var i = 0; i < array_length(obj_ini.ship_class); i++) { - if ((obj_ini.ship_class[i] == "Battle Barge") && (first == 0) && (obj_ini.ship_capacity[i] > obj_ini.ship_carrying[i])) { + var first = -1, backup = -1, i = 0; + for (var i = 0; i < array_length(obj_ini.ship_data); i++) { + var _ship = obj_ini.ship_data[i]; + if (!_ship.has_space()){ + continue; + } + if ((_ship.class == "Battle Barge") && (first == -1)) { first = i; } - if ((obj_ini.ship_class[i] == "Strike Cruiser") && (backup == 0) && (obj_ini.ship_capacity[i] > obj_ini.ship_carrying[i])) { + if ((_ship.class == "Strike Cruiser") && (backup == -1)) { backup = i; } } @@ -46,13 +50,13 @@ function scr_add_vehicle(vehicle_type, target_company, weapon1, weapon2, weapon3 obj_ini.veh_lid[target_company][good] = first; obj_ini.veh_loc[target_company][good] = _ship.location; obj_ini.veh_wid[target_company][good] = 0; - obj_ini.ship_carrying[first] += 1; + _ship.carrying += 1; } else if ((first == 0) && (backup != 0)) { var _ship = obj_ini.ship_data[backup]; obj_ini.veh_lid[target_company][good] = backup; obj_ini.veh_loc[target_company][good] = _ship.location; obj_ini.veh_wid[target_company][good] = 0; - obj_ini.ship_carrying[backup] += 1; + _ship.carrying += 1; } else if ((first == 0) && (backup == 0)) { obj_ini.veh_lid[target_company][good] = -1; obj_ini.veh_loc[target_company][good] = ""; diff --git a/scripts/scr_company_load/scr_company_load.gml b/scripts/scr_company_load/scr_company_load.gml index addb38c8cb..dae084b3f4 100644 --- a/scripts/scr_company_load/scr_company_load.gml +++ b/scripts/scr_company_load/scr_company_load.gml @@ -9,12 +9,12 @@ function scr_company_load(ship_loc) { if (obj_ini.ship[i] != "" && _ship.location == ship_loc){ array_push(sh_ide, i); array_push(sh_name, obj_ini.ship[i]); - array_push(sh_class, obj_ini.ship_class[i]); + array_push(sh_class, _ship.class); array_push(sh_loc, _ship.location); array_push(sh_uid, obj_ini.ship_uid[i]); - array_push(sh_hp, $"{round(obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100}% HP") - array_push(sh_cargo, obj_ini.ship_carrying[i]); - array_push(sh_cargo_max, obj_ini.ship_capacity[i]); + array_push(sh_hp, $"{round(_ship.hp / _ship.max_hp) * 100}% HP") + array_push(sh_cargo, _ship.carrying); + array_push(sh_cargo_max, _ship.capacity); } } diff --git a/scripts/scr_crusade/scr_crusade.gml b/scripts/scr_crusade/scr_crusade.gml index 767a27c901..49e9ddfc1d 100644 --- a/scripts/scr_crusade/scr_crusade.gml +++ b/scripts/scr_crusade/scr_crusade.gml @@ -79,7 +79,8 @@ function scr_crusade() { } if (dead){ var man_size=0; - obj_ini.ship_carrying[unit.ship_location]-=unit.get_unit_size(); + var _ship = obj_ini.ship_data[unit.ship_location]; + _ship.carrying-=unit.get_unit_size(); if (unit.IsSpecialist(SPECIALISTS_STANDARD,true)){ obj_controller.command--; } else { diff --git a/scripts/scr_drop_select_function/scr_drop_select_function.gml b/scripts/scr_drop_select_function/scr_drop_select_function.gml index 3ee328fb3c..e61fc71d52 100644 --- a/scripts/scr_drop_select_function/scr_drop_select_function.gml +++ b/scripts/scr_drop_select_function/scr_drop_select_function.gml @@ -494,10 +494,10 @@ function collect_local_units() { for (var q = 0; q < array_length(_ships); q++){ var _ship_id = _ships[q]; var _ship = _ships[_ship_id]; - if (obj_ini.ship_carrying[_ship_id]>0){ + if (_ship.carrying>0){ ship[i]=_ship.name; ship_use[i]=0; - ship_max[i]=obj_ini.ship_carrying[_ship_id]; + ship_max[i]=_ship.carrying; ship_ide[i]=_ship_id; purge_a += ship_bombard_score(_ship_id); purge_b += ship_max[i]; diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 192473795e..9ee6552dea 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -167,7 +167,7 @@ function scr_fleet_advisor(){ class.contents = _ship.class; location.contents = _ship.location; hp.contents = $"{round(_ship.hp / _ship.max_hp * 100)}%"; - carrying.contents = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"; + carrying.contents = $"{_ship.carrying}/{_ship.capacity}"; } for (var g = 0; g < array_length(_columns_array); g++) { @@ -205,11 +205,11 @@ function scr_fleet_advisor(){ temp[109] = string(array_length(_struct.turrets)); - temp[110] = obj_ini.ship_weapons[i]; + temp[110] = _struct.weapons; - temp[118] = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"; + temp[118] = $"{_struct.carrying}/{_struct.capacity}"; temp[119] = ""; - if (obj_ini.ship_carrying[i] > 0) then temp[119] = scr_ship_occupants(i); + if (_struct.carrying > 0) then temp[119] = scr_ship_occupants(i); } tooltip_draw($"Carrying ({temp[118]}): {temp[119]}"); if (_goto_button.click()) { diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index 589356de4f..1cfa35c142 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -203,10 +203,10 @@ function load_unit_to_fleet(fleet, unit){ for (var i=0;iobj_ini.ship_carrying[ship_ident]){ - obj_ini.ship_carrying[ship_ident]+=unit.size; + var _ship = obj_ini.ship_data[ship_ident]; + if (ship_ident.has_space(unit.size)){ + _ship.carrying+=unit.size; unit.planet_location=0; - var _ship = obj_ini.ship_data[ship_ident]; obj_ini.loc[unit.company][unit.marine_number]=_ship.location; unit.ship_location=ship_ident; loaded=true; diff --git a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml index e9ca6f7bd3..904e604577 100644 --- a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml +++ b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml @@ -47,11 +47,12 @@ function scr_kill_ship(index){ continue; } var _cur_ship = _available_ships[i]; + var _ship = ship_data[_cur_ship]; var f=0; var _total_units = array_length(_units_on_ship); - while (ship_carrying[_cur_ship]0){ + while (_ship.has_space() && f<_total_units && array_length(_units_on_ship)>0){ f++; - if (_units_on_ship[0].get_unit_size()+ship_carrying[_cur_ship]<=ship_capacity[_cur_ship]){ + if (_ship.has_space(_units_on_ship[0].get_unit_size())){ _units_on_ship[0].load_marine(_cur_ship); array_delete(_units_on_ship, 0, 1); } @@ -97,8 +98,6 @@ function scr_kill_ship(index){ array_delete(ship_weapons ,index,1); array_delete(ship_capacity,index,1); - array_delete(ship_carrying,index,1); - array_delete(ship_contents,index,1); if (!in_warp){ if (_nearest_star!="none"){ diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index f316ce6b83..f9c99ea818 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -1929,10 +1929,10 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} system = obj_ini.home_name; } //check if ship is in the same location as marine and has enough space; - if ((target_ship_location == system) && ((obj_ini.ship_carrying[ship] + size) <= obj_ini.ship_capacity[ship])) { + if (target_ship_location == system && _ship.has_space(size)) { planet_location = 0; //mark marine as no longer on planet ship_location = ship; //id of ship marine is now loaded on - obj_ini.ship_carrying[ship] += size; //update ship capacity + _ship.carrying += size; //update ship capacity if (star == "none") { star = star_by_name(system); @@ -1948,10 +1948,10 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} var off_loading_ship = current_location[1]; var _ship = obj_ini.ship_data[ship]; var _offload_ship = obj_ini.ship_data[off_loading_ship]; - if ((_ship.location == _offload_ship.location) && ((obj_ini.ship_carrying[ship] + size) <= obj_ini.ship_capacity[ship])) { - obj_ini.ship_carrying[off_loading_ship] -= size; // remove from previous ship capacity + if ((_ship.location == _offload_ship.location && _ship.has_space(size)) { + oboff_loading_ship.carrying -= size; // remove from previous ship capacity ship_location = ship; // change marine location to new ship - obj_ini.ship_carrying[ship] += size; //add marine capacity to new ship + _ship.carrying += size; //add marine capacity to new ship } } }; @@ -1979,7 +1979,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} ship_location = -1; get_unit_size(); system.p_player[planet_number] += size; - obj_ini.ship_carrying[current_location[1]] -= size; + _ship.carrying -= size; } } else { ship_location = -1; diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 51a5e0d7da..9984d67003 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -119,8 +119,10 @@ function mechanicus_missions_end_turn(planet){ var _ship = obj_ini.ship_data[unit.ship_location]; ship_planet=_ship.location; if (ship_planet=name){ - obj_ini.ship_carrying[unit.ship_location]-=scr_unit_size(obj_ini.armour[com][ide],obj_ini.role[com][ide],true); - obj_ini.loc[com][ide]="Mechanicus Vessel";unit.planet_location=0;unit.ship_location=0; + _ship.carrying-=scr_unit_size(obj_ini.armour[com][ide],obj_ini.role[com][ide],true); + obj_ini.loc[com][ide]="Mechanicus Vessel"; + unit.planet_location=0; + unit.ship_location=0; techs_taken+=1; } } diff --git a/scripts/scr_mission_eta/scr_mission_eta.gml b/scripts/scr_mission_eta/scr_mission_eta.gml index 5aa6c8cb2b..a872be8bcf 100644 --- a/scripts/scr_mission_eta/scr_mission_eta.gml +++ b/scripts/scr_mission_eta/scr_mission_eta.gml @@ -21,42 +21,9 @@ function scr_mission_eta(star_x, star_y, type=1, leeway = 10) { if (nearest_fleet != "none"){ eta1 = get_viable_travel_time(leeway, nearest_fleet.x, nearest_fleet.y, star_x, star_y, nearest_fleet, false); } - // n1=instance_nearest(x,y,obj_p_fleet); - // with(n1){y-=3000;} - // n2=instance_nearest(x,y,obj_p_fleet); - // with(n1){y+=3000;} - - // eta1=((point_distance(star_x,star_y,n1.x,n1.y)+point_distance(star_x,star_y,n2.x,n2.y))/2)/48; - // eta1+=2+choose(-1,0,0,0,1,2); } - /// None of this is used anywhere it seems - // if (type>1){ - // with(obj_p_fleet){ - // var good,i;good=0;i=0; - - // repeat(50){ - // i+=1; - // if (i<=20){if (capital[i]!="") and (obj_ini.ship_carrying[capital_num[i]]>0) then good=1;} - // if (frigate[i]!="") and (obj_ini.ship_carrying[frigate_num[i]]>0) then good=1; - // if (escort[i]!="") and (obj_ini.ship_carrying[escort_num[i]]>0) then good=1; - // } - // if (good>0) then instance_create(x,y,obj_temp_inq); - // } - - // if (instance_exists(obj_temp_inq)){ - // n1=instance_nearest(x,y,obj_temp_inq); - // with(n1){y-=3000;} - // n2=instance_nearest(x,y,obj_temp_inq); - // with(n1){y+=3000;} - - // eta1=((point_distance(star_x,star_y,n1.x,n1.y)+point_distance(star_x,star_y,n2.x,n2.y))/2)/48; - // eta1+=2+choose(-1,0,0,0,1,2); - // if (type=3) then eta1+=choose(1,2,3); - // with(obj_temp_inq){instance_destroy();} - // } - // if (!instance_exists(obj_temp_inq)) then eta1=floor(random_range(12,26))+1; - // } + } if (!instance_exists(obj_p_fleet)) then eta1=floor(random_range(12,26))+1; diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 151c9d7df5..a7feee0fcc 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -32,9 +32,6 @@ function add_fleet_ships_to_combat(fleet, combat){ array_push(combat.ship_other_armour, obj_ini.ship_other_armour[_ship_id]); array_push(combat.ship_weapons, obj_ini.ship_weapons[_ship_id]); - array_push(combat.ship_capacity, obj_ini.ship_capacity[_ship_id]); - array_push(combat.ship_carrying, obj_ini.ship_carrying[_ship_id]); - array_push(combat.ship_contents, obj_ini.ship_contents[_ship_id]); } catch (_exception){ handle_exception(_exception); } diff --git a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml index 82a5b2902a..3bb350a4e9 100644 --- a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml +++ b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml @@ -24,8 +24,6 @@ function init_player_fleet_arrays(){ ship_data = []; ship_capacity=[]; - ship_carrying=[]; - ship_contents=[]; ship_lost = []; } function fleet_has_roles(fleet="none", roles){ @@ -614,8 +612,9 @@ function calculate_fleet_content_size(ship_array){ var total_content = 0; for (var i=0;i0){ @@ -340,11 +337,10 @@ function new_player_ship(type, start_loc="home", new_name=""){ add_weapon_to_ship("Light Weapons Battery"); turrets = [{}]; hp = 200; - max_hp = 200; + max_hp = 200; + capacity = 30; } - obj_ini.ship_capacity[index]=30; - obj_ini.ship_carrying[index]=0; - obj_ini.ship_contents[index]=""; + } if (string_count("Hunter",type)>0){ @@ -363,11 +359,10 @@ function new_player_ship(type, start_loc="home", new_name=""){ turrets = [{}]; hp = 200; max_hp = 200; + capacity = 25; } - obj_ini.ship_capacity[index]=25; - obj_ini.ship_carrying[index]=0; - obj_ini.ship_contents[index]=""; + } if (string_count("Gloriana",type)>0){ obj_ini.ship[index]=new_name; @@ -392,11 +387,10 @@ function new_player_ship(type, start_loc="home", new_name=""){ turrets = [{},{},{},{},{},{},{},{}]; hp = 2400; max_hp = 2400; - size = 3; + size = 3; + capacity = 800; } - obj_ini.ship_capacity[index]=800; - obj_ini.ship_carrying[index]=0; - obj_ini.ship_contents[index]=""; + } return index; } diff --git a/scripts/scr_return_ship/scr_return_ship.gml b/scripts/scr_return_ship/scr_return_ship.gml index 7b58ac7a6d..3745802da6 100644 --- a/scripts/scr_return_ship/scr_return_ship.gml +++ b/scripts/scr_return_ship/scr_return_ship.gml @@ -11,8 +11,6 @@ function scr_return_ship(ship_name, object, planet_number) { }*/ i=0; - // Increase ship storage ship_carrying[i] - var unit; var return_planet = obj_controller.return_object; with (object){ @@ -30,7 +28,8 @@ function scr_return_ship(ship_name, object, planet_number) { obj_ini.veh_wid[unit[0]][unit[1]]=0; var man_size =scr_unit_size("",obj_ini.veh_role[unit[0]][unit[1]], true); return_planet.p_player[planet_number]-=man_size; - obj_ini.ship_carrying[return_place[i]]+=man_size; + var _ship = obj_ini.ship_data[return_place[i]]; + _ship.carrying += man_size; } } } diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml index badfe21e91..14e29139dd 100644 --- a/scripts/scr_roster/scr_roster.gml +++ b/scripts/scr_roster/scr_roster.gml @@ -346,7 +346,8 @@ function Roster() constructor{ var _ship_index; for (var s=0;s0){ + var _ship = obj_ini.ship_data[_ship_index]; + if (_ship.carrying>0){ new_ship_button(obj_ini.ship[_ship_index],_ship_index); } } diff --git a/scripts/scr_specialist_training/scr_specialist_training.gml b/scripts/scr_specialist_training/scr_specialist_training.gml index a2263b94a9..e6086504a1 100644 --- a/scripts/scr_specialist_training/scr_specialist_training.gml +++ b/scripts/scr_specialist_training/scr_specialist_training.gml @@ -396,7 +396,8 @@ function techmarine_training(){ if (obj_controller.faction_status[eFACTION.Mechanicus] != "War") { if (unit.ship_location>-1){ var man_size=unit.get_unit_size(); - obj_ini.ship_carrying[unit.ship_location]-=man_size; + var _ship = obj_ini.ship_data[unit.ship_location]; + _ship.carrying-=man_size; } obj_ini.loc[0][open_slot]="Terra"; unit.planet_location=4; diff --git a/scripts/scr_start_load/scr_start_load.gml b/scripts/scr_start_load/scr_start_load.gml index 64204d8ac4..cd459314c5 100644 --- a/scripts/scr_start_load/scr_start_load.gml +++ b/scripts/scr_start_load/scr_start_load.gml @@ -55,7 +55,7 @@ function scr_start_load(fleet, load_from_star, load_options) { obj_ini.veh_lid[_companies, _equip] = _ship; var _ship = obj_ini.ship_data[_ship]; obj_ini.veh_loc[_companies, _equip] = _ship.location; - obj_ini.ship_carrying[_ship] += size; + _ship.carrying += size; } var ship_size, _companies_loaded; _company_size = 0; @@ -69,8 +69,8 @@ function scr_start_load(fleet, load_from_star, load_options) { var ship_loop_start = 0; for (_comp = 0; _comp<10;_comp++){ if ((split_vets == 1 && _comp == 1) || (!comp_has_units[_comp])) then continue; - if (ship_loop_start>=array_length(obj_ini.ship_carrying)){ - ship_loop_start=array_length(obj_ini.ship_carrying); + if (ship_loop_start>=array_length(obj_ini.ship_data)){ + ship_loop_start=array_length(obj_ini.ship_data); } total_vehic_size = 0; var _company_size = 0; @@ -113,14 +113,16 @@ function scr_start_load(fleet, load_from_star, load_options) { } _company_size += total_vehic_size; //if company won't fit onto ship - if ((obj_ini.ship_carrying[ship_loop_start] + _company_size) > obj_ini.ship_capacity[ship_loop_start]){ - ship_fit = false; - } + var _starting_ship = obj_ini.ship_data[ship_loop_start]; + ship_fit = _starting_ship.has_space(_company_size) //if entire company won't fit on ship test to see if there is any ship in the fleet the company will fit on; if (ship_fit == false){ - for (ship_loop = ship_loop_start; ship_loop< array_length(obj_ini.ship_carrying);ship_loop++){ - if (escort_load == 2) and (obj_ini.ship_capacity[ship_loop] < 250){continue} - if ((obj_ini.ship_carrying[ship_loop] + _company_size) <= obj_ini.ship_capacity[ship_loop]){ + for (ship_loop = ship_loop_start; ship_loop< array_length(obj_ini.ship_data);ship_loop++){ + var _loop_ship = obj_ini.ship_data[ship_loop]; + if (escort_load == 2) and (_loop_ship.capacity < 250){ + continue + } + if (_loop_ship.has_space(_company_size)){ //load marines for (var m = 0; m -1){ - obj_ini.ship_carrying[unit.ship_location]+=unit.get_unit_size(); + var _ship = obj_ini.ship_data[unit.ship_location]; + _ship.carrying+=unit.get_unit_size(); } } } @@ -75,7 +77,8 @@ function UnitQuickFindPanel() constructor{ garrison_log[$ unit_location].vehicles++; } } else if (obj_ini.veh_lid[co][u]>-1){ - obj_ini.ship_carrying[obj_ini.veh_lid[co][u]]+=scr_unit_size("",obj_ini.veh_role[co][u],true); + var _ship = obj_ini.ship_data[obj_ini.veh_lid[co][u]]; + _ship.carrying+=scr_unit_size("",obj_ini.veh_role[co][u],true); } } }catch(_exception){ From cc9ca807f06188487baeec074fda7ee16b64c166 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 15 May 2025 19:19:15 +0100 Subject: [PATCH 055/155] keep killing ship arrays --- ChapterMaster.yyp | 2 +- objects/obj_al_ship/Create_0.gml | 2 +- objects/obj_bomb_select/Alarm_1.gml | 2 +- objects/obj_bomb_select/obj_bomb_select.yy | 1 - objects/obj_controller/Alarm_1.gml | 30 ++-- objects/obj_controller/Alarm_5.gml | 10 +- objects/obj_controller/Create_0.gml | 37 +++-- objects/obj_drop_select/Create_0.gml | 2 +- objects/obj_drop_select/obj_drop_select.yy | 2 - objects/obj_en_ship/Create_0.gml | 2 +- objects/obj_fleet_select/Create_0.gml | 6 +- objects/obj_ncombat/Alarm_7.gml | 37 +++-- objects/obj_p_fleet/Alarm_5.gml | 43 ++--- objects/obj_p_ship/Alarm_3.gml | 3 +- objects/obj_p_ship/Create_0.gml | 2 +- objects/obj_p_ship/Step_0.gml | 15 +- objects/obj_pnunit/Alarm_6.gml | 6 +- objects/obj_popup/Step_0.gml | 27 ++-- scripts/scr_ShipStruct/scr_ShipStruct.gml | 45 ++++++ scripts/scr_add_artifact/scr_add_artifact.gml | 7 +- .../scr_add_corruption/scr_add_corruption.gml | 18 +-- scripts/scr_cheatcode/scr_cheatcode.gml | 6 +- scripts/scr_company_load/scr_company_load.gml | 4 +- .../scr_controller_helpers.gml | 49 +++--- scripts/scr_crusade/scr_crusade.gml | 2 +- scripts/scr_dead_marines/scr_dead_marines.gml | 70 -------- .../scr_destroy_vehicle.gml | 17 ++ .../scr_destroy_vehicle.yy} | 4 +- scripts/scr_dialogue/scr_dialogue.gml | 2 +- .../scr_draw_management_unit.gml | 4 +- .../scr_fleet_advisor/scr_fleet_advisor.gml | 150 +++++++++--------- .../scr_ini_ship_cleanup.gml | 20 +-- .../scr_marine_struct/scr_marine_struct.gml | 3 +- scripts/scr_master_loc/scr_master_loc.gml | 7 +- .../scr_mechanicus_missions.gml | 2 +- .../scr_mission_reward/scr_mission_reward.gml | 2 +- .../scr_player_fleet_combat_functions.gml | 38 ++--- .../scr_player_fleet_functions.gml | 33 ++-- .../scr_player_ship_functions.gml | 146 ++++++++--------- scripts/scr_return_ship/scr_return_ship.gml | 3 - scripts/scr_roster/scr_roster.gml | 2 +- .../scr_ship_combat_data.gml | 54 +++---- .../scr_ship_weapon_struct.gml | 6 +- scripts/scr_squads/scr_squads.gml | 3 +- scripts/scr_start_load/scr_start_load.gml | 19 ++- scripts/scr_trade_dep/scr_trade_dep.gml | 5 +- scripts/scr_turn_first/scr_turn_first.gml | 3 +- .../scr_tyranid_fleet_functions.gml | 8 +- scripts/scr_ui_advisors/scr_ui_advisors.gml | 13 +- .../scr_vehicle_helpers.gml | 3 +- .../turn_towards_point/turn_towards_point.gml | 4 +- 51 files changed, 455 insertions(+), 526 deletions(-) delete mode 100644 scripts/scr_dead_marines/scr_dead_marines.gml create mode 100644 scripts/scr_destroy_vehicle/scr_destroy_vehicle.gml rename scripts/{scr_dead_marines/scr_dead_marines.yy => scr_destroy_vehicle/scr_destroy_vehicle.yy} (75%) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index f7c3fe8650..2d4cb1dc63 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -767,9 +767,9 @@ {"id":{"name":"scr_creation","path":"scripts/scr_creation/scr_creation.yy",},}, {"id":{"name":"scr_crusade","path":"scripts/scr_crusade/scr_crusade.yy",},}, {"id":{"name":"scr_culture_visuals","path":"scripts/scr_culture_visuals/scr_culture_visuals.yy",},}, - {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},}, {"id":{"name":"scr_demand","path":"scripts/scr_demand/scr_demand.yy",},}, {"id":{"name":"scr_destroy_planet","path":"scripts/scr_destroy_planet/scr_destroy_planet.yy",},}, + {"id":{"name":"scr_destroy_vehicle","path":"scripts/scr_destroy_vehicle/scr_destroy_vehicle.yy",},}, {"id":{"name":"scr_dialogue","path":"scripts/scr_dialogue/scr_dialogue.yy",},}, {"id":{"name":"scr_diplomacy_helpers","path":"scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.yy",},}, {"id":{"name":"scr_display_number","path":"scripts/scr_display_number/scr_display_number.yy",},}, diff --git a/objects/obj_al_ship/Create_0.gml b/objects/obj_al_ship/Create_0.gml index 163f9e0a1a..dd7b2a2652 100644 --- a/objects/obj_al_ship/Create_0.gml +++ b/objects/obj_al_ship/Create_0.gml @@ -30,7 +30,7 @@ conditions=""; shields=1; maxshields=1; armour_front=0; -armour_other=0; +side_armour=0; turrets=0; fighters=0; bombers=0; diff --git a/objects/obj_bomb_select/Alarm_1.gml b/objects/obj_bomb_select/Alarm_1.gml index fa139306d7..6746c4b1cc 100644 --- a/objects/obj_bomb_select/Alarm_1.gml +++ b/objects/obj_bomb_select/Alarm_1.gml @@ -17,7 +17,7 @@ for (var i=0;i 0){ array_push(ship_ide, _ships[i]); array_push(ship_max, _ship.carrying); - array_push(ship, obj_ini.ship[_ships[i]]); + array_push(ship, _ship.name); array_push(ship_use, 0); array_push(ship_all, 0); } diff --git a/objects/obj_bomb_select/obj_bomb_select.yy b/objects/obj_bomb_select/obj_bomb_select.yy index 66b7463614..bf4d469937 100644 --- a/objects/obj_bomb_select/obj_bomb_select.yy +++ b/objects/obj_bomb_select/obj_bomb_select.yy @@ -3,7 +3,6 @@ "%Name":"obj_bomb_select", "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":56,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, diff --git a/objects/obj_controller/Alarm_1.gml b/objects/obj_controller/Alarm_1.gml index 394ae2956a..06595ebee8 100644 --- a/objects/obj_controller/Alarm_1.gml +++ b/objects/obj_controller/Alarm_1.gml @@ -58,7 +58,7 @@ if (did){ var fleet=instance_create(_current_system.x,_current_system.y,obj_p_fleet); fleet.owner = eFACTION.Player; - for(var f=0; f0) and (fest_repeats>0){ fest_repeats-=1; lock=scr_master_loc(); - if (fest_sid>0) and (obj_ini.ship[fest_sid]=lock) then cm_present=true; + if (fest_sid>0) and (obj_ini.ship_data[fest_sid].name=lock) then cm_present=true; if (fest_wid>0) and (string(fest_star)+"."+string(fest_wid)=lock) then cm_present=true; if (cm_present==true){ @@ -738,7 +736,7 @@ if (fest_scheduled>0) and (fest_repeats>0){ if (fest_type=="Triumphal March") then imag="event_march"; if (fest_wid>0) then scr_popup("Scheduled Event","Your "+string(fest_type)+" takes place on "+string(fest_star)+" "+scr_roman(fest_wid)+". Would you like to spectate the event?",imag,""); - if (fest_sid>0) then scr_popup("Scheduled Event","Your "+string(fest_type)+" takes place on the ship '"+string(obj_ini.ship[fest_sid])+". Would you like to spectate the event?",imag,""); + if (fest_sid>0) then scr_popup("Scheduled Event","Your "+string(fest_type)+" takes place on the ship '"+string(obj_ini.ship_data[fest_sid].name)+". Would you like to spectate the event?",imag,""); } } diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index ce3b3e21d9..29dbe15bd6 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -1316,7 +1316,7 @@ if (instance_exists(obj_ini)){ } if (global.chapter_name=="Blood Ravens"){ for(var i=0; i<3; i++){ - scr_add_artifact("random_nodemon","",0,obj_ini.ship[0],501); + scr_add_artifact("random_nodemon","",0,obj_ini.ship_data[0].name,501); } } // TODO should add special bonus to different chapters based on lore @@ -1710,26 +1710,29 @@ temp[62]="##Your fleet contains "; var bb=0,sk=0,glad=0,hunt=0,ships=0,bb_names=[],sk_names=[],glad_names=[],hunt_names=[]; codex[0]="";codex_discovered[0]=0; -for(var mm=0; mm179){ for (var i=0;i<9;i++){ if (string_width(name)*scale>179) then scale-=0.05; @@ -172,9 +173,8 @@ selection_window.inside_method = function(){ } } } - if (obj_ini.ship_maxhp[current_ship]>0){ - ship_health=round((obj_ini.ship_hp[current_ship]/obj_ini.ship_maxhp[current_ship])*100); - } + + ship_health=round(_ship.ship_hp_percentage); if (ship_select==0){ selection_box="[ ]"; diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 8caf6ca151..b2859f35a4 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -1,4 +1,4 @@ -try { +stry { // show_debug_message("alarm 7 start"); audio_stop_sound(snd_battle); audio_play_sound(snd_royal,0,true); @@ -486,19 +486,21 @@ try { if (diceh<=15){ var ship,ship_hp,i=-1; - for (var i=0;i0){ - i=0;minhp=0;maxhp=0; - for (var i=0;i-1){ - minhp+=obj_ini.ship_hp[i]; - maxhp+=obj_ini.ship_maxhp[i]; - } +function determine_ship_class_health(class_array){ + var _total_percent = 0 + for (var i=0;i0) then capital_health=round((minhp/maxhp)*100); - else capital_health=0; + return max(_total_percent/array_length(class_array),0); } +capital_health = determine_ship_class_health(capital_num); +frigate_health = determine_ship_class_health(frigate_num); +escort_health = determine_ship_class_health(escort_num); -if (frigate_number>0){ - i=0;minhp=0;maxhp=0; - for (var i=0;i-1 && frigate_num[i]0) then frigate_health=round((minhp/maxhp)*100); - else frigate_health=0; -} - -if (escort_number>0){ - i=0;minhp=0;maxhp=0; - for (var i=0;i-1){ - minhp+=obj_ini.ship_hp[i]; - maxhp+=obj_ini.ship_maxhp[i]; - } - } - if (maxhp>0) then escort_health=round((minhp/maxhp)*100); - else escort_health=0; -} diff --git a/objects/obj_p_ship/Alarm_3.gml b/objects/obj_p_ship/Alarm_3.gml index eeee677d2f..4197c5ad71 100644 --- a/objects/obj_p_ship/Alarm_3.gml +++ b/objects/obj_p_ship/Alarm_3.gml @@ -1,7 +1,8 @@ if (hp0) and (instance_exists(target)){ target_distance = dist; // STC Bonuses - turning_speed = 0.2; - if (obj_controller.stc_bonus[5]=3){ - turning_speed+=0.1; - } - + turning_speed = ship_data.calc_turn_speed(); if (paction!="move") and (paction!="attack_move") and (paction!="turn") and (paction!="attack_turn"){ if (target!=0) and (action="attack"){ @@ -104,12 +100,9 @@ if (hp>0) and (instance_exists(target)){ dist=point_distance(x,y,draw_targets[0], draw_targets[1]); } - // STC Bonuses - var speed_up, speed_down;speed_up=0.005;speed_down=0.025; - if (obj_controller.stc_bonus[6]=3){ - speed_up=0.008; - speed_down=0.037; - } + var speed_up = ship_data.final_acceleration(); + + var speed_down = ship_data.deceleration(); if (paction="turn") or (paction="attack_turn"){ direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); diff --git a/objects/obj_pnunit/Alarm_6.gml b/objects/obj_pnunit/Alarm_6.gml index 773a483fa0..5836810dd2 100644 --- a/objects/obj_pnunit/Alarm_6.gml +++ b/objects/obj_pnunit/Alarm_6.gml @@ -41,7 +41,11 @@ for (var i=0;i-1) then obj_ncombat.world_size+=man_size; - if (obj_ini.veh_lid[veh_co[i],veh_id[i]]>-1) then obj_ini.ship_carrying[obj_ini.veh_lid[veh_co[i],veh_id[i]]]-=man_size; + var _ship_id = obj_ini.veh_lid[veh_co[i],veh_id[i]]; + if (_ship_id>-1){ + var _ship = obj_ini.ship_data[_ship_id]; + _ship.carrying-=man_size; + } // show_message(string(veh_type[i])+" ("+string(veh_co[i])+"."+string(veh_id[i])+") dead"); diff --git a/objects/obj_popup/Step_0.gml b/objects/obj_popup/Step_0.gml index d0b0c70ec3..ec64055001 100644 --- a/objects/obj_popup/Step_0.gml +++ b/objects/obj_popup/Step_0.gml @@ -423,7 +423,7 @@ try { p3 = string(obj_controller.fest_star) + " " + scr_roman(obj_controller.fest_wid); } if (p2 <= 0) { - p3 = +" the vessel '" + string(obj_ini.ship[obj_controller.fest_sid]) + "'"; + p3 = +" the vessel '{obj_ini.ship_data[obj_controller.fest_sid].name}'"; } scr_alert("green", "event", string(p1) + " on " + string(p3) + " ends.", 0, 0); @@ -802,7 +802,7 @@ try { man_size = 0; comp = 0; plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); + ship_id = get_ship_by_name(obj_ground_mission.loc); obj_controller.menu = 0; obj_controller.managing = 0; obj_controller.cooldown = 10; @@ -830,8 +830,7 @@ try { comp = 0; plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - + ship_id = get_ship_by_name(obj_ground_mission.loc); obj_controller.menu = 0; obj_controller.managing = 0; obj_controller.cooldown = 10; @@ -855,7 +854,7 @@ try { man_size = 0; comp = 0; plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); + ship_id = get_ship_by_name(obj_ground_mission.loc); obj_controller.menu = 0; obj_controller.managing = 0; obj_controller.cooldown = 10; @@ -883,7 +882,7 @@ try { man_size = 0; comp = 0; plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); + ship_id = get_ship_by_name(obj_ground_mission.loc); obj_controller.menu = 0; obj_controller.managing = 0; obj_controller.cooldown = 10; @@ -1363,7 +1362,7 @@ try { last_artifact = scr_add_artifact("good", "inquisition", 0, obj_ini.home_name, 2); } else if (obj_ini.fleet_type != ePlayerBase.home_world) { image = "artifact_given"; - last_artifact = scr_add_artifact("good", "inquisition", 0, obj_ini.ship[0], 501); + last_artifact = scr_add_artifact("good", "inquisition", 0, obj_ini.ship_data[0].name, 501); } title = "New Artifact"; @@ -1374,7 +1373,7 @@ try { text += "within your Fortress Monastery."; } if (obj_ini.fleet_type != ePlayerBase.home_world) { - text += $"upon your ship '{obj_ini.ship[0]}'."; + text += $"upon your ship '{obj_ini.ship_data[0].name}'."; } scr_event_log("", "Inquisition Mission Accepted: The Inquisition has left an Artifact in your care."); @@ -1462,7 +1461,7 @@ try { } } if (obj_ini.fleet_type != ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.ship[0], 501); + var last_artifact = scr_add_artifact("random", "", 4, obj_ini.ship_data[0].name, 501); } if (obj_ini.fleet_type == ePlayerBase.home_world) { var last_artifact = scr_add_artifact("random", "", 4, obj_ini.home_name, 2); @@ -1585,7 +1584,7 @@ try { man_size = 0; comp = 0; plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); + ship_id = get_ship_by_name(obj_ground_mission.loc); obj_controller.menu = 0; obj_controller.managing = 0; obj_controller.cooldown = 10; @@ -1605,7 +1604,7 @@ try { man_size = 0; comp = 0; plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); + ship_id = get_ship_by_name(obj_ground_mission.loc); obj_controller.menu = 0; obj_controller.managing = 0; obj_controller.cooldown = 10; @@ -1639,7 +1638,7 @@ try { } } if (obj_ini.fleet_type != ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.ship[0], 501); + var last_artifact = scr_add_artifact("random", "", 4, obj_ini.ship_data[0].name, 501); } if (obj_ini.fleet_type == ePlayerBase.home_world) { var last_artifact = scr_add_artifact("random", "", 4, obj_ini.home_name, 2); @@ -1708,7 +1707,7 @@ try { man_size = 0; comp = 0; plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); + ship_id = get_ship_by_name(obj_ground_mission.loc); } if ((target_comp != 3) && (target_comp != 4)) { @@ -1726,7 +1725,7 @@ try { man_size = 0; comp = 0; plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); + ship_id = get_ship_by_name(obj_ground_mission.loc); obj_controller.menu = 0; obj_controller.managing = 0; obj_controller.cooldown = 10; diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index f1d3305e3a..5842d75e97 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -1,3 +1,16 @@ +function fetch_Ship(id){ + return obj_ini.ship_data[id]; +} + +function get_ship_by_name(ship_name){ + for (var i=0;i= required; } + + static calc_turn_speed = function(){ + var _final_speed = turning_speed; + if (obj_controller.stc_bonus[5]=3){ + _final_speed *= 1.05; + } + return _final_speed; + } } \ No newline at end of file diff --git a/scripts/scr_add_artifact/scr_add_artifact.gml b/scripts/scr_add_artifact/scr_add_artifact.gml index f15f5219d5..0ef85ddf6c 100644 --- a/scripts/scr_add_artifact/scr_add_artifact.gml +++ b/scripts/scr_add_artifact/scr_add_artifact.gml @@ -253,7 +253,7 @@ function scr_add_artifact(artifact_type, artifact_tags, is_identified, artifact_ artifact_location = obj_ini.home_name; ship_id = 2; } else { - artifact_location = obj_ini.ship[0]; + artifact_location = obj_ini.ship_data[0].name; ship_id = 501; } } @@ -321,7 +321,7 @@ function ArtifactStruct(Index) constructor { static location_string = function() { if (sid() >= 500) { - return obj_ini.ship[ship_id()]; + return obj_ini.ship_data[ship_id()].name; } else { return $"{loc()} {sid()}"; } @@ -422,7 +422,8 @@ function ArtifactStruct(Index) constructor { if (_ship_id > 0) { var demonSummonChance = roll_dice_chapter(1, 100, "high"); - if ((demonSummonChance <= 60) && (obj_ini.ship_carrying[_ship_id] > 0)) { + var _ship = obj_ini.ship_data[_ship_id]; + if (demonSummonChance <= 60 _ship.carrying) { instance_create(0, 0, obj_ncombat); obj_ncombat.battle_special = "ship_demon"; obj_ncombat.formation_set = 1; diff --git a/scripts/scr_add_corruption/scr_add_corruption.gml b/scripts/scr_add_corruption/scr_add_corruption.gml index bea4159e16..5e46356d1e 100644 --- a/scripts/scr_add_corruption/scr_add_corruption.gml +++ b/scripts/scr_add_corruption/scr_add_corruption.gml @@ -10,17 +10,13 @@ function scr_add_corruption(is_fleet, modifier_type) { ships = []; if (is_fleet=true){ - var _ships = fleet_full_ship_array(sh_target); - - for (var i=0;i0) then array_push(ships, capital_num[i]); - } - for (var i=0;i0) then array_push(ships, frigate_num[i]); - } - for (var i=0;i0) then array_push(ships, escort_num[c]); - } + var _ships = fleet_full_ship_array(); + for (var i=0;i0) then repeat(artifacts){ if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.ship[0],501); + if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.ship_data[0].name,501); } diff --git a/scripts/scr_dead_marines/scr_dead_marines.gml b/scripts/scr_dead_marines/scr_dead_marines.gml deleted file mode 100644 index fbdd4047a5..0000000000 --- a/scripts/scr_dead_marines/scr_dead_marines.gml +++ /dev/null @@ -1,70 +0,0 @@ -function scr_dead_marines(run) { - - // WeeeeeeEEEEEEEEEE~ - - // If a ship has been destroyed this kills the fuck out relevant marines - // Also checks for lost company standards, chapter master, and cleans up - // the company arrays afterward. - - var i, company, shi, comp_length,clean; - i=0;shi=999; - - if (run==1){ - obj_controller.marines=0; - obj_controller.command=0; - } - - i=0; - var unit, squad; - if (run == 1){ - for (company=0;company<11;company++){ - comp_length = array_length(obj_ini.name[company]); - clean = true; - for (i=0;i-1){ - if ((ship_lost[unit.ship_location]>0) or (obj_ini.ship_hp[unit.ship_location]<=0)){ - fallen+=1; - clean = false; - scr_kill_unit(company, i); - } - } - } - - if (obj_ini.name[company,i]!="") and (obj_ini.role[company,i]!="") and (obj_ini.race[company,i]=1){ - if (is_specialist(obj_ini.role[company][i])=false){ - obj_controller.marines+=1 - } - else obj_controller.command+=1; - } - - if (i<120){ - if (obj_ini.veh_role[company,i]!="") and ((ship_lost[obj_ini.veh_lid[company,i]]>0) or (obj_ini.ship_hp[obj_ini.veh_lid[company,i]]<=0)) and (obj_ini.veh_lid[company,i]>-1){ - destroy_vehicle(company,i); - } - } - } - if (clean == false){ - with(obj_ini){scr_company_order(company);scr_vehicle_order(company);} - } - } - } -} - - -function destroy_vehicle(co, num){ - obj_ini.veh_race[co][num]=0; - obj_ini.veh_loc[co][num]=""; - obj_ini.veh_name[co][num]=""; - obj_ini.veh_role[co][num]=""; - obj_ini.veh_wep1[co][num]=""; - obj_ini.veh_wep2[co][num]=""; - obj_ini.veh_wep3[co][num]=""; - obj_ini.veh_upgrade[co][num]=""; - obj_ini.veh_acc[co][num]=""; - obj_ini.veh_hp[co][num]=100; - obj_ini.veh_chaos[co][num]=0; - obj_ini.veh_pilots[co][num]=0; - obj_ini.veh_lid[co][num]=-1; -} diff --git a/scripts/scr_destroy_vehicle/scr_destroy_vehicle.gml b/scripts/scr_destroy_vehicle/scr_destroy_vehicle.gml new file mode 100644 index 0000000000..9c44fd8f36 --- /dev/null +++ b/scripts/scr_destroy_vehicle/scr_destroy_vehicle.gml @@ -0,0 +1,17 @@ + + +function destroy_vehicle(co, num){ + obj_ini.veh_race[co][num]=0; + obj_ini.veh_loc[co][num]=""; + obj_ini.veh_name[co][num]=""; + obj_ini.veh_role[co][num]=""; + obj_ini.veh_wep1[co][num]=""; + obj_ini.veh_wep2[co][num]=""; + obj_ini.veh_wep3[co][num]=""; + obj_ini.veh_upgrade[co][num]=""; + obj_ini.veh_acc[co][num]=""; + obj_ini.veh_hp[co][num]=100; + obj_ini.veh_chaos[co][num]=0; + obj_ini.veh_pilots[co][num]=0; + obj_ini.veh_lid[co][num]=-1; +} diff --git a/scripts/scr_dead_marines/scr_dead_marines.yy b/scripts/scr_destroy_vehicle/scr_destroy_vehicle.yy similarity index 75% rename from scripts/scr_dead_marines/scr_dead_marines.yy rename to scripts/scr_destroy_vehicle/scr_destroy_vehicle.yy index 3998c43551..aeb570d770 100644 --- a/scripts/scr_dead_marines/scr_dead_marines.yy +++ b/scripts/scr_destroy_vehicle/scr_destroy_vehicle.yy @@ -1,9 +1,9 @@ { "$GMScript":"v1", - "%Name":"scr_dead_marines", + "%Name":"scr_destroy_vehicle", "isCompatibility":false, "isDnD":false, - "name":"scr_dead_marines", + "name":"scr_destroy_vehicle", "parent":{ "name":"Combat", "path":"folders/Scripts/Combat.yy", diff --git a/scripts/scr_dialogue/scr_dialogue.gml b/scripts/scr_dialogue/scr_dialogue.gml index 0976887efb..059d540b5a 100644 --- a/scripts/scr_dialogue/scr_dialogue.gml +++ b/scripts/scr_dialogue/scr_dialogue.gml @@ -315,7 +315,7 @@ function scr_dialogue(diplo_keyphrase) { // Casket, Chalice, Tome if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("chaos_gift","",0,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("chaos_gift","",0,obj_ini.ship[0],501); + if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("chaos_gift","",0,obj_ini.ship_data[0].name,501); } if (string_count("cs_meeting_battle",diplo_keyphrase)>0){ current_eventing=diplo_keyphrase;combating=1; diff --git a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml index 417019771b..74064b3fcc 100644 --- a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml +++ b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml @@ -29,7 +29,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { //get roman numeral for system planet unit_location_string += scr_roman(unit_location[1]); } else if (unit_location[0] == location_types.ship) { - unit_location_string = obj_ini.ship[unit_location[1]]; + unit_location_string = obj_ini.ship_data[unit_location[1]].name; } assignment = unit.assignment(); if (assignment != "none") { @@ -90,7 +90,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { //numeral for vehicle planet unit_location_string += scr_roman(ma_wid[selected]); } else if (ma_lid[selected] > -1) { - unit_location_string = obj_ini.ship[ma_lid[selected]]; + unit_location_string = obj_ini.ship_data[ma_lid[selected]].name; } health_string = string(round(ma_health[selected])) + "% HP"; exp_string = ""; diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 9ee6552dea..29692cc5e2 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -1,4 +1,4 @@ -// Script assets have changed for v2.3.0 see +s// Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information /// @mixin function scr_fleet_advisor(){ @@ -140,94 +140,94 @@ function scr_fleet_advisor(){ var _row_height = 20; var _row_gap = 2; for (var i = ship_current; i < ship_current + 34; i++) { - if (i>= array_length(obj_ini.ship)) then continue; - if (obj_ini.ship[i] != "") { - var _row_y = _columns[$ "name"].y1 + _row_height + (i * (_row_height + _row_gap)); - draw_rectangle(xx + 950, _row_y, xx + 1546, _row_y + _row_height, 1); - - var _goto_button = { - x1: _columns.location.x1 - 20, - y1: _row_y + 4, - sprite: spr_view_small, - click: function() { - return point_and_click([x1, y1, x2, y2]); - } - }; - with(_goto_button) { - w = sprite_get_width(sprite); - h = sprite_get_height(sprite); - x2 = x1 + w; - y2 = y1 + h; - draw_sprite(sprite, 0, x1, y1); - } - var _ship = obj_ini.ship_data[i]; - - with(_columns) { - name.contents = string_truncate(obj_ini.ship[i], _columns.name.w - 6); - class.contents = _ship.class; - location.contents = _ship.location; - hp.contents = $"{round(_ship.hp / _ship.max_hp * 100)}%"; - carrying.contents = $"{_ship.carrying}/{_ship.capacity}"; + if (i>= array_length(obj_ini.ship_data)) then continue; + + var _row_y = _columns[$ "name"].y1 + _row_height + (i * (_row_height + _row_gap)); + draw_rectangle(xx + 950, _row_y, xx + 1546, _row_y + _row_height, 1); + + var _goto_button = { + x1: _columns.location.x1 - 20, + y1: _row_y + 4, + sprite: spr_view_small, + click: function() { + return point_and_click([x1, y1, x2, y2]); } + }; + with(_goto_button) { + w = sprite_get_width(sprite); + h = sprite_get_height(sprite); + x2 = x1 + w; + y2 = y1 + h; + draw_sprite(sprite, 0, x1, y1); + } + var _ship = obj_ini.ship_data[i]; + + with(_columns) { + name.contents = string_truncate(_ship.name, _columns.name.w - 6); + class.contents = _ship.class; + location.contents = _ship.location; + hp.contents = $"{round(_ship.hp / _ship.max_hp * 100)}%"; + carrying.contents = $"{_ship.carrying}/{_ship.capacity}"; + } - for (var g = 0; g < array_length(_columns_array); g++) { - with(_columns[$ _columns_array[g]]) { - draw_set_halign(h_align); - switch (h_align) { - case fa_right: - draw_text(x2, _row_y, contents); - break; - case fa_center: - draw_text((x1 + x2) / 2, _row_y, contents); - break; - case fa_left: - default: - draw_text(x1, _row_y, contents); - break; - } - } + for (var g = 0; g < array_length(_columns_array); g++) { + with(_columns[$ _columns_array[g]]) { + draw_set_halign(h_align); + switch (h_align) { + case fa_right: + draw_text(x2, _row_y, contents); + break; + case fa_center: + draw_text((x1 + x2) / 2, _row_y, contents); + break; + case fa_left: + default: + draw_text(x1, _row_y, contents); + break; + } } + } - if scr_hit(xx + 950, _row_y, xx + 1546, _row_y + _row_height) { - var _struct = obj_ini.ship_data[i]; - if (temp[101] != obj_ini.ship[i]) { - temp[101] = obj_ini.ship[i]; - temp[102] = obj_ini.ship_class[i]; + if scr_hit(xx + 950, _row_y, xx + 1546, _row_y + _row_height) { + var _struct = obj_ini.ship_data[i]; + if (temp[101] != _struct.name) { + temp[101] = _struct.name; + temp[102] = obj_ini.ship_class[i]; - temp[103] = string(obj_ini.ship_hp[i]); - temp[104] = string(obj_ini.ship_maxhp[i]); - temp[105] = string(obj_ini.ship_shields[i] * 100); + temp[103] = _struct.hp; + temp[104] = _struct.max_hp; + temp[105] = string(obj_ini.ship_shields[i] * 100); - temp[106] = string(obj_ini.ship_speed[i]); + temp[106] = string(obj_ini.ship_speed[i]); - temp[107] = string(obj_ini.ship_front_armour[i]); - temp[108] = string(obj_ini.ship_other_armour[i]); + temp[107] = string(_struct.front_armour); + temp[108] = string(_struct.side_armour); - temp[109] = string(array_length(_struct.turrets)); + temp[109] = string(array_length(_struct.turrets)); - temp[110] = _struct.weapons; + temp[110] = _struct.weapons; - temp[118] = $"{_struct.carrying}/{_struct.capacity}"; - temp[119] = ""; - if (_struct.carrying > 0) then temp[119] = scr_ship_occupants(i); - } - tooltip_draw($"Carrying ({temp[118]}): {temp[119]}"); - if (_goto_button.click()) { - with(obj_p_fleet) { - var _fleet_ships = fleet_full_ship_array(); - if (array_contains(_fleet_ships, i)){ - obj_controller.x = x; - obj_controller.y = y; - obj_controller.menu = 0; - with(obj_fleet_show) { - instance_destroy(); - } - instance_create(x, y, obj_fleet_show); - } + temp[118] = $"{_struct.carrying}/{_struct.capacity}"; + temp[119] = ""; + if (_struct.carrying > 0) then temp[119] = scr_ship_occupants(i); + } + tooltip_draw($"Carrying ({temp[118]}): {temp[119]}"); + if (_goto_button.click()) { + with(obj_p_fleet) { + var _fleet_ships = fleet_full_ship_array(); + if (array_contains(_fleet_ships, i)){ + obj_controller.x = x; + obj_controller.y = y; + obj_controller.menu = 0; + with(obj_fleet_show) { + instance_destroy(); + } + instance_create(x, y, obj_fleet_show); } } } } + } if (temp[101] != "") { diff --git a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml index 904e604577..2eec3b8917 100644 --- a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml +++ b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml @@ -80,24 +80,11 @@ function scr_kill_ship(index){ array_delete(ship_uid,index,1); array_delete(ship_owner,index,1); array_delete(ship_class,index,1); - array_delete(ship_size,index,1); array_delete(ship_leadership,index,1); - array_delete(ship_hp,index,1); - array_delete(ship_maxhp,index,1); array_delete(ship_location,index,1); array_delete(ship_shields,index,1); - array_delete(ship_conditions,index,1); array_delete(ship_speed,index,1); - array_delete(ship_turning,index,1); - - array_delete(ship_front_armour,index,1); - array_delete(ship_other_armour,index,1); - array_delete(ship_weapons,index,1); - - array_delete(ship_weapons ,index,1); - - array_delete(ship_capacity,index,1); if (!in_warp){ if (_nearest_star!="none"){ @@ -124,9 +111,10 @@ function scr_ini_ship_cleanup() { if (array_length(ship)){ var _ships = array_length(ship) for (var i=_ships-1;i>=0;i--){ - if (ship[i]!="") and (ship_hp[i]<=0){ - scr_kill_ship(i); - } + var _ship = fetch_ship(i); + if (_ship.hp<0){ + scr_kill_ship(i); + } } } sort_all_companies(); diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index f9c99ea818..657b633bb7 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -1958,8 +1958,9 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} static set_last_ship = function() { if (ship_location > -1) { + var _ship = fetch_ship(ship_location); last_ship.uid = obj_ini.ship_uid[ship_location]; - last_ship.name = obj_ini.ship[ship_location]; + last_ship.name = _ship.name; } else { last_ship = { uid: "", diff --git a/scripts/scr_master_loc/scr_master_loc.gml b/scripts/scr_master_loc/scr_master_loc.gml index a9fbedfc2e..204debe2eb 100644 --- a/scripts/scr_master_loc/scr_master_loc.gml +++ b/scripts/scr_master_loc/scr_master_loc.gml @@ -13,9 +13,12 @@ function scr_master_loc() { if (good=true){ if (obj_ini.name[co][v] == "") then continue; unit = fetch_unit([co, v]); - if (unit.role()==obj_ini.role[100][eROLE.ChapterMaster]){ + if (unit.role()==obj_ini.role[100][eROLE.ChapterMastesr]){ if (unit.planet_location>0) and (unit.ship_location<0) then lick=string(obj_ini.loc[co][v])+"."+string(unit.planet_location); - if (unit.planet_location<=0) and (unit.ship_location>-1) then lick=string(obj_ini.ship[unit.ship_location]); + if (unit.planet_location<=0) and (unit.ship_location>-1){ + var _ship = fetch_ship(unit.ship_location)/ + lick=_ship.name; + } if (lick!=""){return(lick);good=false;} } } diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 9984d67003..182c10fbf1 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -77,7 +77,7 @@ function mechanicus_missions_end_turn(planet){ } else if (reward==2){ if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("random","",0,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",0,obj_ini.ship[0],501); + if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",0,obj_ini.ship_data[0].name,501); text="The Mechanicus Research team on planet "+string(name)+" "+scr_roman(planet)+" have completed their work without any major setbacks. Pleased with your astartes' work, they have granted your Chapter an artifact, to be used as you see fit."; scr_event_log("","Mechanicus Mission Completed: The Mechanicus research team on "+string(name)+" "+scr_roman(planet)+" have completed their work."); scr_event_log("","Artifact gifted from Mechanicus."); diff --git a/scripts/scr_mission_reward/scr_mission_reward.gml b/scripts/scr_mission_reward/scr_mission_reward.gml index 5f39664cf7..fadd2eec08 100644 --- a/scripts/scr_mission_reward/scr_mission_reward.gml +++ b/scripts/scr_mission_reward/scr_mission_reward.gml @@ -40,7 +40,7 @@ function scr_mission_reward(mission, star, planet) { if (roll2>=80) and (roll2<88) then found_requisition+=100; if (roll2>=88) and (roll2<96){ if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.ship[0],501); + if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.ship_data[0].name,501); found_artifact+=1; } if (roll2>=96){ diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index a7feee0fcc..423fe35088 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -10,7 +10,7 @@ function add_fleet_ships_to_combat(fleet, combat){ if (i>=array_length(_ships)) then break; _ship_id = _ships[i]; var _ship_d = obj_ini.ship_data[i]; - if (obj_ini.ship_hp[_ship_id]<=0 || obj_ini.ship[_ship_id]==""){ + if (_ship_d.hp<=0){ continue; } if (_ship_d.size>=3) then combat.capital++; @@ -20,17 +20,13 @@ function add_fleet_ships_to_combat(fleet, combat){ array_push(combat.ship_data , _ship_d); array_push(combat.ship_class, player_ships_class(_ship_id)); - array_push(combat.ship, obj_ini.ship[_ship_id]); array_push(combat.ship_id, _ship_id); array_push(combat.ship_leadership, 100); - array_push(combat.ship_hp, obj_ini.ship_hp[_ship_id]); - array_push(combat.ship_maxhp, obj_ini.ship_maxhp[_ship_id]); - array_push(combat.ship_conditions, obj_ini.ship_conditions[_ship_id]); + array_push(combat.ship_hp, _ship_d.hp); + array_push(combat.ship_maxhp, _ship_d.max_hp); array_push(combat.ship_speed, obj_ini.ship_speed[_ship_id]); - array_push(combat.ship_turning, obj_ini.ship_turning[_ship_id]); - array_push(combat.ship_front_armour, obj_ini.ship_front_armour[_ship_id]); - array_push(combat.ship_other_armour, obj_ini.ship_other_armour[_ship_id]); - array_push(combat.ship_weapons, obj_ini.ship_weapons[_ship_id]); + array_push(combat.ship_front_armour, _ship_d.front_armour); + array_push(combat.ship_other_armour, _ship_d.side_armour); } catch (_exception){ handle_exception(_exception); @@ -143,23 +139,21 @@ function setup_player_combat_ship(){ cooldown4=0; cooldown5=0; - weapons = []; + ship_data = obj_ini.ship_data[ship_id]; + weapons = ship_data.weapons; - name=obj_ini.ship[ship_id]; - class=obj_ini.ship_class[ship_id]; - hp=obj_ini.ship_hp[ship_id]*1; - maxhp=obj_ini.ship_hp[ship_id]*1; - conditions=obj_ini.ship_conditions[ship_id]; + name=ship_data.name; + class=ship_data.class; + hp=ship_data.hp + maxhp=ship_data.max_hp shields=obj_ini.ship_shields[ship_id]*100; maxshields=shields; - armour_front=obj_ini.ship_front_armour[ship_id]; - armour_other=obj_ini.ship_other_armour[ship_id]; + armour_front = ship_data.front_armour; + side_armour=ship_data.side_armour; turrets=0; ship_colour=obj_controller.body_colour_replace; max_speed = obj_ini.ship_speed[ship_id]; - ship_data = obj_ini.ship_data[ship_id]; - - weapons = obj_ini.ship_weapons[ship_id]; + for (var i=0;i0) { which=array_random_index(mfleet.escort_num); sayd=mfleet.escort_num[which]; + var _ship = fetch_ship(sayd); if (!array_contains(ship_lost, sayd)){ esc_lost+=1; - obj_ini.ship_hp[sayd]=0; + _ship.hp=0; ship_lost[sayd]=1; mfleet.escort_number-=1; array_push(ship_lost, sayd); @@ -354,9 +345,10 @@ function player_retreat_from_fleet_combat(){ else if (mfleet.frigate_number>0) { which=array_random_index(mfleet.frigate_num); sayd=mfleet.frigate_num[which]; + var _ship = fetch_ship(sayd); if (!array_contains(ship_lost, sayd)){ frig_lost+=1; - obj_ini.ship_hp[sayd]=0; + _ship.hp=0; ship_lost[sayd]=1; mfleet.frigate_number-=1; array_push(ship_lost, sayd); @@ -365,9 +357,10 @@ function player_retreat_from_fleet_combat(){ else if (mfleet.capital_number>0) { which=array_random_index(mfleet.capital_num); sayd=mfleet.capital_num[which]; + var _ship = fetch_ship(sayd); if (!array_contains(ship_lost, sayd)){ cap_lost+=1; - obj_ini.ship_hp[sayd]=0; + _ship.hp=0; ship_lost[sayd]=1; mfleet.capital_number-=1; array_push(ship_lost, sayd); @@ -449,7 +442,7 @@ function player_retreat_from_fleet_combat(){ function fleet_full_ship_array(fleet="none", exclude_capitals=false, exclude_frigates = false, exclude_escorts = false){ var all_ships = []; var i; - var _ship_count = array_length(obj_ini.ship); + var _ship_count = array_length(obj_ini.ship_data); if (fleet=="none"){ if (!exclude_capitals){ for (i=0; i80){ - obj_ini.ship_hp[_return_id] *= random_range(0.2,0.8); + _ship.hp *= random_range(0.2,0.8); _text += $"Reports indicate it has suffered damage as a result of it's time in the warp"; } else if (_return_defect>70){ var techs = collect_role_group(SPECIALISTS_TECHS, [_star.name, 0, _return_id]); @@ -74,7 +75,7 @@ function return_lost_ship(){ } }else if (_return_defect>20){ //This would be an awsome oppertunity and ideal kick off place to allow a redemtion arc either liberating the ship or some of your captured marines gene seed other bits - _text += $"The fate of your ship {obj_ini.ship[_return_id]} has now become clear\n A Chaos fleet has warped into the {_star.name} system with your once prized ship now a part of it"; + _text += $"The fate of your ship {_ship.name} has now become clear\n A Chaos fleet has warped into the {_star.name} system with your once prized ship now a part of it"; var _units = collect_role_group("all", [_star.name, 0, _return_id]); if (array_length(_units)>0){ _text += $"You must assume the worst for your crew"; @@ -93,7 +94,7 @@ function return_lost_ship(){ } else{ var _units = collect_role_group("all", [_star.name, 0, _return_id]); - _text += $"The fate of your ship {obj_ini.ship[_return_id]} has now become clear. While it did not survive it's travels through the warp and tore itself apart somewhere in the {_star.name} system. "; + _text += $"The fate of your ship {_ship.name} has now become clear. While it did not survive it's travels through the warp and tore itself apart somewhere in the {_star.name} system. "; scr_kill_ship(_return_id); if (array_length(_units)>0){ _text += "Some of your astartes may have been able to jetison and survive the ships destruction"; @@ -117,53 +118,40 @@ function get_player_ships(location="", name=""){ var _ships = []; for (var i = 0;i0){ - obj_ini.ship_class[index]="Battle Barge"; - obj_ini.ship_hp[index]=1200; - obj_ini.ship_maxhp[index]=1200; - obj_ini.ship_conditions[index]=""; - obj_ini.ship_speed[index]=20; - obj_ini.ship_turning[index]=45; - obj_ini.ship_front_armour[index]=6; - obj_ini.ship_other_armour[index]=6; obj_ini.ship_shields[index]=12; with(_struct){ left_broad_positions = [[56, 16],[65, 16],[74,16],[83, 16]]; @@ -282,6 +266,12 @@ function new_player_ship(type, start_loc="home", new_name=""){ add_weapon_to_ship("Torpedoes", {barrel_count:4}); size = 3; capacity = 600; + turning_speed = 0.2; + max_speed = 20; + hp = 1200; + max_hp = 1200; + side_armour = 6; + rear_armour = 3; } @@ -290,14 +280,6 @@ function new_player_ship(type, start_loc="home", new_name=""){ } if (string_count("Strike Cruiser",type)>0){ - obj_ini.ship_class[index]="Strike Cruiser"; - obj_ini.ship_hp[index]=600; - obj_ini.ship_maxhp[index]=600; - obj_ini.ship_conditions[index]=""; - obj_ini.ship_speed[index]=25; - obj_ini.ship_turning[index]=90; - obj_ini.ship_front_armour[index]=6; - obj_ini.ship_other_armour[index]=6; obj_ini.ship_shields[index]=6; with(_struct){ left_broad_positions = [[56, 16],[65, 16],[74,16],[83, 16]]; @@ -318,67 +300,60 @@ function new_player_ship(type, start_loc="home", new_name=""){ add_weapon_to_ship("Bombardment Cannons"); size = 2; capacity = 250; + turning_speed = 0.25; + max_speed = 25; + hp = 600; + max_hp = 600 + front_armour = 6; + side_armour = 4; + rear_armour = 3; } _struct.turrets = [{}]; } if (string_count("Gladius",type)>0){ - obj_ini.ship_class[index]="Gladius"; - obj_ini.ship_hp[index]=200; - obj_ini.ship_maxhp[index]=200; - obj_ini.ship_conditions[index]=""; - obj_ini.ship_speed[index]=30; - obj_ini.ship_turning[index]=90; - obj_ini.ship_front_armour[index]=5; - obj_ini.ship_other_armour[index]=5; obj_ini.ship_shields[index]=1; with(_struct){ + class = "Gladius"; add_weapon_to_ship("Light Weapons Battery"); turrets = [{}]; hp = 200; max_hp = 200; - capacity = 30; + capacity = 30; + turning_speed = 0.3; + max_speed = 30; + front_armour = 5; + side_armour = 4; + rear_armour = 1; } } if (string_count("Hunter",type)>0){ - obj_ini.ship_class[index]="Hunter"; - obj_ini.ship_hp[index]=200; - obj_ini.ship_maxhp[index]=200; - obj_ini.ship_conditions[index]=""; - obj_ini.ship_speed[index]=30; - obj_ini.ship_turning[index]=90; - obj_ini.ship_front_armour[index]=5; - obj_ini.ship_other_armour[index]=5; obj_ini.ship_shields[index]=1; with(_struct){ + class = "Hunter"; add_weapon_to_ship("Torpedoes"); add_weapon_to_ship("Light Weapons Battery"); turrets = [{}]; hp = 200; max_hp = 200; - capacity = 25; + capacity = 25; + turning_speed = 0.3; + max_speed = 33; + front_armour = 4; + side_armour = 3; + rear_armour = 1; } } - if (string_count("Gloriana",type)>0){ - obj_ini.ship[index]=new_name; - - obj_ini.ship_class[index]="Gloriana"; - - obj_ini.ship_hp[index]=2400; - obj_ini.ship_maxhp[index]=2400; - obj_ini.ship_conditions[index]=""; - obj_ini.ship_speed[index]=25; - obj_ini.ship_turning[index]=60; - obj_ini.ship_front_armour[index]=8; - obj_ini.ship_other_armour[index]=8; + if (string_count("Gloriana",type)>0){ obj_ini.ship_shields[index]=24; with(_struct){ + class = "Gloriana"; add_weapon_to_ship("Lance Battery", {facing : "right"}); add_weapon_to_ship("Lance Battery",{facing : "left"}); add_weapon_to_ship("Lance Battery",{facing : "front"}); @@ -388,7 +363,12 @@ function new_player_ship(type, start_loc="home", new_name=""){ hp = 2400; max_hp = 2400; size = 3; - capacity = 800; + capacity = 800; + turning_speed = 0.23; + max_speed = 23; + front_armour = 6; + side_armour = 8; + rear_armour = 2; } } @@ -396,9 +376,8 @@ function new_player_ship(type, start_loc="home", new_name=""){ } function ship_class_name(index){ - var _ship_name = obj_ini.ship[index]; - var _ship_class = obj_ini.ship_class[index]; - return $"{_ship_class} '{_ship_name}'"; + var _ship = fetch_ship(index); + return $"{_ship.class} '{_ship.name}'"; } function player_ships_class(index){ @@ -419,8 +398,9 @@ function player_ships_class(index){ function ship_bombard_score(ship_id){ var _bomb_score = 0; - for (var b=0;b0){ - new_ship_button(obj_ini.ship[_ship_index],_ship_index); + new_ship_button(_ship.name,_ship_index); } } } diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index e829b9518e..d49cf0f764 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -243,7 +243,7 @@ function assign_ship_stats(){ maxshields=400; leadership=90; armour_front=6; - armour_other=5; + side_armour=5; turrets=4; capacity=150; carrying=0; @@ -266,7 +266,7 @@ function assign_ship_stats(){ maxshields=400; leadership=85; armour_front=5; - armour_other=5; + side_armour=5; turrets=5; capacity=100; carrying=24; @@ -287,7 +287,7 @@ function assign_ship_stats(){ maxshields=300; leadership=85; armour_front=5; - armour_other=5; + side_armour=5; turrets=3; capacity=50; add_weapon_to_ship("Lance Battery", {cooldown:30}); @@ -307,7 +307,7 @@ function assign_ship_stats(){ maxshields=100; leadership=80; armour_front=5; - armour_other=5; + side_armour=5; turrets=2; capacity=50; carrying=0; @@ -330,7 +330,7 @@ function assign_ship_stats(){ maxshields=300; leadership=100; armour_front=5; - armour_other=4; + side_armour=4; turrets=4; capacity=150; @@ -351,7 +351,7 @@ function assign_ship_stats(){ maxshields=200; leadership=90; armour_front=5; - armour_other=4; + side_armour=4; turrets=3; capacity=100; carrying=0; @@ -371,7 +371,7 @@ function assign_ship_stats(){ maxshields=200; leadership=90; armour_front=5; - armour_other=4; + side_armour=4; turrets=2; capacity=50; carrying=0; @@ -394,7 +394,7 @@ function assign_ship_stats(){ maxshields=200; leadership=90; armour_front=5; - armour_other=4; + side_armour=4; turrets=2; capacity=50; carrying=0; @@ -418,7 +418,7 @@ function assign_ship_stats(){ maxshields=200; leadership=100; armour_front=6; - armour_other=5; + side_armour=5; turrets=3; capacity=250; carrying=0; @@ -442,7 +442,7 @@ function assign_ship_stats(){ maxshields=200; leadership=100; armour_front=6; - armour_other=5; + side_armour=5; turrets=3; capacity=250; carrying=0; @@ -467,7 +467,7 @@ function assign_ship_stats(){ maxshields=200; leadership=100; armour_front=6; - armour_other=5; + side_armour=5; turrets=3; capacity=250; carrying=0; @@ -487,7 +487,7 @@ function assign_ship_stats(){ maxshields=200; leadership=100; armour_front=6; - armour_other=5; + side_armour=5; turrets=3; capacity=250; carrying=0; @@ -508,7 +508,7 @@ function assign_ship_stats(){ maxshields=100; leadership=80; armour_front=6; - armour_other=4; + side_armour=4; turrets=2; capacity=50; carrying=0; @@ -527,7 +527,7 @@ function assign_ship_stats(){ maxshields=200; leadership=100; armour_front=6; - armour_other=5; + side_armour=5; turrets=5; capacity=1000; carrying=0; @@ -548,7 +548,7 @@ function assign_ship_stats(){ maxshields=200; leadership=90; armour_front=6; - armour_other=5; + side_armour=5; turrets=3; capacity=250; carrying=0; @@ -568,7 +568,7 @@ function assign_ship_stats(){ maxshields=100; leadership=100; armour_front=6; - armour_other=5; + side_armour=5; turrets=2; capacity=100; carrying=0; @@ -587,7 +587,7 @@ function assign_ship_stats(){ maxshields=100; leadership=80; armour_front=5; - armour_other=4; + side_armour=4; turrets=1; capacity=50; carrying=0; @@ -606,7 +606,7 @@ function assign_ship_stats(){ maxshields=100; leadership=80; armour_front=5; - armour_other=4; + side_armour=4; turrets=2; capacity=50; carrying=0; @@ -625,7 +625,7 @@ function assign_ship_stats(){ maxshields=400; leadership=90; armour_front=7; - armour_other=5; + side_armour=5; weapons=5; turrets=4; capacity=150; @@ -648,7 +648,7 @@ function assign_ship_stats(){ maxshields=300; leadership=85; armour_front=5; - armour_other=5; + side_armour=5; turrets=3; capacity=50; carrying=0; @@ -668,7 +668,7 @@ function assign_ship_stats(){ maxshields=300; leadership=85; armour_front=5; - armour_other=5; + side_armour=5; turrets=3; capacity=50; carrying=0; @@ -695,7 +695,7 @@ function assign_ship_stats(){ maxshields=100; leadership=80; armour_front=7; - armour_other=4; + side_armour=4; turrets=2; capacity=50; carrying=0; @@ -722,7 +722,7 @@ function assign_ship_stats(){ leadership=100; armour_front=5; - armour_other=5; + side_armour=5; turrets=5; capacity=800; carrying=0; @@ -751,7 +751,7 @@ function assign_ship_stats(){ leadership=100; armour_front=5; - armour_other=5; + side_armour=5; turrets=4; capacity=500; carrying=0; @@ -774,7 +774,7 @@ function assign_ship_stats(){ leadership=100; armour_front=5; - armour_other=5; + side_armour=5; turrets=2; capacity=250; carrying=0; @@ -796,7 +796,7 @@ function assign_ship_stats(){ leadership=100; armour_front=4; - armour_other=4; + side_armour=4; turrets=2; capacity=25; carrying=0; @@ -818,7 +818,7 @@ function assign_ship_stats(){ leadership=100; armour_front=4; - armour_other=4; + side_armour=4; turrets=2; capacity=25; carrying=0; diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index 86c4e3eb2b..ae437d7dc7 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -284,8 +284,4 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ function add_weapon_to_ship(weapon_name, overide_data={}){ overide_data.ship = id; array_push(weapons, new ShipWeapon(weapon_name, overide_data)); -} - -function add_weapon_to_ini_ship(index,weapon_name, overide_data={}){ - array_push(obj_ini.ship_weapons[index], new ShipWeapon(weapon_name, overide_data)); -} \ No newline at end of file +}; \ No newline at end of file diff --git a/scripts/scr_squads/scr_squads.gml b/scripts/scr_squads/scr_squads.gml index 36ee13e960..189929b9ff 100644 --- a/scripts/scr_squads/scr_squads.gml +++ b/scripts/scr_squads/scr_squads.gml @@ -518,7 +518,8 @@ function UnitSquad(squad_type = undefined, company = undefined) constructor{ } else if (same_loc_type){ if (loc_type==location_types.ship){ if (exact_loc){ - final_loc_status=$"aboard {obj_ini.ship[loc_id]}" + var _ship = fetch_ship(loc_id); + final_loc_status=$"aboard {_ship.name}" } else if (in_orbit){ final_loc_status=$"various ships orbiting {system}" } diff --git a/scripts/scr_start_load/scr_start_load.gml b/scripts/scr_start_load/scr_start_load.gml index cd459314c5..c8fc77ba81 100644 --- a/scripts/scr_start_load/scr_start_load.gml +++ b/scripts/scr_start_load/scr_start_load.gml @@ -239,16 +239,15 @@ function scr_start_load(fleet, load_from_star, load_options) { with(obj_p_fleet){instance_destroy()}; for (var i=0;i-1){ - obj_ini.artifact_loc[unload] = obj_ini.ship[valid_ship]; + var _ship = fetch_ship(valid_ship); + obj_ini.artifact_loc[unload] = _ship.name; obj_ini.artifact_sid[unload] = 500+valid_ship; } } diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index e711937cfc..452e21a000 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -301,7 +301,7 @@ function set_nid_ships(){ maxshields=300; leadership=100; armour_front=7; - armour_other=5; + side_armour=5; weapons=5; turrets=3; capacity=0; @@ -338,7 +338,7 @@ function set_nid_ships(){ maxshields=200; leadership=100; armour_front=5; - armour_other=4; + side_armour=4; weapons=3; turrets=2; capacity=0; @@ -360,7 +360,7 @@ function set_nid_ships(){ maxshields=100; leadership=100; armour_front=5; - armour_other=4; + side_armour=4; weapons=1; turrets=0; capacity=0; @@ -381,7 +381,7 @@ function set_nid_ships(){ maxshields=100; leadership=100; armour_front=5; - armour_other=4; + side_armour=4; weapons=1; turrets=0; capacity=0; diff --git a/scripts/scr_ui_advisors/scr_ui_advisors.gml b/scripts/scr_ui_advisors/scr_ui_advisors.gml index a0db5e8918..7a914190f4 100644 --- a/scripts/scr_ui_advisors/scr_ui_advisors.gml +++ b/scripts/scr_ui_advisors/scr_ui_advisors.gml @@ -151,8 +151,8 @@ function scr_ui_advisors() { if (fest_scheduled = 1) { if (fest_type != "Chapter Relic") then blurp2 = "A " + string(fest_type) + " has been scheduled on "; if (fest_type = "Chapter Relic") then blurp2 = "Chapter Relic construction has been scheduled on "; - - if (fest_planet = 0) then blurp2 += string(obj_ini.ship[fest_sid]); + var _ship = fetch_ship(fest_sid); + if (fest_planet = 0) then blurp2 += _ship.name(); if (fest_planet > 0) then blurp2 += string(fest_star) + " " + scr_roman(fest_wid); if (fest_honoring = 0) then blurp2 += ". "; @@ -663,9 +663,12 @@ function scr_ui_advisors() { draw_text_ext(xx + 222, yy + 216, string_hash_to_newline(string(tot_ki)), -1, 396); var unit = fetch_unit([0,1]); - if (unit.ship_location == -1) then draw_text(xx + 222, yy + 380, string_hash_to_newline("Current Location: " + string(obj_ini.loc[0, 1]) + " " + string(unit.planet_location) + "#Health: " + unit.hp() + "%")); - if (unit.ship_location>-1) then draw_text(xx + 222, yy + 380, string_hash_to_newline($"Current Location: Onboard {obj_ini.ship[unit.ship_location]}#Health: {unit.hp()}%")); - draw_text(xx + 222.5, yy + 380.5, string_hash_to_newline("Current Location:#Health:")); + if (unit.ship_location == -1){ + draw_text(xx + 222, yy + 380, string_hash_to_newline("Current Location: " + string(obj_ini.loc[0, 1]) + " " + string(unit.planet_location) + "#Health: " + unit.hp() + "%")); + } else if (unit.ship_location>-1) { + var _ship = fetch_Ship(unit.ship_location); + draw_text(xx + 222, yy + 380, string_hash_to_newline($"Current Location: Onboard {_ship.name}#Health: {unit.hp()}%")); + } draw_sprite(spr_arrow, 0, xx + 217, yy + 32); } diff --git a/scripts/scr_vehicle_helpers/scr_vehicle_helpers.gml b/scripts/scr_vehicle_helpers/scr_vehicle_helpers.gml index b5ffd1a092..9f3b8b4766 100644 --- a/scripts/scr_vehicle_helpers/scr_vehicle_helpers.gml +++ b/scripts/scr_vehicle_helpers/scr_vehicle_helpers.gml @@ -2,9 +2,10 @@ function set_vehicle_last_ship(vehic_array, empty = false) { if (!empty) { var vehic_ini = obj_ini.veh_lid[vehic_array[0]][vehic_array[1]]; + var _ship = obj_ini.ship_data[vehic_array[0]][vehic_array[1]]; var _last_ship_data = { uid : obj_ini.ship_uid[vehic_ini], - name : obj_ini.ship[vehic_ini], + name : _ship.name, } } else { var _last_ship_data = { diff --git a/scripts/turn_towards_point/turn_towards_point.gml b/scripts/turn_towards_point/turn_towards_point.gml index 282428d461..8e5af1ca11 100644 --- a/scripts/turn_towards_point/turn_towards_point.gml +++ b/scripts/turn_towards_point/turn_towards_point.gml @@ -1,9 +1,9 @@ -function turn_towards_point(current_angle, x1, y1, x2, y2, turn_speed) { +function turn_towards_point(current_angle, x1, y1, x2, y2, turning_speed) { // turn_towards_point(currentAngle, x1, y1, x2, y2, speed); var ca = degtorad(current_angle); - var sp = degtorad(turn_speed); + var sp = degtorad(turning_speed); var a = arctan2(y1-y2, x2-x1) - ca; while (a < -pi || a > pi) From 5fad5497b34538c317910b9aeedd111ca3d04957 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 15 May 2025 19:45:07 +0100 Subject: [PATCH 056/155] ships are fully struct based --- objects/obj_bomb_select/Draw_0.gml | 4 +- objects/obj_bomb_select/Mouse_56.gml | 3 +- objects/obj_drop_select/Alarm_4.gml | 2 +- objects/obj_p_ship/Alarm_3.gml | 2 +- scripts/scr_ShipStruct/scr_ShipStruct.gml | 2 + scripts/scr_add_vehicle/scr_add_vehicle.gml | 2 +- scripts/scr_company_load/scr_company_load.gml | 2 +- .../scr_fleet_advisor/scr_fleet_advisor.gml | 6 +-- .../scr_ini_ship_cleanup.gml | 8 --- .../scr_marine_struct/scr_marine_struct.gml | 2 +- .../scr_player_fleet_combat_functions.gml | 50 ++++++++----------- .../scr_player_fleet_functions.gml | 23 +++------ .../scr_player_ship_functions.gml | 28 ++++------- scripts/scr_roster/scr_roster.gml | 9 +--- scripts/scr_ship_count/scr_ship_count.gml | 5 +- scripts/scr_special_view/scr_special_view.gml | 6 +-- .../scr_unit_quick_find_pane.gml | 2 +- .../scr_vehicle_helpers.gml | 2 +- 18 files changed, 59 insertions(+), 99 deletions(-) diff --git a/objects/obj_bomb_select/Draw_0.gml b/objects/obj_bomb_select/Draw_0.gml index 7ec199e388..1d968a332c 100644 --- a/objects/obj_bomb_select/Draw_0.gml +++ b/objects/obj_bomb_select/Draw_0.gml @@ -213,9 +213,7 @@ if (max_ships>0)and (instance_exists(obj_star_select)){ bomb_score = 0; for(var i=0; i0){ + if (_ship.carrying){ ship[i]=_ship.name; ship_use[i]=0; ship_max[i]=_ship.carrying; diff --git a/objects/obj_p_ship/Alarm_3.gml b/objects/obj_p_ship/Alarm_3.gml index 4197c5ad71..9e0682c019 100644 --- a/objects/obj_p_ship/Alarm_3.gml +++ b/objects/obj_p_ship/Alarm_3.gml @@ -6,7 +6,7 @@ if (hp -1) { var _ship = fetch_ship(ship_location); - last_ship.uid = obj_ini.ship_uid[ship_location]; + last_ship.uid = _ship.uid; last_ship.name = _ship.name; } else { last_ship = { diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 423fe35088..9dfc96eb0a 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -19,14 +19,7 @@ function add_fleet_ships_to_combat(fleet, combat){ array_push(combat.ship_data , _ship_d); - array_push(combat.ship_class, player_ships_class(_ship_id)); array_push(combat.ship_id, _ship_id); - array_push(combat.ship_leadership, 100); - array_push(combat.ship_hp, _ship_d.hp); - array_push(combat.ship_maxhp, _ship_d.max_hp); - array_push(combat.ship_speed, obj_ini.ship_speed[_ship_id]); - array_push(combat.ship_front_armour, _ship_d.front_armour); - array_push(combat.ship_other_armour, _ship_d.side_armour); } catch (_exception){ handle_exception(_exception); @@ -39,23 +32,23 @@ function sort_ships_into_columns(combat){ with (combat){ for (var k = 0;k=3)) then combat.column_num[col]+=1; - if ((combat.column[col-1]="capital" && _ship.size[k]>=3)) then combat.column_num[col-1]+=1; - if ((combat.column[col-2]="capital" && _ship.size[k]>=3)) then combat.column_num[col-2]+=1; - if ((combat.column[col-3]="capital" && _ship.size[k]>=3)) then combat.column_num[col-3]+=1; - if ((combat.column[col-4]="capital" && _ship.size[k]>=3)) then combat.column_num[col-4]+=1; + if ((combat.column[col]="capital" || _ship.size>=3)) then combat.column_num[col]+=1; + if ((combat.column[col-1]="capital" || _ship.size>=3)) then combat.column_num[col-1]+=1; + if ((combat.column[col-2]="capital" || _ship.size>=3)) then combat.column_num[col-2]+=1; + if ((combat.column[col-3]="capital" || _ship.size>=3)) then combat.column_num[col-3]+=1; + if ((combat.column[col-4]="capital" || _ship.size>=3)) then combat.column_num[col-4]+=1; - if (combat.ship_class[k]=combat.column[col]) then combat.column_num[col]+=1; - if (combat.ship_class[k]=combat.column[col-1]) then combat.column_num[col-1]+=1; - if (combat.ship_class[k]=combat.column[col-2]) then combat.column_num[col-2]+=1; - if (combat.ship_class[k]=combat.column[col-3]) then combat.column_num[col-3]+=1; - if (combat.ship_class[k]=combat.column[col-4]) then combat.column_num[col-4]+=1; + if (_ship.class=combat.column[col]) then combat.column_num[col]+=1; + if (_ship.class=combat.column[col-1]) then combat.column_num[col-1]+=1; + if (_ship.class=combat.column[col-2]) then combat.column_num[col-2]+=1; + if (_ship.class=combat.column[col-3]) then combat.column_num[col-3]+=1; + if (_ship.class=combat.column[col-4]) then combat.column_num[col-4]+=1; - if ((combat.column[col]="escort" && _ship.size[k]=1)) then combat.column_num[col]+=1; - if ((combat.column[col-1]="escort" && _ship.size[k]=1)) then combat.column_num[col-1]+=1; - if ((combat.column[col-2]="escort" && _ship.size[k]=1)) then combat.column_num[col-2]+=1; - if ((combat.column[col-3]="escort" && _ship.size[k]=1)) then combat.column_num[col-3]+=1; - if ((combat.column[col-4]="escort" && _ship.size[k]=1)) then combat.column_num[col-4]+=1; + if ((combat.column[col]="escort" ||_ship.size=1)) then combat.column_num[col]+=1; + if ((combat.column[col-1]="escort"|| _ship.size=1)) then combat.column_num[col-1]+=1; + if ((combat.column[col-2]="escort" || _ship.size=1)) then combat.column_num[col-2]+=1; + if ((combat.column[col-3]="escort" || _ship.size=1)) then combat.column_num[col-3]+=1; + if ((combat.column[col-4]="escort" || _ship.size=1)) then combat.column_num[col-4]+=1; } } @@ -96,19 +89,20 @@ function player_fleet_ship_spawner(){ // show_message(string(column_num[col])+" "+string(column[col])+" X:"+string(x2)); for (var k = 0;k=3 && ship_class[k]!="") { + if (sizz>=3 && _ship.class!="") { man=instance_create(x2,temp2,obj_p_capital); man.ship_id=ship_id[k]; temp2+=hei; } - if (sizz=2 && ship_class[k]!="") { + if (sizz=2 && _ship.class!="") { man=instance_create(x2,temp2,obj_p_cruiser); man.ship_id=ship_id[k]; temp2+=hei; } - if (sizz=1 && ship_class[k]!="") { + if (sizz=1 && _ship.class!="") { man=instance_create(x2,temp2,obj_p_escort); man.ship_id=ship_id[k]; temp2+=hei; @@ -146,13 +140,13 @@ function setup_player_combat_ship(){ class=ship_data.class; hp=ship_data.hp maxhp=ship_data.max_hp - shields=obj_ini.ship_shields[ship_id]*100; + shields=ship_data.shields*100; maxshields=shields; armour_front = ship_data.front_armour; side_armour=ship_data.side_armour; turrets=0; ship_colour=obj_controller.body_colour_replace; - max_speed = obj_ini.ship_speed[ship_id]; + max_speed = ship_data.max_speed; for (var i=0;i0){ - obj_ini.ship_shields[index]=12; with(_struct){ left_broad_positions = [[56, 16],[65, 16],[74,16],[83, 16]]; right_broad_positions = [[56, 37],[65, 37],[74,37],[83, 37]]; @@ -272,6 +263,7 @@ function new_player_ship(type, start_loc="home", new_name=""){ max_hp = 1200; side_armour = 6; rear_armour = 3; + shields = 1;2 } @@ -280,7 +272,6 @@ function new_player_ship(type, start_loc="home", new_name=""){ } if (string_count("Strike Cruiser",type)>0){ - obj_ini.ship_shields[index]=6; with(_struct){ left_broad_positions = [[56, 16],[65, 16],[74,16],[83, 16]]; right_broad_positions = [[56, 37],[65, 37],[74,37],[83, 37]]; @@ -306,14 +297,14 @@ function new_player_ship(type, start_loc="home", new_name=""){ max_hp = 600 front_armour = 6; side_armour = 4; - rear_armour = 3; + rear_armour = 3; + shields = 6; } _struct.turrets = [{}]; } if (string_count("Gladius",type)>0){ - obj_ini.ship_shields[index]=1; with(_struct){ class = "Gladius"; add_weapon_to_ship("Light Weapons Battery"); @@ -325,13 +316,13 @@ function new_player_ship(type, start_loc="home", new_name=""){ max_speed = 30; front_armour = 5; side_armour = 4; - rear_armour = 1; + rear_armour = 1; + shields = 1; } } if (string_count("Hunter",type)>0){ - obj_ini.ship_shields[index]=1; with(_struct){ class = "Hunter"; add_weapon_to_ship("Torpedoes"); @@ -344,14 +335,14 @@ function new_player_ship(type, start_loc="home", new_name=""){ max_speed = 33; front_armour = 4; side_armour = 3; - rear_armour = 1; + rear_armour = 1; + shields = 1; } } if (string_count("Gloriana",type)>0){ - obj_ini.ship_shields[index]=24; with(_struct){ class = "Gloriana"; add_weapon_to_ship("Lance Battery", {facing : "right"}); @@ -368,7 +359,8 @@ function new_player_ship(type, start_loc="home", new_name=""){ max_speed = 23; front_armour = 6; side_armour = 8; - rear_armour = 2; + rear_armour = 2; + shields = 24; } } @@ -384,7 +376,7 @@ function player_ships_class(index){ var _escorts = ["Escort", "Hunter", "Gladius"]; var _capitals = ["Gloriana", "Battle Barge", "Capital"]; var _frigates = ["Strike Cruiser", "Frigate"]; - var _ship_name_class = obj_ini.ship_class[index]; + var _ship_name_class = fetch_ship(index).class; if (array_contains(_escorts, _ship_name_class)){ return "escort"; } else if (array_contains(_capitals, _ship_name_class)){ diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml index ebde6dc8c6..4c1c80b913 100644 --- a/scripts/scr_roster/scr_roster.gml +++ b/scripts/scr_roster/scr_roster.gml @@ -414,14 +414,7 @@ function Roster() constructor{ for (var i=0;i-1){ - var ham=obj_ini.TTRPG[0][v].ship_location; + if (fetch_unit([0,v]).ship_location>-1){ + var ham=fetch_unit([0,v]).ship_location; var _ship = obj_ini.ship_data[ham]; if (_ship.location=="Lost") then continue; } - unit = obj_ini.TTRPG[0][v]; + unit = fetch_unit([0,v]); var yep=0; if (unit.base_group!="astartes") and (unit.base_group!="none"){ yep=1; diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index 54c88a491d..5f2d52c6ce 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -728,7 +728,7 @@ function unload_selection(){ // selecting location is the ship right now; get it's orbit location boba.loading_name=selecting_location; boba.depth=self.depth-50; - // sel_uid=obj_ini.ship_uid[selecting_ship]; + var _ship = obj_ini.ship_data[selecting_ship]; scr_company_load(_ship.location); } diff --git a/scripts/scr_vehicle_helpers/scr_vehicle_helpers.gml b/scripts/scr_vehicle_helpers/scr_vehicle_helpers.gml index 9f3b8b4766..1497294658 100644 --- a/scripts/scr_vehicle_helpers/scr_vehicle_helpers.gml +++ b/scripts/scr_vehicle_helpers/scr_vehicle_helpers.gml @@ -4,7 +4,7 @@ function set_vehicle_last_ship(vehic_array, empty = false) { var vehic_ini = obj_ini.veh_lid[vehic_array[0]][vehic_array[1]]; var _ship = obj_ini.ship_data[vehic_array[0]][vehic_array[1]]; var _last_ship_data = { - uid : obj_ini.ship_uid[vehic_ini], + uid : _ship.uid, name : _ship.name, } } else { From f62e195e3bd2cb9ea5d4d7873d99d0ee2f82eae1 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 15 May 2025 20:27:28 +0100 Subject: [PATCH 057/155] issue tweaking --- objects/obj_controller/Create_0.gml | 2 +- objects/obj_controller/Mouse_50.gml | 28 ------------------- objects/obj_dropdown_sel/Step_0.gml | 4 +-- objects/obj_event/Step_0.gml | 7 ++++- objects/obj_fleet/Alarm_7.gml | 3 +- objects/obj_ground_mission/Alarm_0.gml | 8 ++++-- objects/obj_ncombat/Alarm_7.gml | 5 ++-- objects/obj_p_fleet/Alarm_7.gml | 9 +++--- objects/obj_popup/Step_0.gml | 3 +- scripts/scr_ShipStruct/scr_ShipStruct.gml | 2 +- scripts/scr_add_artifact/scr_add_artifact.gml | 2 +- .../scr_controller_helpers.gml | 2 +- .../scr_fleet_advisor/scr_fleet_advisor.gml | 2 +- .../scr_marine_struct/scr_marine_struct.gml | 9 ++++-- scripts/scr_master_loc/scr_master_loc.gml | 2 +- .../scr_player_ship_functions.gml | 20 ++++++------- scripts/scr_roster/scr_roster.gml | 2 +- .../scr_ship_weapon_struct.gml | 5 +++- scripts/scr_start_load/scr_start_load.gml | 6 ++-- scripts/scr_ui_advisors/scr_ui_advisors.gml | 24 ++++++++-------- 20 files changed, 68 insertions(+), 77 deletions(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 29dbe15bd6..4fae1640bc 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -1727,7 +1727,7 @@ for(var mm=0; mm=xx+953) and (mouse_x>=yy+84+(i*20)) and (mouse_x0) or ((diplomacy<-5) and (diplomacy>-6)) and (cooldown<=0) and (diplomacy<10){ diff --git a/objects/obj_dropdown_sel/Step_0.gml b/objects/obj_dropdown_sel/Step_0.gml index 6bbe04167c..ff0b50b767 100644 --- a/objects/obj_dropdown_sel/Step_0.gml +++ b/objects/obj_dropdown_sel/Step_0.gml @@ -162,9 +162,9 @@ if (option[1]=""){ for(q=0;q0) then p3=string(obj_controller.fest_star)+" "+scr_roman(obj_controller.fest_wid); - if (p2<=0) then p3=+" the vessel '"+string(obj_ini.ship[obj_controller.fest_sid])+"'"; + if (p2<=0){ + var _ship = fetch_ship(obj_controller.fest_sid); + p3=+$" the vessel '{_ship.name}'"; + } scr_alert("green","event",string(p1)+" on "+string(p3)+" ends.",0,0); scr_event_log("green",string(p1)+" on "+string(p3)+" ends.", p3); diff --git a/objects/obj_fleet/Alarm_7.gml b/objects/obj_fleet/Alarm_7.gml index 2cd61ecc75..e76199935d 100644 --- a/objects/obj_fleet/Alarm_7.gml +++ b/objects/obj_fleet/Alarm_7.gml @@ -17,7 +17,8 @@ try { } if (instance_number(obj_en_ship)<=0){ with(obj_p_ship){ - if (hp<=0) then scr_recent("ship_destroyed",obj_ini.ship[ship_id],ship_id); + var _ship = fetch_ship(ship_id); + if (hp<=0) then scr_recent("ship_destroyed",_ship.name,ship_id); } } diff --git a/objects/obj_ground_mission/Alarm_0.gml b/objects/obj_ground_mission/Alarm_0.gml index fcf3bbab78..742e8cd5b5 100644 --- a/objects/obj_ground_mission/Alarm_0.gml +++ b/objects/obj_ground_mission/Alarm_0.gml @@ -63,8 +63,12 @@ if (num>0){// Hmmmmmmm scr_return_ship(loc,id,num); var man_size,ship_id,comp,plan,i; - i=0;ship_id=0;man_size=0;comp=0;plan=0; - repeat(30){i+=1;if (obj_ini.ship[i]=loc) then ship_id=i;}i=0; + i=0; + ship_id=0; + man_size=0; + comp=0; + plan=0; + ship_id = get_ship_by_name(loc); obj_controller.menu=0;obj_controller.managing=0; obj_controller.cooldown=10; instance_destroy();exit; diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index b2859f35a4..36f0342984 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -1,4 +1,4 @@ -stry { +try { // show_debug_message("alarm 7 start"); audio_stop_sound(snd_battle); audio_play_sound(snd_royal,0,true); @@ -613,7 +613,8 @@ stry { var shiyp=instance_nearest(battle_object.x,battle_object.y,obj_p_fleet); if (shiyp.x == battle_object.x && shiyp.y ==battle_object.y){ shi = fleet_full_ship_array(shiyp)[0]; - loc = obj_ini.ship[shi]; + var _ship = fetch_ship(shi); + loc = _ship.name; } if (hulk_treasure=1){// Requisition diff --git a/objects/obj_p_fleet/Alarm_7.gml b/objects/obj_p_fleet/Alarm_7.gml index 63b1549765..53468d466b 100644 --- a/objects/obj_p_fleet/Alarm_7.gml +++ b/objects/obj_p_fleet/Alarm_7.gml @@ -9,10 +9,10 @@ var capital_id; var capital_list = fleet_full_ship_array(, ,true,true); for(var i=0;igood){ + var _ship = fetch_ship(capital_id); + if (_ship.hp>good){ c=capital_id; - good=obj_ini.ship_hp[capital_id]; + good=_ship.hp; } } @@ -22,7 +22,8 @@ if (good>0){ if (obj_ini.artifact[a]=="") then continue; if (array_contains(ships_list, obj_ini.artifact_sid[a]-500)){ obj_ini.artifact_sid[a]=c+500; - obj_ini.artifact_loc[a]=obj_ini.ship[c]; + var _ship = fetch_ship(c); + obj_ini.artifact_loc[a]=_ship.name; } } } diff --git a/objects/obj_popup/Step_0.gml b/objects/obj_popup/Step_0.gml index ec64055001..26f08a5719 100644 --- a/objects/obj_popup/Step_0.gml +++ b/objects/obj_popup/Step_0.gml @@ -770,7 +770,8 @@ try { } if (press == 3) { // Return to ship, exit - scr_return_ship(obj_ini.ship[obj_ground_mission.ship_id], obj_ground_mission, obj_ground_mission.num); + var _ship = fetch_ship(obj_ground_mission.ship_id); + scr_return_ship(_ship.name, obj_ground_mission, obj_ground_mission.num); var man_size, ship_id, comp, plan, i; ship_id = 0; man_size = 0; diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 4f1ba5a874..1946cd6e99 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -1,4 +1,4 @@ -function fetch_Ship(id){ +function fetch_ship(id){ return obj_ini.ship_data[id]; } diff --git a/scripts/scr_add_artifact/scr_add_artifact.gml b/scripts/scr_add_artifact/scr_add_artifact.gml index 0ef85ddf6c..b1466279f9 100644 --- a/scripts/scr_add_artifact/scr_add_artifact.gml +++ b/scripts/scr_add_artifact/scr_add_artifact.gml @@ -423,7 +423,7 @@ function ArtifactStruct(Index) constructor { var demonSummonChance = roll_dice_chapter(1, 100, "high"); var _ship = obj_ini.ship_data[_ship_id]; - if (demonSummonChance <= 60 _ship.carrying) { + if (demonSummonChance <= 60 && _ship.carrying) { instance_create(0, 0, obj_ncombat); obj_ncombat.battle_special = "ship_demon"; obj_ncombat.formation_set = 1; diff --git a/scripts/scr_controller_helpers/scr_controller_helpers.gml b/scripts/scr_controller_helpers/scr_controller_helpers.gml index 42b7c9550a..02bf966cb2 100644 --- a/scripts/scr_controller_helpers/scr_controller_helpers.gml +++ b/scripts/scr_controller_helpers/scr_controller_helpers.gml @@ -1,4 +1,4 @@ -s//TODO make enum to store menu area codes +//TODO make enum to store menu area codes function scr_menu_clear_up(specific_area_function) { var spec_func = specific_area_function; with(obj_controller) { diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index feae47f56a..eb9f7be5aa 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -1,4 +1,4 @@ -s// Script assets have changed for v2.3.0 see +// Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information /// @mixin function scr_fleet_advisor(){ diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index 1d47c93a42..902085e01b 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -422,6 +422,9 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} planet_location = obj_ini.home_planet; } ship_location = -1; + static ship = function(){ + return fetch_ship(ship_location); + } last_ship = { uid: "", name: "" @@ -1877,8 +1880,8 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } else { location_type = location_types.ship; //marine is on ship location_id = ship_location > -1 ? ship_location : 0; //ship array position - if (location_id < array_length(obj_ini.ship_location)) { - var _ship = obj_ini.ship_data[location_id]; + if (location_id < array_length(obj_ini.ship_data)) { + var _ship = ship(); location_name = _ship.location; //location of ship } else { location_name = location_name == obj_ini.loc[company][marine_number]; @@ -1948,7 +1951,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} var off_loading_ship = current_location[1]; var _ship = obj_ini.ship_data[ship]; var _offload_ship = obj_ini.ship_data[off_loading_ship]; - if ((_ship.location == _offload_ship.location && _ship.has_space(size)) { + if (_ship.location == _offload_ship.location && _ship.has_space(size)) { oboff_loading_ship.carrying -= size; // remove from previous ship capacity ship_location = ship; // change marine location to new ship _ship.carrying += size; //add marine capacity to new ship diff --git a/scripts/scr_master_loc/scr_master_loc.gml b/scripts/scr_master_loc/scr_master_loc.gml index 204debe2eb..5665040fc2 100644 --- a/scripts/scr_master_loc/scr_master_loc.gml +++ b/scripts/scr_master_loc/scr_master_loc.gml @@ -13,7 +13,7 @@ function scr_master_loc() { if (good=true){ if (obj_ini.name[co][v] == "") then continue; unit = fetch_unit([co, v]); - if (unit.role()==obj_ini.role[100][eROLE.ChapterMastesr]){ + if (unit.role()==obj_ini.role[100][eROLE.ChapterMaster]){ if (unit.planet_location>0) and (unit.ship_location<0) then lick=string(obj_ini.loc[co][v])+"."+string(unit.planet_location); if (unit.planet_location<=0) and (unit.ship_location>-1){ var _ship = fetch_ship(unit.ship_location)/ diff --git a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml index f7b191da4d..f92c6e1a3a 100644 --- a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml +++ b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml @@ -1,7 +1,9 @@ function return_lost_ships_chance(){ - if (array_contains(obj_ini.ship_location, "Lost")){ - if (roll_dice_chapter(1, 100, "high")>97){ - return_lost_ship(); + for (var i=0;i97){ + return_lost_ship(); + } } } } @@ -131,7 +133,7 @@ function get_player_ships(location="", name=""){ return _ships; } -function new_player_ship_defaults(){ +function new_player_ship_defaults(class){ with (obj_ini){ array_push(ship_data,new ShipStruct(class)); } @@ -225,7 +227,7 @@ function loose_ship_to_warp_event(){ //TODO make method for setting ship weaponry function new_player_ship(type, start_loc="home", new_name=""){ var ship_names="",index=0; - var index = new_player_ship_defaults(class = ""); + var index = new_player_ship_defaults(type); var _names = []; for (var i=0;i0){ with(_struct){ diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml index 4c1c80b913..82d3bedf94 100644 --- a/scripts/scr_roster/scr_roster.gml +++ b/scripts/scr_roster/scr_roster.gml @@ -303,7 +303,7 @@ function Roster() constructor{ } } if (obj_ini.veh_lid[co][i]>-1){ - if (obj_ini.veh_lid[co][i]>= array_length(obj_ini.ship_location)){ + if (obj_ini.veh_lid[co][i]>= array_length(obj_ini.ship_data)){ obj_ini.veh_lid[co][i] = -1; } var _ship = obj_ini.ship_data[obj_ini.veh_lid[co][i]]; diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index ae437d7dc7..44dfb991d4 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -282,6 +282,9 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ } function add_weapon_to_ship(weapon_name, overide_data={}){ - overide_data.ship = id; + if (instance_exists(obj_fleet)){ + overide_data.ship = id; + } + array_push(weapons, new ShipWeapon(weapon_name, overide_data)); }; \ No newline at end of file diff --git a/scripts/scr_start_load/scr_start_load.gml b/scripts/scr_start_load/scr_start_load.gml index c8fc77ba81..d2d026afb1 100644 --- a/scripts/scr_start_load/scr_start_load.gml +++ b/scripts/scr_start_load/scr_start_load.gml @@ -53,9 +53,9 @@ function scr_start_load(fleet, load_from_star, load_options) { function load_vehicles(_companies, _equip ,_ship, size){ obj_ini.veh_wid[_companies, _equip] = 0; obj_ini.veh_lid[_companies, _equip] = _ship; - var _ship = obj_ini.ship_data[_ship]; - obj_ini.veh_loc[_companies, _equip] = _ship.location; - _ship.carrying += size; + var _ship_s = obj_ini.ship_data[_ship]; + obj_ini.veh_loc[_companies, _equip] = _ship_s.location; + _ship_s.carrying += size; } var ship_size, _companies_loaded; _company_size = 0; diff --git a/scripts/scr_ui_advisors/scr_ui_advisors.gml b/scripts/scr_ui_advisors/scr_ui_advisors.gml index 7a914190f4..37b71e5c23 100644 --- a/scripts/scr_ui_advisors/scr_ui_advisors.gml +++ b/scripts/scr_ui_advisors/scr_ui_advisors.gml @@ -97,15 +97,15 @@ function scr_ui_advisors() { draw_set_halign(fa_left); var behav = 0, - r_eta = 0,unit; + r_eta = 0,_unit; for (var qp = 1; qp <= min(36, penitorium); qp++) { - unit = obj_ini.TTRPG[penit_co[qp]][penit_id[qp]]; - if (unit.corruption > 0) then r_eta = round((unit.corruption * unit.corruption) / 50); - if (unit.corruption >= 90) then r_eta = "Never"; - if (unit.corruption <= 0) then r_eta = "0"; + _unit = obj_ini.TTRPG[penit_co[qp]][penit_id[qp]]; + if (_unit.corruption > 0) then r_eta = round((_unit.corruption * _unit.corruption) / 50); + if (_unit.corruption >= 90) then r_eta = "Never"; + if (_unit.corruption <= 0) then r_eta = "0"; draw_rectangle(xx + 947, yy + 100 + ((qp - 1) * 20), xx + 1577, yy + 100 + (qp * 20), 1); - draw_text(xx + 950, yy + 100 + ((qp - 1) * 20), string_hash_to_newline(unit.name_role())); + draw_text(xx + 950, yy + 100 + ((qp - 1) * 20), string_hash_to_newline(_unit.name_role())); draw_text(xx + 1200, yy + 100 + ((qp - 1) * 20), string_hash_to_newline("ETA: " + string(r_eta))); draw_text(xx + 1432, yy + 100 + ((qp - 1) * 20), string_hash_to_newline("[Execute] [Release]")); } @@ -662,12 +662,12 @@ function scr_ui_advisors() { draw_text_ext(xx + 222, yy + 216, string_hash_to_newline(string(tot_ki)), -1, 396); - var unit = fetch_unit([0,1]); - if (unit.ship_location == -1){ - draw_text(xx + 222, yy + 380, string_hash_to_newline("Current Location: " + string(obj_ini.loc[0, 1]) + " " + string(unit.planet_location) + "#Health: " + unit.hp() + "%")); - } else if (unit.ship_location>-1) { - var _ship = fetch_Ship(unit.ship_location); - draw_text(xx + 222, yy + 380, string_hash_to_newline($"Current Location: Onboard {_ship.name}#Health: {unit.hp()}%")); + var _unit = fetch_unit([0,1]); + if (_unit.ship_location == -1){ + draw_text(xx + 222, yy + 380, string_hash_to_newline("Current Location: " + string(obj_ini.loc[0, 1]) + " " + string(_unit.planet_location) + "#Health: " + _unit.hp() + "%")); + } else if (_unit.ship_location>-1) { + var _ship = _unit.ship(); + draw_text(xx + 222, yy + 380, string_hash_to_newline($"Current Location: Onboard {_ship.name}#Health: {_unit.hp()}%")); } draw_sprite(spr_arrow, 0, xx + 217, yy + 32); From b336ac3f48c6d61409d2744bf6631368e43bc0e6 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 18 May 2025 16:51:04 +0100 Subject: [PATCH 058/155] deceleration fix --- scripts/scr_ShipStruct/scr_ShipStruct.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 1946cd6e99..6208215480 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -46,7 +46,7 @@ function ShipStruct() constructor{ static deceleration = function(){ var _decel = final_acceleration()/2; - return deceleration; + return _decel; } static ship_self_heal = function(){ From e3247f06bf4bb2bb06c23a93e00b49b7847cc6d4 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 18 May 2025 16:56:20 +0100 Subject: [PATCH 059/155] few tweaks to running --- .../scr_tyranid_fleet_functions.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index 452e21a000..3cb230cc70 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -37,7 +37,7 @@ function tyranid_fleet_planet_action(){ with (orbiting){ is_dead = is_dead_star(); if (!is_dead) { - for (var i=1;i50){ var alert = $"The Genestealer Cult on {planet_numeral_name(i)} is exceedingly thorough, there is almost no resistance as the swarm descends and what little resistance remains is quickly quelled by infiltrators, most of the populations willingly offer themselves to their new gods jumping into acid vats to form biomass for their newly arrived gods or otherwise allowing themselves to be devoured by the teaming ripper swarms"; @@ -152,7 +152,7 @@ function star_biomass_value(star, fleet=false){ } else { for (var i=0;i Date: Sun, 18 May 2025 23:27:11 +0100 Subject: [PATCH 060/155] system spawn --- ChapterMaster.yyp | 1 + objects/obj_controller/Alarm_0.gml | 7 ---- objects/obj_controller/Create_0.gml | 2 +- objects/obj_controller/obj_controller.yy | 2 - objects/obj_fleet/Alarm_7.gml | 37 ++++++++++++++----- objects/obj_timer/Create_0.gml | 11 +++++- scripts/scr_ShipStruct/scr_ShipStruct.gml | 6 +++ .../scr_planetary_feature.gml | 5 ++- .../scr_player_fleet_combat_functions.gml | 9 +++++ .../scr_system_spawn/scr_system_spawn.gml | 13 +++++++ scripts/scr_system_spawn/scr_system_spawn.yy | 13 +++++++ .../scr_wait_and_execute.gml | 3 +- 12 files changed, 87 insertions(+), 22 deletions(-) delete mode 100644 objects/obj_controller/Alarm_0.gml rename objects/obj_controller/Alarm_1.gml => scripts/scr_system_spawn/scr_system_spawn.gml (98%) create mode 100644 scripts/scr_system_spawn/scr_system_spawn.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 2d4cb1dc63..74fd3fda2a 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -905,6 +905,7 @@ {"id":{"name":"scr_struct_functions","path":"scripts/scr_struct_functions/scr_struct_functions.yy",},}, {"id":{"name":"scr_system_search_helpers","path":"scripts/scr_system_search_helpers/scr_system_search_helpers.yy",},}, {"id":{"name":"scr_system_spawn_functions","path":"scripts/scr_system_spawn_functions/scr_system_spawn_functions.yy",},}, + {"id":{"name":"scr_system_spawn","path":"scripts/scr_system_spawn/scr_system_spawn.yy",},}, {"id":{"name":"scr_target","path":"scripts/scr_target/scr_target.yy",},}, {"id":{"name":"scr_text_hit","path":"scripts/scr_text_hit/scr_text_hit.yy",},}, {"id":{"name":"scr_thought","path":"scripts/scr_thought/scr_thought.yy",},}, diff --git a/objects/obj_controller/Alarm_0.gml b/objects/obj_controller/Alarm_0.gml deleted file mode 100644 index 60e6a70f2d..0000000000 --- a/objects/obj_controller/Alarm_0.gml +++ /dev/null @@ -1,7 +0,0 @@ - -instance_activate_object(obj_star); -if (instance_exists(obj_ini)) and (global.load==-1){ - alarm[1]=2; - instance_activate_object(obj_star); - instance_activate_all(); -} diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 4fae1640bc..fb7f8ebe50 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -1846,7 +1846,7 @@ remov=string_length(string(temp[65])+string(temp[66])+string(temp[67])+string(te instance_create(0,0,obj_tooltip ); -action_set_alarm(2, 0); +wait_and_execute(2, system_setup_controller,[] , id); //**! DO NOT PUT THINGS AT THE BOTTOM OF THIS FILE IF YOU NEED THEM TO WORK AFTER LOADING FROM A SAVE, SEE LINE 1550 -ish */ \ No newline at end of file diff --git a/objects/obj_controller/obj_controller.yy b/objects/obj_controller/obj_controller.yy index 113332b0ef..b6ba74300a 100644 --- a/objects/obj_controller/obj_controller.yy +++ b/objects/obj_controller/obj_controller.yy @@ -11,8 +11,6 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":84,"eventType":5,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":61,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, diff --git a/objects/obj_fleet/Alarm_7.gml b/objects/obj_fleet/Alarm_7.gml index e76199935d..93a37f07e3 100644 --- a/objects/obj_fleet/Alarm_7.gml +++ b/objects/obj_fleet/Alarm_7.gml @@ -18,27 +18,46 @@ try { if (instance_number(obj_en_ship)<=0){ with(obj_p_ship){ var _ship = fetch_ship(ship_id); + ship_data.hp = hp; + ship_data.weapons = weapons; if (hp<=0) then scr_recent("ship_destroyed",_ship.name,ship_id); } } - with (_player_battle_fleet){ - scr_ini_ship_cleanup() + if (instance_exists(_player_battle_fleet)){ + with (_player_battle_fleet){ + scr_ini_ship_cleanup(); - if (player_fleet_ship_count() == 0) then instance_destroy(); + if (player_fleet_ship_count() == 0){ + instance_destroy(); + } + } } var op,ii,killer,killer_tg;op=0;killer=0;killer_tg=0;ii=-50; - - - - if (player_started=0) and (instance_exists(obj_turn_end)) then with(obj_star){if (name!=obj_turn_end.battle_location[obj_turn_end.current_battle]){x-=10000;y-=10000;}} - if (player_started=1) then with(obj_star){if (id!=obj_fleet.ene_fleet){x-=10000;y-=10000;}} + if (!player_started && instance_exists(obj_turn_end)){ + with(obj_star){ + if (name!=obj_turn_end.battle_location[obj_turn_end.current_battle]){ + x-=10000; + y-=10000; + } + } + } else { + with(obj_star){ + if (id!=obj_fleet.ene_fleet){ + x-=10000;y-=10000; + } + } + } ii=instance_nearest(room_width,room_height,obj_star); obj_controller.temp[1070]=ii.id; - with(obj_star){if (x<-5000) and (y<-5000){x+=10000;y+=10000;}} + + with(obj_star){ + if (x<-5000) and (y<-5000){x+=10000;y+=10000; + } + } diff --git a/objects/obj_timer/Create_0.gml b/objects/obj_timer/Create_0.gml index c7bccb95c0..04e07b3ad4 100644 --- a/objects/obj_timer/Create_0.gml +++ b/objects/obj_timer/Create_0.gml @@ -2,11 +2,20 @@ time_set = 0; time_passed = 0; end_function = undefined; end_function_args = []; +execution_scope = -1; execute_end_function = function() { if (is_method(end_function)) { // show_debug_message("Executing Method!"); - method_call(end_function, end_function_args); + if (instance_exists(execution_scope)){ + var _func = end_function; + var _args = end_function_args; + with (execution_scope){ + method_call(_func, _args); + } + }else { + method_call(end_function, end_function_args); + } } // show_debug_message("Killing Myself!"); instance_destroy(self); diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 6208215480..2a6fd70ceb 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -29,6 +29,12 @@ function ShipStruct() constructor{ rear_armour = 1; name = ""; shields = 0; + shields_damage = 0; + shields_recharge_rate = 0.2; + shields_reboot_time = 20; + captain = false; + engineer = false; + uid = floor(random(99999999))+1; static ship_hp_percentage = function(){ diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index c10d0c9852..527eb486f5 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -165,6 +165,9 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ recruit_type = 0; recruit_cost = 0; break; + case P_features.ShipDock: + player_hidden = 0; + size = 1; default: player_hidden = 1; planet_display = 0; @@ -272,7 +275,7 @@ function planet_player_hidden_feature(planet){ function system_player_hidden_feature(system){ for (var i=1;i<=system.planets;i++){ - if (planet_hidden_feature(system.p_feature[i])) then return true; + if (planet_player_hidden_feature(system.p_feature[i])) then return true; } return false; diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 9dfc96eb0a..55bde1ec2e 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -121,6 +121,15 @@ function player_fleet_ship_spawner(){ }// End repeat } +//data must have keys, shields, recharge, and reboot +function ShipShieldGenerator(data){ + move_data_to_current_scope(data); + destroyed = false; + disabled = false; + static step = function(){ + + } +} function setup_player_combat_ship(){ action=""; diff --git a/objects/obj_controller/Alarm_1.gml b/scripts/scr_system_spawn/scr_system_spawn.gml similarity index 98% rename from objects/obj_controller/Alarm_1.gml rename to scripts/scr_system_spawn/scr_system_spawn.gml index 06595ebee8..c3d3fec505 100644 --- a/objects/obj_controller/Alarm_1.gml +++ b/scripts/scr_system_spawn/scr_system_spawn.gml @@ -1,3 +1,14 @@ +function system_setup_controller(){ + instance_activate_object(obj_star); + if (instance_exists(obj_ini)) and (global.load==-1){ + wait_and_execute(2, scr_system_spawn, [], id); + instance_activate_object(obj_star); + instance_activate_all(); + } + +} + +function scr_system_spawn(){ // Sets up the sector spawn and assigns spawned enemies to the sector instance_activate_object(obj_star); instance_activate_all(); @@ -587,3 +598,5 @@ if (instance_exists(obj_temp7)){ }*/ // x=0;y=0; + +} \ No newline at end of file diff --git a/scripts/scr_system_spawn/scr_system_spawn.yy b/scripts/scr_system_spawn/scr_system_spawn.yy new file mode 100644 index 0000000000..902b2661c2 --- /dev/null +++ b/scripts/scr_system_spawn/scr_system_spawn.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_system_spawn", + "isCompatibility":false, + "isDnD":false, + "name":"scr_system_spawn", + "parent":{ + "name":"Sys", + "path":"folders/Scripts/Sys.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_wait_and_execute/scr_wait_and_execute.gml b/scripts/scr_wait_and_execute/scr_wait_and_execute.gml index da49c17eac..548fca7766 100644 --- a/scripts/scr_wait_and_execute/scr_wait_and_execute.gml +++ b/scripts/scr_wait_and_execute/scr_wait_and_execute.gml @@ -3,11 +3,12 @@ /// @arg {real} timer How many steps to wait. 0 executes it next frame. /// @arg {function} func /// @arg {array} func_args -function wait_and_execute(timer, func, func_args = []) { +function wait_and_execute(timer, func, func_args = [], exec_scope = -1) { var _timer_obj = instance_create(0, 0, obj_timer); with(_timer_obj){ time_set = timer; end_function = func; end_function_args = func_args; + execution_scope = exec_scope; } } From e0ef670cc4cd5caf81cb3292e3e277240495a2dc Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 19 May 2025 18:51:23 +0100 Subject: [PATCH 061/155] spawn tweaks --- ChapterMaster.yyp | 1 + objects/obj_controller/Create_0.gml | 2 +- objects/obj_timer/Create_0.gml | 19 ++++-- .../scr_planet_setup_functions.gml | 20 +++++++ .../scr_planet_setup_functions.yy | 13 ++++ scripts/scr_system_spawn/scr_system_spawn.gml | 60 +++++++++++++------ .../scr_wait_and_execute.gml | 2 +- 7 files changed, 91 insertions(+), 26 deletions(-) create mode 100644 scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml create mode 100644 scripts/scr_planet_setup_functions/scr_planet_setup_functions.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 74fd3fda2a..e5e008075c 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -853,6 +853,7 @@ {"id":{"name":"scr_pen_And_paper","path":"scripts/scr_pen_And_paper/scr_pen_And_paper.yy",},}, {"id":{"name":"scr_perils_table","path":"scripts/scr_perils_table/scr_perils_table.yy",},}, {"id":{"name":"scr_planet_heresy","path":"scripts/scr_planet_heresy/scr_planet_heresy.yy",},}, + {"id":{"name":"scr_planet_setup_functions","path":"scripts/scr_planet_setup_functions/scr_planet_setup_functions.yy",},}, {"id":{"name":"scr_planetary_feature","path":"scripts/scr_planetary_feature/scr_planetary_feature.yy",},}, {"id":{"name":"scr_PlanetData","path":"scripts/scr_PlanetData/scr_PlanetData.yy",},}, {"id":{"name":"scr_player_combat_weapon_stacks","path":"scripts/scr_player_combat_weapon_stacks/scr_player_combat_weapon_stacks.yy",},}, diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index fb7f8ebe50..20763aa458 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -1846,7 +1846,7 @@ remov=string_length(string(temp[65])+string(temp[66])+string(temp[67])+string(te instance_create(0,0,obj_tooltip ); -wait_and_execute(2, system_setup_controller,[] , id); +wait_and_execute(3, system_setup_controller,[] , self); //**! DO NOT PUT THINGS AT THE BOTTOM OF THIS FILE IF YOU NEED THEM TO WORK AFTER LOADING FROM A SAVE, SEE LINE 1550 -ish */ \ No newline at end of file diff --git a/objects/obj_timer/Create_0.gml b/objects/obj_timer/Create_0.gml index 04e07b3ad4..1e95af8940 100644 --- a/objects/obj_timer/Create_0.gml +++ b/objects/obj_timer/Create_0.gml @@ -2,21 +2,30 @@ time_set = 0; time_passed = 0; end_function = undefined; end_function_args = []; -execution_scope = -1; +execution_scope = undefined; execute_end_function = function() { - if (is_method(end_function)) { + if (is_callable(end_function)) { // show_debug_message("Executing Method!"); if (instance_exists(execution_scope)){ var _func = end_function; var _args = end_function_args; with (execution_scope){ - method_call(_func, _args); + if (is_method(_func)){ + method_call(_func, _args); + } else { + script_execute_ext(_func, _args) + } } - }else { - method_call(end_function, end_function_args); + } else { + if (is_method(end_function)){ + method_call(end_function, end_function_args); + } else { + script_execute_ext(end_function, end_function_args) + } } } // show_debug_message("Killing Myself!"); instance_destroy(self); } + diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml new file mode 100644 index 0000000000..1caea3d04a --- /dev/null +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -0,0 +1,20 @@ + + + +function setup_forge_world(star, planet, dock = 0){ + with(star){ + planet[forge_planet]=1; + p_type[forge_planet]="Forge"; + owner = eFACTION.Mechanicus; + p_owner[forge_planet] = owner; + p_first[forge_planet] = owner; + + } +} + +function setup_tau_world(star, planet){ + p_owner[planet] = eFACTION.Tau; + owner = eFACTION.Tau; + p_influence[planet][eFACTION.Tau]=70; + owner = eFACTION.Tau; +} \ No newline at end of file diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.yy b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.yy new file mode 100644 index 0000000000..39fec4560d --- /dev/null +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_planet_setup_functions", + "isCompatibility":false, + "isDnD":false, + "name":"scr_planet_setup_functions", + "parent":{ + "name":"Sys", + "path":"folders/Scripts/Sys.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_system_spawn/scr_system_spawn.gml b/scripts/scr_system_spawn/scr_system_spawn.gml index c3d3fec505..16bc8d317d 100644 --- a/scripts/scr_system_spawn/scr_system_spawn.gml +++ b/scripts/scr_system_spawn/scr_system_spawn.gml @@ -1,7 +1,8 @@ function system_setup_controller(){ - instance_activate_object(obj_star); + instance_activate_all(); if (instance_exists(obj_ini)) and (global.load==-1){ - wait_and_execute(2, scr_system_spawn, [], id); + show_debug_message("system spawn main"); + wait_and_execute(2, scr_system_spawn, [], self); instance_activate_object(obj_star); instance_activate_all(); } @@ -9,6 +10,12 @@ function system_setup_controller(){ } function scr_system_spawn(){ + system_setup_data = { + large_docks : 0, + medium_docks : 0, + small_docks : 0, + }; + show_debug_message("system complexities"); // Sets up the sector spawn and assigns spawned enemies to the sector instance_activate_object(obj_star); instance_activate_all(); @@ -103,8 +110,8 @@ if (did){ _current_system.planet[1]=1; _current_system.planet[2]=1; _current_system.image_index=4; - _current_system.p_type[1]="Forge"; _current_system.p_type[2]="Ice"; + setup_forge_world(_current_system, 1, dock = 2); /* _current_system.p_owner[1]=3; _current_system.p_owner[2]=3; @@ -326,11 +333,19 @@ if (did){ rando=1; _current_system=instance_nearest(xx,yy,obj_star); with (_current_system){ - if (planets>0) and (_current_system.p_type[1]!="Dead") and (_current_system.owner == eFACTION.Imperium){ - p_owner[1] = eFACTION.Tau; - owner = eFACTION.Tau; - p_influence[1][eFACTION.Tau]=70; - } + if (is_dead_star() || planets<0){ + continue; + } + if (owner != eFACTION.Imperium){ + continue; + } + + for (var s=1;s<=planets;s++){ + if (p_type[i]!="Dead"){ + setup_tau_world(_current_system, s); + break; + } + } } instance_deactivate_object(_current_system); } @@ -432,7 +447,9 @@ if (did){ if (field=="both"){ - if (obj_ini.fleet_type==ePlayerBase.penitent) then orkz+=3; + if (obj_ini.fleet_type==ePlayerBase.penitent){ + orkz+=3; + } orkz+=3; n=array_length(_non_xenos_chaos); for (var j=0; j0) and (_current_system.owner == eFACTION.Imperium){ - var forge_planet = irandom(_current_system.planets-1)+1; - _current_system.plant[forge_planet]=1; - _current_system.p_type[forge_planet]="Forge"; - _current_system.owner = eFACTION.Mechanicus; - _current_system.p_owner[forge_planet] = _current_system.owner; - _current_system.p_first[forge_planet] = _current_system.owner; + var _forge_planet = irandom(_current_system.planets-1)+1; + setup_forge_world(_current_system, _forge_planet); } instance_deactivate_object(_current_system); } @@ -469,8 +482,12 @@ y=py; instance_activate_object(obj_star); -if (did==0) then alarm[1]=5; -if (did!=0) then obj_star.alarm[1]=1; +if (did==0){ + wait_and_execute(5, scr_system_spawn, [], self); +} else { + map_dock_qouta = irandom_range(10, 20); + obj_star.alarm[1]=1; +} // Eldar craftworld here @@ -579,10 +596,12 @@ if (is_test_map==true){ scr_add_artifact("good","",0,obj_ini.ship_data[0].name,501);*/ } -with(obj_temp7){instance_destroy();} //for tau fleets, if it is stationed on a system it owns, make a temp7 obj +var _tau_stars = []; with(obj_en_fleet){ - if (owner == eFACTION.Tau) and (instance_nearest(x,y,obj_star).owner == eFACTION.Tau) then instance_create(x,y,obj_temp7); + if (owner == eFACTION.Tau) and (instance_nearest(x,y,obj_star).owner == eFACTION.Tau){ + instance_create(x,y,obj_temp7); + } } //if any temp objects exist, find the one nearest to the center of the room and set your direction to //the angle to the room center @@ -593,10 +612,13 @@ if (instance_exists(obj_temp7)){ } } +with(obj_temp7){instance_destroy();}; + /*with(obj_star){ scr_star_ownership(false); }*/ // x=0;y=0; +instance_activate_all(); } \ No newline at end of file diff --git a/scripts/scr_wait_and_execute/scr_wait_and_execute.gml b/scripts/scr_wait_and_execute/scr_wait_and_execute.gml index 548fca7766..daffa62f88 100644 --- a/scripts/scr_wait_and_execute/scr_wait_and_execute.gml +++ b/scripts/scr_wait_and_execute/scr_wait_and_execute.gml @@ -3,7 +3,7 @@ /// @arg {real} timer How many steps to wait. 0 executes it next frame. /// @arg {function} func /// @arg {array} func_args -function wait_and_execute(timer, func, func_args = [], exec_scope = -1) { +function wait_and_execute(timer, func, func_args = [], exec_scope = undefined) { var _timer_obj = instance_create(0, 0, obj_timer); with(_timer_obj){ time_set = timer; From d334834e61cb06cbc9cb6752b296a05d4f65a59a Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 19 May 2025 23:19:34 +0100 Subject: [PATCH 062/155] further improvements to system spawning --- objects/obj_controller/Alarm_5.gml | 2 +- objects/obj_star/Alarm_0.gml | 2 +- objects/obj_star/Alarm_1.gml | 485 ---------------- objects/obj_star_select/Draw_64.gml | 2 +- scripts/scr_PlanetData/scr_PlanetData.gml | 2 +- scripts/scr_cheatcode/scr_cheatcode.gml | 4 +- scripts/scr_dialogue/scr_dialogue.gml | 4 +- scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml | 2 +- .../scr_khornate_fleet_functions.gml | 4 +- .../scr_planet_setup_functions.gml | 524 +++++++++++++++++- .../scr_planetary_feature.gml | 5 +- scripts/scr_random_event/scr_random_event.gml | 2 +- scripts/scr_system_spawn/scr_system_spawn.gml | 49 +- .../scr_system_spawn_functions.gml | 45 +- scripts/scr_turn_first/scr_turn_first.gml | 2 +- .../scr_tyranid_planet_functions.gml | 8 +- scripts/scr_ui_popup/scr_ui_popup.gml | 6 +- 17 files changed, 597 insertions(+), 551 deletions(-) delete mode 100644 objects/obj_star/Alarm_1.gml diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 3e99424405..e792bbe229 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -298,7 +298,7 @@ try_and_report_loop("Secret Chaos Warlord spawn", function(){ if (_star_found){ var _planet = array_random_element(planets_without_type("Dead",_choice_star)); _choice_star.warlord[_planet]=1; - array_push(_choice_star.p_feature[_planet], new NewPlanetFeature(P_features.Warlord10)); + array_push(_choice_star.p_feature[_planet], new PlanetFeature(P_features.Warlord10)); var _heresy_inc = _choice_star.p_type[_planet]=="Hive" ? 25 : 10; diff --git a/objects/obj_star/Alarm_0.gml b/objects/obj_star/Alarm_0.gml index 09b69d56cc..87b0edc033 100644 --- a/objects/obj_star/Alarm_0.gml +++ b/objects/obj_star/Alarm_0.gml @@ -180,7 +180,7 @@ switch (name) { planets = 3; p_type[1] = "Feudal"; planet[1] = 1; - array_push(p_feature[1], new NewPlanetFeature(P_features.Necron_Tomb)); + array_push(p_feature[1], new PlanetFeature(P_features.Necron_Tomb)); p_type[2] = "Dead"; planet[2] = 1; p_type[3] = "Dead"; diff --git a/objects/obj_star/Alarm_1.gml b/objects/obj_star/Alarm_1.gml deleted file mode 100644 index 36728dbecc..0000000000 --- a/objects/obj_star/Alarm_1.gml +++ /dev/null @@ -1,485 +0,0 @@ -// the min population of a planet is usually 1/3 of the max. so lava has 1500 max. min is 500. min + random should = max -// its important to know the population of a planet due to recruitment changing depending on population max -// If getting to max pop is very rare, it will be awful to recruit from -// some planets may be better or worse than others depending on their max pop. -// TODO refactor and improve logic -for(var i=1; i<=4; i++){ - p_population[i]=0;// 10B - switch (p_type[i]) { - case "Lava": - p_population[i] = irandom(1500) + 500; - p_station[i] = 2; - p_max_population[i] = 2000; - break; - case "Desert": - p_population[i] = irandom(150000000) + 100000000; - p_fortified[i] = choose(2, 3, 4); - p_station[i] = 3; - p_max_population[i] = 250000000; - break; - case "Hive": - p_population[i] = random(100) + 50; - p_large[i] = 1; - p_fortified[i] = 4; - p_station[i] = choose(4, 5); - p_max_population[i] = 150; - break; - case "Agri": - p_population[i] = irandom(1000000) + 500000; - p_fortified[i] = choose(0, 1); - p_station[i] = choose(0, 1); - p_max_population[i] = 1500000; - break; - case "Temperate": - p_population[i] = irandom(4) + 2; - p_large[i] = 1; - p_fortified[i] = choose(3, 4); - p_station[i] = choose(3, 4); - p_max_population[i] = 6; - break; - case "Shrine": - p_population[i] = irandom(5) + 3; - p_large[i] = 1; - p_fortified[i] = choose(4, 5); - p_station[i] = choose(4, 5); - p_max_population[i] = 8; - break; - case "Ice": - p_population[i] = irandom(13500000) + 6500000; - p_fortified[i] = choose(1, 2, 3); - p_station[i] = choose(1, 2, 3); - p_max_population[i] = 20000000; - break; - case "Feudal": - p_population[i] = irandom(400000000) + 200000000; - p_fortified[i] = choose(2, 3); - p_station[i] = choose(2, 3, 4); - p_max_population[i] = 600000000; - break; - case "Forge": - p_population[i] = random(26) + 4; - p_large[i] = 1; - p_fortified[i] = 5; - p_station[i] = 5; - p_max_population[i] = 30; - break; - case "Death": - p_population[i] = irandom(300000) + 200000; - p_station[i] = choose(2, 3); - p_max_population[i] = 500000; - break; - case "Craftworld": - p_population[i] = irandom_range(150000, 300000); - p_station = 6; - p_max_population[i] = p_population[i]; - break; - } - // Sets military on planet - if (p_population[i]>=10000000){ - var military=p_population[i]/470; - p_guardsmen[i]=floor(military*0.25); - p_pdf[i]=floor(military*0.75); - } - if (p_population[i]>=5000000) and (p_population[i]<10000000){ - var military=p_population[i]/200; - p_guardsmen[i]=floor(military*0.25); - p_pdf[i]=floor(military*0.75); - } - if (p_population[i]>=100000) and (p_population[i]<5000000){ - var military=p_population[i]/50; - p_guardsmen[i]=floor(military*0.25); - p_pdf[i]=floor(military*0.75); - } - if (p_population[i]<100000) and (p_population[i]>5) and (p_large[i]==0){ - p_pdf[i]=floor(p_population[i]/25); - } - if (p_population[i]<2000) and (p_population[i]>5) and (p_large[i]==0){ - p_pdf[i]=floor(p_population[i]/10); - } - if (p_large[i]==1){ - p_guardsmen[i]=floor(p_population[i]*1250000); - p_pdf[i]=p_guardsmen[i]*3; - } - - if (p_population[i]<1000000) and (p_large[i]==0)then p_pop[i]=string(p_population[i]); - if (p_population[i]>999999) and (p_large[i]==0)and (p_population[i]<1000000000) then p_pop[i]=string(p_population[i]/1000000)+"M"; - if (p_large[i]==1) then p_pop[i]=string(p_population[i])+"B"; - - if (craftworld==1){ - p_guardsmen[i]=0; - p_pdf[i]=0; - p_eldar[i]=6; - owner = eFACTION.Eldar; - p_owner[1]=6; - warp_lanes=[]; - x2=0; - } - // p_guardsmen[i]=0; -} - -for(var i=1; i<=4; i++){p_guardsmen[i]=0;} - -var fleet, system_fleet=0,capital=0,frigate=0,escort=0; -// Create Imperium Fleet -if (owner == eFACTION.Imperium || owner == eFACTION.Ork || owner == eFACTION.Mechanicus){ - for(var g=1; g<=4; g++){ - switch (p_type[g]) { - case "Hive": - system_fleet += 4; - break; - case "Forge": - system_fleet += 8; - break; - case "Desert": - case "Temperate": - system_fleet += 1; - break; - case "Feudal": - case "Ice": - system_fleet += 0.5; - break; - case "Shrine": - system_fleet += 2; - break; - } - } - - frigate=round(system_fleet/2); - escort=round(system_fleet); - - if (capital<0) then capital=0; - if (frigate<0) then frigate=0; - if (escort<0) then escort=0; - - if (system_fleet>0){ // DISABLED FOR TESTING FLEET COMBAT - fleet=instance_create(x,y,obj_en_fleet); - fleet.owner = eFACTION.Imperium; - - fleet.capital_number=capital; - fleet.frigate_number=frigate; - fleet.escort_number=escort; - - // present_fleet[2]+=1; - - // Create ships here - fleet.image_speed=0; - var ii=0; - ii+=capital-1; - ii+=round((frigate/2)); - ii+=round((escort/4)); - if (ii<=1) and (capital+frigate+escort>0) then ii=1; - fleet.image_index=ii; - } -} -// Creates Ork forces -if (owner == eFACTION.Ork){ - if (p_population[1]>0) then p_orks[1]=1; - if (p_population[2]>0) then p_orks[2]=1; - if (p_population[3]>0) then p_orks[3]=1; - if (p_population[4]>0) then p_orks[4]=1; - - if (p_orks[1]>0){p_orks[1]=choose(1,2,3,3,4,5); - if (p_type[1]="Forge") or (p_type[1]="Hive") then p_orks[1]=choose(5);} - if (p_orks[2]>0){p_orks[2]=choose(1,2,3,3,4,5); - if (p_type[2]="Forge") or (p_type[2]="Hive") then p_orks[2]=choose(5);} - if (p_orks[3]>0){p_orks[3]=choose(1,2,3,3,4,5); - if (p_type[3]="Forge") or (p_type[3]="Hive") then p_orks[3]=choose(5);} - if (p_orks[4]>0){p_orks[4]=choose(1,2,3,3,4,5); - if (p_type[4]="Forge") or (p_type[4]="Hive") then p_orks[4]=choose(5);} -} - -system_fleet=1; -capital=0; -frigate=0; -escort=0; -// Create Tau Fleet -if (owner == eFACTION.Tau){ - for (var i = 1; i <= planets; i++) { - if (p_type[i] == "Desert") { - system_fleet += 5; - } - } - - if (system_fleet>=4){ - capital=choose(1,2,2,2,3,4); - frigate=floor(random_range(5,10)); - escort=floor(random_range(8,14)); - } - if (system_fleet>=1) and (system_fleet<3){ - capital=choose(1,2,2); - frigate=floor(random_range(4,8)); - escort=floor(random_range(5,12)); - } - if (system_fleet>0){ - fleet=instance_create(x,y,obj_en_fleet); - fleet.owner = eFACTION.Tau; - // Create ships here - fleet.sprite_index=spr_fleet_tau; - fleet.image_speed=0; - - fleet.capital_number=capital; - fleet.frigate_number=frigate; - fleet.escort_number=escort; - - fleet.image_index=floor((capital)+(frigate/2)+(escort/4)); - } - - for (var i = 1; i <=planets; i++) { - if (p_type[i] != "Dead") { - p_tau[i] = choose(1,2,3,4); - } - } - for (var i = 1; i <=planets; i++) { - if (p_type[i] == "Desert" && p_tau[i] < 4) { - p_tau[i] = 4; - } - } - for (var i = 1; i <=planets; i++) { - if (p_tau[i] > 0) { - p_owner[i] = 8; - p_first[i] = 8; - - switch (p_type[i]) { - case "Forge": - case "Hive": - p_tau[i] = choose(2,3); - break; - case "Ice": - p_tau[i] = choose(1,2); - break; - case "Temperate": - case "Desert": - case "Feudal": - p_tau[i] = choose(3,3,4,4,5); - break; - } - } - } - for (var i=1;i<=planets;i++){ - p_owner[i]=eFACTION.Tau; - p_first[i]=eFACTION.Tau; - p_influence[i][eFACTION.Tau]=65+irandom(15); - } -} -// Create Nids -if (owner == eFACTION.Tyranids){ - for (var i = 1; i <= planets; i++) { - if (p_population[i] > 0) { - p_tyranids[i] = 1; - - switch (p_type[i]) { - case "Forge": - case "Hive": - p_tyranids[i] = choose(4,5,5); - break; - } - //array_push(p_feature[i], new NewPlanetFeature(P_features.Gene_Stealer_Cult)); - - } - p_owner[i] = eFACTION.Imperium; - } -} - -if (owner>20){ - for (var i = 1; i <= planets; i++) { - if (p_population[i] > 0) { - var new_cult = new NewPlanetFeature(P_features.Gene_Stealer_Cult); - array_push(p_feature[i], new_cult); - new_cult.cult_age = irandom(300) - p_influence[i][eFACTION.Tyranids] = new_cult.cult_age/10 + irandom(30); - p_tyranids[i] = min(3, floor(p_influence[i][eFACTION.Tyranids]/15)) - if (p_tyranids[i]!=0){ - new_cult.hiding =false; - } - } - p_owner[i] = 2; - } - owner = eFACTION.Tyranids; -} - -for(var i=1; i<=planets; i++){ - if (p_owner[i]=8) and (p_guardsmen[i]>0){ - p_pdf[i]+=p_guardsmen[i]; - p_guardsmen[i]=0; - } - if (p_type[i]="Shrine") and (p_owner[i]!=1) and (p_first[i]!=1){ - p_owner[i]=5; - p_first[i]=5; - p_sisters[i]=4; - adjust_influence(eFACTION.Ecclesiarchy, (p_sisters[i]*10)-irandom(5), i); - } - // if (p_owner[i]=3) or (p_owner[i]=5){p_feature[i]="Artifact|";}Testing ; 137 -} - -if (name=="Kim Jong") and (owner == eFACTION.Chaos){ - for (var i = 1; i <=planets; i++) { - if (p_type[i] != "Dead") { - p_heresy[i] = 100; - p_traitors[i] = 2; - } - } -} - -obj_controller.alarm[3]=1; - -var i=choose(0,1); -if (i==1) and (planets>0){ - var nostart=false,aa=0; - i=floor(random(planets))+1; - - if (instance_exists(obj_p_fleet)) { - aa = instance_nearest(x, y, obj_p_fleet); - if (point_distance(x, y, aa.x, aa.y) > 50) { - nostart = true; - } - } - if (!instance_exists(obj_p_fleet)) then nostart=true; - - if (array_length(p_feature[i])==0) and (p_owner[i]!=1) and (nostart){ - var ranb=0; - // if (ranb=1) and (p_owner[i]!=1) and (p_owner[i]!=2) and (p_owner[i]!=3) then ranb=floor(random(4))+2; - // - var goo=0; - if (goo==0){ - for(var j=0; j<10; j++){ - if (goo==0)and (irandom(9)<2){ - ranb=floor(random(6))+1; - - switch (name) { - case "Vulvis Major": - ranb = 1; - break; - case "Necron Assrape": - ranb = 2; - break; - case "Morrowynd": - ranb = 5; - break; - } - - if (goo==0){ - switch (ranb){ - case 1: - array_push(p_feature[i], new NewPlanetFeature(P_features.Sororitas_Cathedral)) - if (p_heresy[i]>10) then p_heresy[i]-=10; - p_sisters[i]=choose(2,2,3); - adjust_influence(eFACTION.Ecclesiarchy, (p_sisters[i]*10)-irandom(3), i) - goo=1; - break; - case 2: - if (p_type[i]!="Hive") and (p_type[i]!="Lava") and (goo==0){ - array_push(p_feature[i], new NewPlanetFeature(P_features.Necron_Tomb)) - goo=1; - } - break; - case 3: - array_push(p_feature[i], new NewPlanetFeature( P_features.Artifact)) - goo=1; - break; - case 4: - array_push(p_feature[i], new NewPlanetFeature( P_features.STC_Fragment)) - goo=1; - break; - case 5: - if (p_type[i]!="Ice") and (p_type[i]!="Dead") and (p_type[i]!="Feudal"){ - goo=1; - array_push(p_feature[i], new NewPlanetFeature( P_features.Ancient_Ruins)) - } - break; - //alternative spawn for necron tomb probably needs merging with other method - case 6: - if ((p_type[i]=="Ice") or (p_type[i]=="Dead")){ - array_push(p_feature[i], new NewPlanetFeature( P_features.Necron_Tomb)) - goo=1; - } - break; - case 7: - if ((p_type[i]=="Dead") or (p_type[i]=="Desert")){ - var randum=floor(random(100))+1; - if (randum<=25){ - array_push(p_feature[i], new NewPlanetFeature( P_features.Cave_Network)) - goo=1; - } - } - break; - } - } - } - } - } - } -} - -var hyu=0; -for(var i=1; i<=4; i++){ - if (p_tyranids[i]>=5){ - p_guardsmen[i]=0; - p_pdf[i]=0; - p_population[i]=0; - hyu+=1; - p_owner[i]=9; - } - if (p_first[i]<=5) and (dispo[i]>-5000){ - dispo[i]=-20; - } -} -if (hyu==0) and (owner == eFACTION.Tyranids) then owner = eFACTION.Imperium; - -scr_star_ownership(false); - -if (obj_controller.is_test_map=true){ - /*if (p_owner[1]=3) then p_feature[1]="STC Fragment|"; - if (p_owner[2]=3) then p_feature[2]="STC Fragment|"; - if (p_owner[3]=3) then p_feature[3]="STC Fragment|"; - - - // Testing new guardsmen - p_guardsmen[1]=5000000; - p_tyranids[1]=4; - - p_guardsmen[2]=500000; - p_tyranids[2]=3; - - p_guardsmen[3]=100000; - p_tyranids[3]=2; - - p_orks[1]=0;p_orks[2]=0;p_orks[3]=0;*/ -} - -// if (obj_controller.is_test_map=true) and (p_owner[2]=1){ - -if (p_owner[2]=1){ - /* - p_guardsmen[2]=10000000; - p_pdf[2]=0; - obj_controller.faction_status[eFACTION.Imperium]="War"; - */ - - // p_type[1]="Dead"; - // p_feature[2]=""; - - // p_orks[2]=3; - // p_feature[2]="Starship!0!|"; - - /*repeat(4){ - var fleet;fleet=instance_create(x+(floor(random_range(100,200))*choose(1,-1)),y+(floor(random_range(100,200))*choose(1,-1)),obj_en_fleet); - fleet.owner = eFACTION.Chaos;fleet.sprite_index=spr_fleet_chaos;fleet.orbiting=0; - fleet.action_x=x;fleet.action_y=y;fleet.alarm[4]=1; - - fleet.capital_number=0; - fleet.frigate_number=1; - fleet.escort_number=2; - - // Create ships here - fleet.image_speed=0; - var ii;ii=0;ii+=capital-1;ii+=round((frigate/2));ii+=round((escort/4)); - if (ii<=1) and (capital+frigate+escort>0) then ii=1; - fleet.image_index=ii; - }*/ - -} - -obj_controller.alarm[9]=2; -if (obj_controller.is_test_map!=true) and (p_owner[2]!=1){ - for(var i=1; i<=4; i++){p_guardsmen[i]=0;} -} diff --git a/objects/obj_star_select/Draw_64.gml b/objects/obj_star_select/Draw_64.gml index e7be9c3e5d..6d9ad5c1bb 100644 --- a/objects/obj_star_select/Draw_64.gml +++ b/objects/obj_star_select/Draw_64.gml @@ -443,7 +443,7 @@ if (obj_controller.selecting_planet!=0){ if (obj_controller.faction_status[eFACTION.Imperium] == "War") { obj_controller.recruiting_worlds_bought -= 1; } - array_push(target.p_feature[obj_controller.selecting_planet], new NewPlanetFeature(P_features.Recruiting_World)); + array_push(target.p_feature[obj_controller.selecting_planet], new PlanetFeature(P_features.Recruiting_World)); if (obj_controller.selecting_planet) { obj_controller.recruiting_worlds += planet_numeral_name(obj_controller.selecting_planet, target); diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml index 9797f5e7f4..ad8ca051bb 100644 --- a/scripts/scr_PlanetData/scr_PlanetData.gml +++ b/scripts/scr_PlanetData/scr_PlanetData.gml @@ -438,7 +438,7 @@ function PlanetData(planet, system) constructor{ } static add_feature = function(feature_type){ - var new_feature = new NewPlanetFeature(feature_type); + var new_feature = new PlanetFeature(feature_type); array_push(system.p_feature[planet], new_feature); return new_feature; } diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index 09c3e34405..1bf51f78e8 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -182,14 +182,14 @@ function scr_cheatcode(argument0) { case "artifactpopulate": with (obj_star) { for (var i = 1; i <= planets; i++) { - array_push(p_feature[i], new NewPlanetFeature(P_features.Artifact)); + array_push(p_feature[i], new PlanetFeature(P_features.Artifact)); } } break; case "ruinspopulate": with (obj_star) { for (var i = 1; i <= planets; i++) { - array_push(p_feature[i], new NewPlanetFeature(P_features.Ancient_Ruins)); + array_push(p_feature[i], new PlanetFeature(P_features.Ancient_Ruins)); } } break; diff --git a/scripts/scr_dialogue/scr_dialogue.gml b/scripts/scr_dialogue/scr_dialogue.gml index 059d540b5a..60ff5a3174 100644 --- a/scripts/scr_dialogue/scr_dialogue.gml +++ b/scripts/scr_dialogue/scr_dialogue.gml @@ -2187,7 +2187,7 @@ function scr_dialogue(diplo_keyphrase) { if (array_length(p_feature[j])==0) and (onceh==0) then onceh=j; } if (onceh!=0){ - array_push(p_feature[onceh], new NewPlanetFeature(P_features.Webway)); + array_push(p_feature[onceh], new PlanetFeature(P_features.Webway)); obj_controller.temp[90]=name; good=1; if (onceh==1) then obj_controller.temp[90]+=" I"; @@ -2226,7 +2226,7 @@ function scr_dialogue(diplo_keyphrase) { i=floor(random(planets))+1; if (array_length(p_feature[i])==0) and (onceh==0) then onceh=i;} if (onceh!=0){ - array_push(p_feature[onceh], new NewPlanetFeature(P_features.Webway)); + array_push(p_feature[onceh], new PlanetFeature(P_features.Webway)); obj_controller.temp[90]=name; good=1; if (onceh==1) then obj_controller.temp[90]+=" I"; diff --git a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml index 30eb003d90..941775497f 100644 --- a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml +++ b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml @@ -291,7 +291,7 @@ function scr_enemy_ai_b() { if ((rando >= 100) && (p_traitors[i] < 5)) { p_traitors[i] = 6; p_owner[i] = 10; - array_push(p_feature[i], new NewPlanetFeature(P_features.Daemonic_Incursion)); + array_push(p_feature[i], new PlanetFeature(P_features.Daemonic_Incursion)); if (p_heresy[i] >= 80) { p_heresy[i] = 95; diff --git a/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml b/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml index 07f84a430a..2770968277 100644 --- a/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml +++ b/scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.gml @@ -47,7 +47,7 @@ function khorne_fleet_cargo(){ ii+=1; if (landing_planet=0){ if (planet_imperium_ground_total(ii)>0) and (p_population[ii]>p_max_population[ii]/20){ - array_push(p_feature[ii], new NewPlanetFeature(P_features.World_Eaters)); + array_push(p_feature[ii], new PlanetFeature(P_features.World_Eaters)); landing_planet=ii; p_chaos[ii]=6; break; @@ -57,7 +57,7 @@ function khorne_fleet_cargo(){ if (p_player[ii]>0) and (p_population[ii]>p_max_population[ii]/20){ landing_planet=ii; p_chaos[ii]=6; - array_push(p_feature[ii], new NewPlanetFeature(P_features.World_Eaters)); + array_push(p_feature[ii], new PlanetFeature(P_features.World_Eaters)); break; }// Forces landed } diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml index 1caea3d04a..9ca4824e9d 100644 --- a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -3,12 +3,35 @@ function setup_forge_world(star, planet, dock = 0){ with(star){ - planet[forge_planet]=1; - p_type[forge_planet]="Forge"; + planet[planet]=1; + p_type[planet]="Forge"; owner = eFACTION.Mechanicus; - p_owner[forge_planet] = owner; - p_first[forge_planet] = owner; + p_owner[planet] = owner; + p_first[planet] = owner; + var _size = dock + if (_size == 0){ + if (system_setup_data.large_docks == 0){ + var _size = 3; + } else { + _size = choose(2,3); + } + } + switch (_size){ + case 1: + system_setup_data.small_docks++; + break + case 2: + system_setup_data.medium_docks++; + break + case 3: + system_setup_data.large_docks++; + break + } + if (_size == 3){ + system_setup_data.large_docks++; + } + array_push(P_features[], new PlanetFeature(P_features.ShipDock, {size : _size})); } } @@ -17,4 +40,497 @@ function setup_tau_world(star, planet){ owner = eFACTION.Tau; p_influence[planet][eFACTION.Tau]=70; owner = eFACTION.Tau; +} + +function setup_chaos_world(star, planet){ + planet[planet]=1; + p_owner[planet]=10; + p_heresy[planet] = irandom_range(30, 80); + owner = eFACTION.Chaos; +} + +function setup_star_planet_defualts(){ + // the min population of a planet is usually 1/3 of the max. so lava has 1500 max. min is 500. min + random should = max + // its important to know the population of a planet due to recruitment changing depending on population max + // If getting to max pop is very rare, it will be awful to recruit from + // some planets may be better or worse than others depending on their max pop. + // TODO refactor and improve logic + with(obj_star){ + for(var i=1; i<=4; i++){ + p_population[i]=0;// 10B + switch (p_type[i]) { + case "Lava": + p_population[i] = irandom(1500) + 500; + p_station[i] = 2; + p_max_population[i] = 100000; + break; + case "Desert": + p_population[i] = irandom(150000000) + 100000000; + p_fortified[i] = choose(2, 3, 4); + p_station[i] = 3; + p_max_population[i] = 250000000; + break; + case "Hive": + p_population[i] = random(100) + 50; + p_large[i] = 1; + p_fortified[i] = 4; + p_station[i] = choose(4, 5); + p_max_population[i] = 150; + break; + case "Agri": + p_population[i] = irandom(1000000) + 500000; + p_fortified[i] = choose(0, 1); + p_station[i] = choose(0, 1); + p_max_population[i] = 1500000; + break; + case "Temperate": + p_population[i] = irandom(4) + 2; + p_large[i] = 1; + p_fortified[i] = choose(3, 4); + p_station[i] = choose(3, 4); + p_max_population[i] = 6; + break; + case "Shrine": + p_population[i] = irandom(5) + 3; + p_large[i] = 1; + p_fortified[i] = choose(4, 5); + p_station[i] = choose(4, 5); + p_max_population[i] = 8; + break; + case "Ice": + p_population[i] = irandom(13500000) + 6500000; + p_fortified[i] = choose(1, 2, 3); + p_station[i] = choose(1, 2, 3); + p_max_population[i] = 20000000; + break; + case "Feudal": + p_population[i] = irandom(400000000) + 200000000; + p_fortified[i] = choose(2, 3); + p_station[i] = choose(2, 3, 4); + p_max_population[i] = 600000000; + break; + case "Forge": + p_population[i] = random(26) + 4; + p_large[i] = 1; + p_fortified[i] = 5; + p_station[i] = 5; + p_max_population[i] = 30; + break; + case "Death": + p_population[i] = irandom(300000) + 200000; + p_station[i] = choose(2, 3); + p_max_population[i] = 500000; + break; + case "Craftworld": + p_population[i] = irandom_range(150000, 300000); + p_station = 6; + p_max_population[i] = p_population[i]; + break; + } + // Sets military on planet + if (p_population[i]>=10000000){ + var military=p_population[i]/470; + p_guardsmen[i]=floor(military*0.25); + p_pdf[i]=floor(military*0.75); + } + if (p_population[i]>=5000000) and (p_population[i]<10000000){ + var military=p_population[i]/200; + p_guardsmen[i]=floor(military*0.25); + p_pdf[i]=floor(military*0.75); + } + if (p_population[i]>=100000) and (p_population[i]<5000000){ + var military=p_population[i]/50; + p_guardsmen[i]=floor(military*0.25); + p_pdf[i]=floor(military*0.75); + } + if (p_population[i]<100000) and (p_population[i]>5) and (p_large[i]==0){ + p_pdf[i]=floor(p_population[i]/25); + } + if (p_population[i]<2000) and (p_population[i]>5) and (p_large[i]==0){ + p_pdf[i]=floor(p_population[i]/10); + } + if (p_large[i]==1){ + p_guardsmen[i]=floor(p_population[i]*1250000); + p_pdf[i]=p_guardsmen[i]*3; + } + + if (p_population[i]<1000000) and (p_large[i]==0)then p_pop[i]=string(p_population[i]); + if (p_population[i]>999999) and (p_large[i]==0)and (p_population[i]<1000000000) then p_pop[i]=string(p_population[i]/1000000)+"M"; + if (p_large[i]==1) then p_pop[i]=string(p_population[i])+"B"; + + if (craftworld==1){ + p_guardsmen[i]=0; + p_pdf[i]=0; + p_eldar[i]=6; + owner = eFACTION.Eldar; + p_owner[1]=6; + warp_lanes=[]; + x2=0; + } + // p_guardsmen[i]=0; + } + + for(var i=1; i<=4; i++){p_guardsmen[i]=0;} + + var fleet, system_fleet=0,capital=0,frigate=0,escort=0; + // Create Imperium Fleet + if (owner == eFACTION.Imperium || owner == eFACTION.Ork || owner == eFACTION.Mechanicus){ + for(var g=1; g<=4; g++){ + switch (p_type[g]) { + case "Hive": + system_fleet += 4; + break; + case "Forge": + system_fleet += 8; + break; + case "Desert": + case "Temperate": + system_fleet += 1; + break; + case "Feudal": + case "Ice": + system_fleet += 0.5; + break; + case "Shrine": + system_fleet += 2; + break; + } + } + + frigate=round(system_fleet/2); + escort=round(system_fleet); + + if (capital<0) then capital=0; + if (frigate<0) then frigate=0; + if (escort<0) then escort=0; + + if (system_fleet>0){ // DISABLED FOR TESTING FLEET COMBAT + fleet=instance_create(x,y,obj_en_fleet); + fleet.owner = eFACTION.Imperium; + + fleet.capital_number=capital; + fleet.frigate_number=frigate; + fleet.escort_number=escort; + + // present_fleet[2]+=1; + + // Create ships here + fleet.image_speed=0; + var ii=0; + ii+=capital-1; + ii+=round((frigate/2)); + ii+=round((escort/4)); + if (ii<=1) and (capital+frigate+escort>0) then ii=1; + fleet.image_index=ii; + } + } + // Creates Ork forces + if (owner == eFACTION.Ork){ + for (var i=1;i<=planets;i++){ + if (p_population[i]>0){ + p_orks[i]=choose(1,2,3,3,4,5); + } + if (p_type[i]=="Forge" || p_type[i]="Hive")){ + p_orks[i] = 5; + } + } + + } + + system_fleet=1; + capital=0; + frigate=0; + escort=0; + // Create Tau Fleet + if (owner == eFACTION.Tau){ + for (var i = 1; i <= planets; i++) { + if (p_type[i] == "Desert") { + system_fleet += 5; + } + } + + if (system_fleet>=4){ + capital=choose(1,2,2,2,3,4); + frigate=floor(random_range(5,10)); + escort=floor(random_range(8,14)); + } + if (system_fleet>=1) and (system_fleet<3){ + capital=choose(1,2,2); + frigate=floor(random_range(4,8)); + escort=floor(random_range(5,12)); + } + if (system_fleet>0){ + fleet=instance_create(x,y,obj_en_fleet); + fleet.owner = eFACTION.Tau; + // Create ships here + fleet.sprite_index=spr_fleet_tau; + fleet.image_speed=0; + + fleet.capital_number=capital; + fleet.frigate_number=frigate; + fleet.escort_number=escort; + + fleet.image_index=floor((capital)+(frigate/2)+(escort/4)); + } + + for (var i = 1; i <=planets; i++) { + if (p_type[i] != "Dead") { + p_tau[i] = choose(1,2,3,4); + } + } + for (var i = 1; i <=planets; i++) { + if (p_type[i] == "Desert" && p_tau[i] < 4) { + p_tau[i] = 4; + } + } + for (var i = 1; i <=planets; i++) { + if (p_tau[i] > 0) { + p_owner[i] = 8; + p_first[i] = 8; + + switch (p_type[i]) { + case "Forge": + case "Hive": + p_tau[i] = choose(2,3); + break; + case "Ice": + p_tau[i] = choose(1,2); + break; + case "Temperate": + case "Desert": + case "Feudal": + p_tau[i] = choose(3,3,4,4,5); + break; + } + } + } + for (var i=1;i<=planets;i++){ + p_owner[i]=eFACTION.Tau; + p_first[i]=eFACTION.Tau; + p_influence[i][eFACTION.Tau]=65+irandom(15); + } + } + // Create Nids + if (owner == eFACTION.Tyranids){ + for (var i = 1; i <= planets; i++) { + if (p_population[i] > 0) { + p_tyranids[i] = 1; + + switch (p_type[i]) { + case "Forge": + case "Hive": + p_tyranids[i] = choose(4,5,5); + break; + } + //array_push(p_feature[i], new PlanetFeature(P_features.Gene_Stealer_Cult)); + + } + p_owner[i] = eFACTION.Imperium; + } + } + + if (owner>20){ + for (var i = 1; i <= planets; i++) { + if (p_population[i] > 0) { + var new_cult = new PlanetFeature(P_features.Gene_Stealer_Cult); + array_push(p_feature[i], new_cult); + new_cult.cult_age = irandom(300) + p_influence[i][eFACTION.Tyranids] = new_cult.cult_age/10 + irandom(30); + p_tyranids[i] = min(3, floor(p_influence[i][eFACTION.Tyranids]/15)) + if (p_tyranids[i]!=0){ + new_cult.hiding =false; + } + } + p_owner[i] = 2; + } + owner = eFACTION.Tyranids; + } + + for(var i=1; i<=planets; i++){ + if (p_owner[i]=8) and (p_guardsmen[i]>0){ + p_pdf[i]+=p_guardsmen[i]; + p_guardsmen[i]=0; + } + if (p_type[i]="Shrine") and (p_owner[i]!=1) and (p_first[i]!=1){ + p_owner[i]=5; + p_first[i]=5; + p_sisters[i]=4; + adjust_influence(eFACTION.Ecclesiarchy, (p_sisters[i]*10)-irandom(5), i); + } + // if (p_owner[i]=3) or (p_owner[i]=5){p_feature[i]="Artifact|";}Testing ; 137 + } + + if (name=="Kim Jong") and (owner == eFACTION.Chaos){ + for (var i = 1; i <=planets; i++) { + if (p_type[i] != "Dead") { + p_heresy[i] = 100; + p_traitors[i] = 2; + } + } + } + + obj_controller.alarm[3]=1; + + var i=choose(0,1); + if (i==1) and (planets>0){ + var nostart=false,aa=0; + i=floor(random(planets))+1; + + if (instance_exists(obj_p_fleet)) { + aa = instance_nearest(x, y, obj_p_fleet); + if (point_distance(x, y, aa.x, aa.y) > 50) { + nostart = true; + } + } + if (!instance_exists(obj_p_fleet)) then nostart=true; + + if (array_length(p_feature[i])==0) and (p_owner[i]!=1) and (nostart){ + var ranb=0; + // if (ranb=1) and (p_owner[i]!=1) and (p_owner[i]!=2) and (p_owner[i]!=3) then ranb=floor(random(4))+2; + // + var goo=0; + if (goo==0){ + for(var j=0; j<10; j++){ + if (goo==0)and (irandom(9)<2){ + ranb=floor(random(6))+1; + + switch (name) { + case "Vulvis Major": + ranb = 1; + break; + case "Necron Assrape": + ranb = 2; + break; + case "Morrowynd": + ranb = 5; + break; + } + + if (goo==0){ + switch (ranb){ + case 1: + array_push(p_feature[i], new PlanetFeature(P_features.Sororitas_Cathedral)) + if (p_heresy[i]>10) then p_heresy[i]-=10; + p_sisters[i]=choose(2,2,3); + adjust_influence(eFACTION.Ecclesiarchy, (p_sisters[i]*10)-irandom(3), i) + goo=1; + break; + case 2: + if (p_type[i]!="Hive") and (p_type[i]!="Lava") and (goo==0){ + array_push(p_feature[i], new PlanetFeature(P_features.Necron_Tomb)) + goo=1; + } + break; + case 3: + array_push(p_feature[i], new PlanetFeature( P_features.Artifact)) + goo=1; + break; + case 4: + array_push(p_feature[i], new PlanetFeature( P_features.STC_Fragment)) + goo=1; + break; + case 5: + if (p_type[i]!="Ice") and (p_type[i]!="Dead") and (p_type[i]!="Feudal"){ + goo=1; + array_push(p_feature[i], new PlanetFeature( P_features.Ancient_Ruins)) + } + break; + //alternative spawn for necron tomb probably needs merging with other method + case 6: + if ((p_type[i]=="Ice") or (p_type[i]=="Dead")){ + array_push(p_feature[i], new PlanetFeature( P_features.Necron_Tomb)) + goo=1; + } + break; + case 7: + if ((p_type[i]=="Dead") or (p_type[i]=="Desert")){ + var randum=floor(random(100))+1; + if (randum<=25){ + array_push(p_feature[i], new PlanetFeature( P_features.Cave_Network)) + goo=1; + } + } + break; + } + } + } + } + } + } + } + + var hyu=0; + for(var i=1; i<=4; i++){ + if (p_tyranids[i]>=5){ + p_guardsmen[i]=0; + p_pdf[i]=0; + p_population[i]=0; + hyu+=1; + p_owner[i]=9; + } + if (p_first[i]<=5) and (dispo[i]>-5000){ + dispo[i]=-20; + } + } + if (hyu==0) and (owner == eFACTION.Tyranids) then owner = eFACTION.Imperium; + + scr_star_ownership(false); + + if (obj_controller.is_test_map=true){ + /*if (p_owner[1]=3) then p_feature[1]="STC Fragment|"; + if (p_owner[2]=3) then p_feature[2]="STC Fragment|"; + if (p_owner[3]=3) then p_feature[3]="STC Fragment|"; + + + // Testing new guardsmen + p_guardsmen[1]=5000000; + p_tyranids[1]=4; + + p_guardsmen[2]=500000; + p_tyranids[2]=3; + + p_guardsmen[3]=100000; + p_tyranids[3]=2; + + p_orks[1]=0;p_orks[2]=0;p_orks[3]=0;*/ + } + + // if (obj_controller.is_test_map=true) and (p_owner[2]=1){ + + if (p_owner[2]=1){ + /* + p_guardsmen[2]=10000000; + p_pdf[2]=0; + obj_controller.faction_status[eFACTION.Imperium]="War"; + */ + + // p_type[1]="Dead"; + // p_feature[2]=""; + + // p_orks[2]=3; + // p_feature[2]="Starship!0!|"; + + /*repeat(4){ + var fleet;fleet=instance_create(x+(floor(random_range(100,200))*choose(1,-1)),y+(floor(random_range(100,200))*choose(1,-1)),obj_en_fleet); + fleet.owner = eFACTION.Chaos;fleet.sprite_index=spr_fleet_chaos;fleet.orbiting=0; + fleet.action_x=x;fleet.action_y=y;fleet.alarm[4]=1; + + fleet.capital_number=0; + fleet.frigate_number=1; + fleet.escort_number=2; + + // Create ships here + fleet.image_speed=0; + var ii;ii=0;ii+=capital-1;ii+=round((frigate/2));ii+=round((escort/4)); + if (ii<=1) and (capital+frigate+escort>0) then ii=1; + fleet.image_index=ii; + }*/ + + } + + obj_controller.alarm[9]=2; + if (obj_controller.is_test_map!=true) and (p_owner[2]!=1){ + for(var i=1; i<=4; i++){p_guardsmen[i]=0;} + } + } } \ No newline at end of file diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 527eb486f5..26e237a1bc 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -43,7 +43,7 @@ function PlayerForge() constructor{ } // Function creates a new struct planet feature of a specified type -function NewPlanetFeature(feature_type, other_data={}) constructor{ +function PlanetFeature(feature_type, other_data={}) constructor{ f_type = feature_type; player_hidden=false; static reveal_to_player = function(){ @@ -181,6 +181,7 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ variable_struct_set(self, names[i], variable_struct_get(data, names[i])) } } + move_data_to_current_scope(other_data); } // returns an array of all the positions that a certain planet feature occurs on th p_feature array of a planet @@ -393,7 +394,7 @@ function create_starship_event(){ return false; }else { var planet=irandom(star.planets-1)+1; - array_push(star.p_feature[planet], new NewPlanetFeature(P_features.Starship)) + array_push(star.p_feature[planet], new PlanetFeature(P_features.Starship)) scr_event_log("","Ancient Starship discovered on "+string(star.name)+" "+scr_roman(planet)+".", star.name); } } diff --git a/scripts/scr_random_event/scr_random_event.gml b/scripts/scr_random_event/scr_random_event.gml index 8984b8d188..79cbc2ad29 100644 --- a/scripts/scr_random_event/scr_random_event.gml +++ b/scripts/scr_random_event/scr_random_event.gml @@ -589,7 +589,7 @@ function scr_random_event(execute_now) { } } - array_push(star.p_feature[planet], new NewPlanetFeature(P_features.Succession_War)); + array_push(star.p_feature[planet], new PlanetFeature(P_features.Succession_War)); add_new_problem(planet, "succession",irandom(6) + 4, star); star.dispo[planet] = -5000; diff --git a/scripts/scr_system_spawn/scr_system_spawn.gml b/scripts/scr_system_spawn/scr_system_spawn.gml index 16bc8d317d..d8b39af55d 100644 --- a/scripts/scr_system_spawn/scr_system_spawn.gml +++ b/scripts/scr_system_spawn/scr_system_spawn.gml @@ -353,39 +353,7 @@ if (did){ instance_activate_object(obj_star); } // Chaos - repeat(2+irandom(4)){ - xx=floor(random(1152))+64; - yy=floor(random(748))+64; - _current_system=instance_nearest(xx,yy,obj_star); - with (_current_system){ - if (planets>0) and (owner == eFACTION.Imperium){ - planet[1]=1; - p_owner[1]=10; - owner = eFACTION.Chaos; - } - } - instance_deactivate_object(_current_system); - } - // More sneaky this way; you have to be noted of rising heresy or something, or have a ship in the system - var hell_holes = ["Badab", "Hellsiris","Vraks","Isstvan","Stygies","Stygia","Nostromo","Jhanna","Gangrenous Rot"]; - with(obj_star){ - if (array_contains(hell_holes, name)){ - rando=choose(1,1); // make 1's 0's if you want less chaos - if (rando==1){ - - owner = eFACTION.Chaos; - p_owner = array_create(5, owner); - for (var i=1;i<=planets;i++){ - p_heresy[i]=floor(random_range(75,100)); - if (p_type[i]=="Dead") then p_type[i]=choose("Hive","Temperate","Desert","Ice"); - - if (p_type[i]!="Dead") then p_traitors[i]=6; - // give them big defences - if (p_type[i]!="Dead") then p_fortified[i]=choose(4,5,5,4,4,3,6); - } - } - } - } + spawn_chaos_stars(); // Ork planets here @@ -464,13 +432,20 @@ if (did){ } // Another mechanicus - repeat(choose(3,4,5)){ + var _system_forge = choose(3,4,5); + system_setup_data.forges = _system_forge+1; + repeat(_system_forge){ xx=floor(random(1152+640))+64; yy=floor(random(748+480))+64; _current_system=instance_nearest(xx,yy,obj_star); if (_current_system.planets>0) and (_current_system.owner == eFACTION.Imperium){ var _forge_planet = irandom(_current_system.planets-1)+1; - setup_forge_world(_current_system, _forge_planet); + if (system_setup_data.large_docks == 0){ + var _dock_size = 3; + } else { + _dock_size = choose(2,3); + } + setup_forge_world(_current_system, _forge_planet, choose(2,3)); } instance_deactivate_object(_current_system); } @@ -486,7 +461,7 @@ if (did==0){ wait_and_execute(5, scr_system_spawn, [], self); } else { map_dock_qouta = irandom_range(10, 20); - obj_star.alarm[1]=1; + wait_and_execute(1, setup_star_planet_defualts, [], self); } // Eldar craftworld here @@ -509,7 +484,7 @@ for(var i=0; i<100; i++){ var craft=instance_create(xx,yy,obj_star); craft.craftworld=1; go=999; - array_push(craft.p_feature[1],new NewPlanetFeature(P_features.Warlord6)); + array_push(craft.p_feature[1],new PlanetFeature(P_features.Warlord6)); var elforce=instance_create(xx,yy,obj_en_fleet); elforce.sprite_index=spr_fleet_eldar; diff --git a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml index 6662682288..091590fde5 100644 --- a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml +++ b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml @@ -66,7 +66,7 @@ function player_home_star(home_planet){ } name=obj_ini.home_name; } - array_push(p_feature[home_planet], new NewPlanetFeature(P_features.Monastery)); + array_push(p_feature[home_planet], new PlanetFeature(P_features.Monastery)); p_owner[home_planet]=eFACTION.Player; p_first[home_planet]=1; //monestary @@ -122,7 +122,7 @@ function set_player_recruit_planet(recruit_planet){ name=obj_ini.home_name; } } - array_push(p_feature[recruit_planet], new NewPlanetFeature(P_features.Recruiting_World));//recruiting world + array_push(p_feature[recruit_planet], new PlanetFeature(P_features.Recruiting_World));//recruiting world if (p_type[recruit_planet]=="random") then p_type[recruit_planet]=choose("Death","Temperate","Desert","Ice","Hive", "Fuedal"); if (global.chapter_name!="Lamenters") then obj_controller.recruiting_worlds+=string(name)+" II|"; } @@ -149,7 +149,7 @@ function set_player_homeworld_star(chosen_star){ var _recruit_star = array_random_element(_possible_planets) set_player_recruit_planet(_recruit_star); } else if (obj_ini.recruit_relative_loc==0){ - array_push(p_feature[_home_star], new NewPlanetFeature(P_features.Recruiting_World));//recruiting world + array_push(p_feature[_home_star], new PlanetFeature(P_features.Recruiting_World));//recruiting world for (var i=1;i<=planets;i++){ if (i!=_home_star){ p_type[i] = array_random_element(_planet_types); @@ -175,3 +175,42 @@ function create_recruit_system(star){ } + +function spawn_chaos_stars(){ + // Chaos + var _chaos_stars = 2+irandom(4); + repeat(_chaos_stars){ + xx=floor(random(1152))+64; + yy=floor(random(748))+64; + _current_system=instance_nearest(xx,yy,obj_star); + with (_current_system){ + var _planet = irandom_range(1, planets); + if (planets>0) and (owner == eFACTION.Imperium){ + var _planet = irandom_range(1, planets); + setup_chaos_world(_current_system,planets); + } + } + instance_deactivate_object(_current_system); + } + // More sneaky this way; you have to be noted of rising heresy or something, or have a ship in the system + var hell_holes = ["Badab", "Hellsiris","Vraks","Isstvan","Stygies","Stygia","Nostromo","Jhanna","Gangrenous Rot"]; + with(obj_star){ + if (array_contains(hell_holes, name)){ + rando=choose(1,1); // make 1's 0's if you want less chaos + if (rando==1){ + + owner = eFACTION.Chaos; + p_owner = array_create(5, owner); + for (var i=1;i<=planets;i++){ + p_heresy[i]=floor(random_range(75,100)); + if (p_type[i]=="Dead") then p_type[i]=choose("Hive","Temperate","Desert","Ice"); + + if (p_type[i]!="Dead") then p_traitors[i]=6; + // give them big defences + if (p_type[i]!="Dead") then p_fortified[i]=choose(4,5,5,4,4,3,6); + } + } + } + } +} + diff --git a/scripts/scr_turn_first/scr_turn_first.gml b/scripts/scr_turn_first/scr_turn_first.gml index 13cffb8fb2..c02b0ae1d1 100644 --- a/scripts/scr_turn_first/scr_turn_first.gml +++ b/scripts/scr_turn_first/scr_turn_first.gml @@ -119,7 +119,7 @@ function scr_turn_first() { nfleet.action_y=tplan.y; if (fnum=1){ starf=tplan; - nfleet.cargo_data.ork_warboss=new NewPlanetFeature(OrkWarboss); + nfleet.cargo_data.ork_warboss=new PlanetFeature(OrkWarboss); } with (nfleet){ frigate_number=10; diff --git a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml index 92402089aa..dda09b8864 100644 --- a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml +++ b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml @@ -23,11 +23,11 @@ function tyranids_planet_biomass_extraction(){ } if (planet_feature_bool(p_feature[planet], P_features.CapillaryTowers)==1) and (p_type[planet]!="Dead"){ p_feature[planet]=[]; - array_push(p_feature[planet], new NewPlanetFeature(P_features.Reclamationpools)); + array_push(p_feature[planet], new PlanetFeature(P_features.Reclamationpools)); p_population[planet]=0;// show_message("C"); } if (planet_feature_bool(p_feature[planet], P_features.CapillaryTowers)==0) and (planet_feature_bool(p_feature[planet], P_features.Reclamationpools)==0) and (p_type[planet]!="Dead"){ - array_push(p_feature[planet], new NewPlanetFeature(P_features.CapillaryTowers));// show_message("B"); + array_push(p_feature[planet], new PlanetFeature(P_features.CapillaryTowers));// show_message("B"); } } @@ -37,7 +37,7 @@ function tyranids_planet_biomass_extraction(){ function deploy_reclamation_pools(planet){ if (p_pdf[planet] <= 0){ - new NewPlanetFeature(P_features.Reclamationpools); + new PlanetFeature(P_features.Reclamationpools); array_push(p_feature[planet], ) } } @@ -109,7 +109,7 @@ function genestealer_cult_end_turn_growth(planet){ } else if (p_influence[planet][eFACTION.Tyranids] > 5) { adjust_influence(eFACTION.Tyranids, -1, planet); if ((irandom(200) + (p_influence[planet][eFACTION.Tyranids] / 10)) > 195) { - array_push(p_feature[planet], new NewPlanetFeature(P_features.Gene_Stealer_Cult)); + array_push(p_feature[planet], new PlanetFeature(P_features.Gene_Stealer_Cult)); } } } \ No newline at end of file diff --git a/scripts/scr_ui_popup/scr_ui_popup.gml b/scripts/scr_ui_popup/scr_ui_popup.gml index d1dcecbae3..cd4dd2c763 100644 --- a/scripts/scr_ui_popup/scr_ui_popup.gml +++ b/scripts/scr_ui_popup/scr_ui_popup.gml @@ -62,7 +62,7 @@ function scr_ui_popup() { if (scr_click_left()) { var base_options = {style: style.tag}; obj_temp_build.isnew = 0; - array_push(planet_upgrades, new NewPlanetFeature(P_features.Secret_Base, base_options)); + array_push(planet_upgrades, new PlanetFeature(P_features.Secret_Base, base_options)); } } @@ -316,7 +316,7 @@ function scr_ui_popup() { draw_set_alpha(1); if (scr_click_left()) and (obj_controller.requisition>=1500){ - array_push(planet_upgrades, new NewPlanetFeature(P_features.Arsenal)); + array_push(planet_upgrades, new PlanetFeature(P_features.Arsenal)); obj_controller.requisition-=1500; } }draw_set_halign(fa_left); @@ -334,7 +334,7 @@ function scr_ui_popup() { draw_set_alpha(0.2);draw_rectangle(xx+300,yy+175,xx+400,yy+195,0);draw_set_alpha(1); if (scr_click_left()) and (obj_controller.requisition>=4000){ - array_push(planet_upgrades, new NewPlanetFeature(P_features.Gene_Vault)); + array_push(planet_upgrades, new PlanetFeature(P_features.Gene_Vault)); obj_controller.requisition-=4000; } }draw_set_halign(fa_left); From 61ecc199918fcad1ccd4565cb81ea19d98768006 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 20 May 2025 00:23:30 +0100 Subject: [PATCH 063/155] add spawning of ShipDocks --- .../scr_planet_setup_functions.gml | 35 +++++++++++++++++-- scripts/scr_system_spawn/scr_system_spawn.gml | 2 +- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml index 9ca4824e9d..d19c056711 100644 --- a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -31,7 +31,7 @@ function setup_forge_world(star, planet, dock = 0){ if (_size == 3){ system_setup_data.large_docks++; } - array_push(P_features[], new PlanetFeature(P_features.ShipDock, {size : _size})); + array_push(P_features[planet], new PlanetFeature(P_features.ShipDock, {size : _size})); } } @@ -55,8 +55,10 @@ function setup_star_planet_defualts(){ // If getting to max pop is very rare, it will be awful to recruit from // some planets may be better or worse than others depending on their max pop. // TODO refactor and improve logic + var _sys_data = obj_controller.system_setup_data with(obj_star){ - for(var i=1; i<=4; i++){ + for(var i=1; i<=planets; i++){ + p_population[i]=0;// 10B switch (p_type[i]) { case "Lava": @@ -126,6 +128,35 @@ function setup_star_planet_defualts(){ p_station = 6; p_max_population[i] = p_population[i]; break; + } + if (system_setup_data.map_dock_qouta){ + switch (p_type[i]) { + case "Temperate": + case "Shrine": + if (!irandom(3)){ + array_push(P_features[i], new PlanetFeature(P_features.ShipDock, {size : choose(1,2)})); + system_setup_data.map_dock_qouta--; + } + break; + case "Hive": + if (irandom(1)){ + array_push(P_features[i], new PlanetFeature(P_features.ShipDock, {size : 2})); + system_setup_data.map_dock_qouta--; + } + break; + case "Feudal": + case "Desert" : + if (!irandom(5)){ + array_push(P_features[i], new PlanetFeature(P_features.ShipDock, {size : 1})); + system_setup_data.map_dock_qouta--; + } + case "Agri": + case "Lava": + if (!irandom(1)){ + array_push(P_features[i], new PlanetFeature(P_features.ShipDock, {size : 1})); + system_setup_data.map_dock_qouta--; + } + } } // Sets military on planet if (p_population[i]>=10000000){ diff --git a/scripts/scr_system_spawn/scr_system_spawn.gml b/scripts/scr_system_spawn/scr_system_spawn.gml index d8b39af55d..4e75a4533e 100644 --- a/scripts/scr_system_spawn/scr_system_spawn.gml +++ b/scripts/scr_system_spawn/scr_system_spawn.gml @@ -460,7 +460,7 @@ instance_activate_object(obj_star); if (did==0){ wait_and_execute(5, scr_system_spawn, [], self); } else { - map_dock_qouta = irandom_range(10, 20); + system_setup_data.map_dock_qouta = irandom_range(10, 20); wait_and_execute(1, setup_star_planet_defualts, [], self); } From e4c7282196c7c11fad19018df42b05b2c5a572fa Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 20 May 2025 12:38:05 +0100 Subject: [PATCH 064/155] flesh out shield structs --- ChapterMaster.yyp | 11 +++---- objects/obj_p_ship/Draw_0.gml | 1 + .../scr_player_fleet_combat_functions.gml | 28 ++++++++++++++++++ .../a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png | Bin 0 -> 688 bytes .../7e9c9e28-a54e-4389-8a37-9735f9adc44f.png | Bin 0 -> 688 bytes .../spr_ship_shields.yy} | 10 +++---- .../a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png | Bin 10308 -> 0 bytes .../7e9c9e28-a54e-4389-8a37-9735f9adc44f.png | Bin 10308 -> 0 bytes 8 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 sprites/spr_ship_shields/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png create mode 100644 sprites/spr_ship_shields/layers/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890/7e9c9e28-a54e-4389-8a37-9735f9adc44f.png rename sprites/{spr_ship_weapon_macro_cannon/spr_ship_weapon_macro_cannon.yy => spr_ship_shields/spr_ship_shields.yy} (89%) delete mode 100644 sprites/spr_ship_weapon_macro_cannon/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png delete mode 100644 sprites/spr_ship_weapon_macro_cannon/layers/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890/7e9c9e28-a54e-4389-8a37-9735f9adc44f.png diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 398f81efba..159a645387 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -131,9 +131,8 @@ {"$GMIncludedFile":"","%Name":"blood_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"blood_ravens.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_ravens.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"carcharodons.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"carcharodons.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"consecrators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"consecrators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"celestial_lions.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"celestial_lions.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"consecrators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"consecrators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"conservators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"conservators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"crimson_fists.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"crimson_fists.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"dark_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"dark_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -521,11 +520,9 @@ {"$GMIncludedFile":"","%Name":"32.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"32.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"33.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"33.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"34.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"34.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - - {"$GMIncludedFile":"","%Name":"37.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"37.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - - {"$GMIncludedFile":"","%Name":"36.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"36.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"35.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"35.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"36.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"36.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"37.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"37.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"4.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"4.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"5.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"5.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"6.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"6.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -1522,6 +1519,7 @@ {"id":{"name":"spr_ship_razorfiend","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},}, {"id":{"name":"spr_ship_reaper","path":"sprites/spr_ship_reaper/spr_ship_reaper.yy",},}, {"id":{"name":"spr_ship_shadow","path":"sprites/spr_ship_shadow/spr_ship_shadow.yy",},}, + {"id":{"name":"spr_ship_shields","path":"sprites/spr_ship_shields/spr_ship_shields.yy",},}, {"id":{"name":"spr_ship_shroud","path":"sprites/spr_ship_shroud/spr_ship_shroud.yy",},}, {"id":{"name":"spr_ship_slam","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},}, {"id":{"name":"spr_ship_song","path":"sprites/spr_ship_song/spr_ship_song.yy",},}, @@ -1532,7 +1530,6 @@ {"id":{"name":"spr_ship_veng","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},}, {"id":{"name":"spr_ship_void","path":"sprites/spr_ship_void/spr_ship_void.yy",},}, {"id":{"name":"spr_ship_warden","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},}, - {"id":{"name":"spr_ship_weapon_macro_cannon","path":"sprites/spr_ship_weapon_macro_cannon/spr_ship_weapon_macro_cannon.yy",},}, {"id":{"name":"spr_shutter_button","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},}, {"id":{"name":"spr_sister_hospitaler","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},}, {"id":{"name":"spr_sister_of_battle","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},}, diff --git a/objects/obj_p_ship/Draw_0.gml b/objects/obj_p_ship/Draw_0.gml index 24a9c0885b..8e78a07727 100644 --- a/objects/obj_p_ship/Draw_0.gml +++ b/objects/obj_p_ship/Draw_0.gml @@ -4,6 +4,7 @@ if !__b__ { { +shields.draw(); if (selected=1){ draw_set_color(38144); draw_circle(x,y,(sprite_width/2),1); diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 55bde1ec2e..5b1779409c 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -121,13 +121,40 @@ function player_fleet_ship_spawner(){ }// End repeat } +function draw_ellipse_rotated(){ + +} //data must have keys, shields, recharge, and reboot function ShipShieldGenerator(data){ move_data_to_current_scope(data); destroyed = false; disabled = false; + disabled_timer = 0; + static draw = function(){ + if (shields > 0 && !destroyed && !disabled){ + draw_sprite_ext(spr_ship_shields, 0, ship.x, ship.y, 1, 1, ship.direction, c_white, 1); + } + } + static step = function(){ + if (destroyed){ + exit; + } + if (disabled){ + disabled_timer++; + if (disabled_timer >= shields_reboot_time){ + disabled_timer = 0; + disabled = false; + } else { + exit; + } + } + if (!disabled){ + if (shieldsc~^K6&11?=gICKYB}JpbJMx81$<8^2ul z@x3n2CI2M9aq-NidrLKDS@D0VxuD8sXK62`;STfq!VAf=%9=7Af6nzc-#>hy z{T92DO#7L0-xv*kJiKPXa_Gc%W+o5aYKcs9FNUB^Efdq6vsqXa^7)h#*sTuwDEl=W|t0$}`q(>-TTiz_1R2yMkb@lG8i;5AU`#N6no#_5Q z`-IooMz@FaGxB~iKl!;Zd&Z2#qQD4LEpd$~Nl7e8wMs5Z1yT$~21cg32Bx}(mLW#Q zR;EB?plx7aWni#2Eh893LvDUbW?Cg~4R@?Bya#H~fZI@#nVVW%l9*e7TTi#%M_@8z OVDNPHb6Mw<&;$TTISQlz literal 0 HcmV?d00001 diff --git a/sprites/spr_ship_shields/layers/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890/7e9c9e28-a54e-4389-8a37-9735f9adc44f.png b/sprites/spr_ship_shields/layers/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890/7e9c9e28-a54e-4389-8a37-9735f9adc44f.png new file mode 100644 index 0000000000000000000000000000000000000000..7e5ad3594bbffe387e21f818f5514d42fda489a2 GIT binary patch literal 688 zcmeAS@N?(olHy`uVBq!ia0vp^%|L9-!3HF^gzpvxQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^c~^K6&11?=gICKYB}JpbJMx81$<8^2ul z@x3n2CI2M9aq-NidrLKDS@D0VxuD8sXK62`;STfq!VAf=%9=7Af6nzc-#>hy z{T92DO#7L0-xv*kJiKPXa_Gc%W+o5aYKcs9FNUB^Efdq6vsqXa^7)h#*sTuwDEl=W|t0$}`q(>-TTiz_1R2yMkb@lG8i;5AU`#N6no#_5Q z`-IooMz@FaGxB~iKl!;Zd&Z2#qQD4LEpd$~Nl7e8wMs5Z1yT$~21cg32Bx}(mLW#Q zR;EB?plx7aWni#2Eh893LvDUbW?Cg~4R@?Bya#H~fZI@#nVVW%l9*e7TTi#%M_@8z OVDNPHb6Mw<&;$TTISQlz literal 0 HcmV?d00001 diff --git a/sprites/spr_ship_weapon_macro_cannon/spr_ship_weapon_macro_cannon.yy b/sprites/spr_ship_shields/spr_ship_shields.yy similarity index 89% rename from sprites/spr_ship_weapon_macro_cannon/spr_ship_weapon_macro_cannon.yy rename to sprites/spr_ship_shields/spr_ship_shields.yy index 08fd6317a8..e317a0f306 100644 --- a/sprites/spr_ship_weapon_macro_cannon/spr_ship_weapon_macro_cannon.yy +++ b/sprites/spr_ship_shields/spr_ship_shields.yy @@ -1,6 +1,6 @@ { "$GMSprite":"", - "%Name":"spr_ship_weapon_macro_cannon", + "%Name":"spr_ship_shields", "bboxMode":0, "bbox_bottom":50, "bbox_left":0, @@ -21,7 +21,7 @@ "layers":[ {"$GMImageLayer":"","%Name":"7e9c9e28-a54e-4389-8a37-9735f9adc44f","blendMode":0,"displayName":"default","isLocked":false,"name":"7e9c9e28-a54e-4389-8a37-9735f9adc44f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_ship_weapon_macro_cannon", + "name":"spr_ship_shields", "nineSlice":null, "origin":4, "parent":{ @@ -33,7 +33,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_ship_weapon_macro_cannon", + "%Name":"spr_ship_shields", "autoRecord":true, "backdropHeight":1080, "backdropImageOpacity":0.5, @@ -57,7 +57,7 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_ship_weapon_macro_cannon", + "name":"spr_ship_shields", "playback":1, "playbackSpeed":1.0, "playbackSpeedType":1, @@ -71,7 +71,7 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_weapon_macro_cannon/spr_ship_weapon_macro_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_shields/spr_ship_shields.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], diff --git a/sprites/spr_ship_weapon_macro_cannon/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png b/sprites/spr_ship_weapon_macro_cannon/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890.png deleted file mode 100644 index bfd09c1a759e45a368fd7fafcfcc0572b24ed5c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10308 zcmZ{qWl$VExVC}f?(R^exGgTbxa*6%!{RK^;#%CHxI=+b+}(;7DZ043OMykdet*u) z`Ee$b+%w7C$;^|?By;77)=-njLMKOugM-6TRFKj7r(yppA1d;{wn?v(;GfW1DQKy} z!TB=5!3BrI!9D%!3O<5^^WuhsJ28iY6Ul^wBXP^^&=mVOfNZHOF9Y}f|4U(ac`6(n zv!J33Q0Mc?dAC7R?vmHxgXp2Z^rYA66v4rDC@mU#sX}bm{MI+h)dtao)TRZCuSDfs zdek?WQ_}f2Nu~w{2JRx!yGRf&A5qKshKx0}(zcJSl_6a_V!^bi#=raWMzVWHV?~SVD3#G3=2z}B6 z3X!R-eKZ!2rSK7Yxsx=%elbh__C3jk_;_EcU7u>(>s$N%;k(A#<>iec$zhsnP0eaDlV|Gank znt-JIo=B_2@7m*iuxvZR4xs?wKKK<&qIsD0B~b~B3BDZ%xs8tzU*8gCFPYKhjA@LO z<*rqu?ot(7hcULK@qYVg12r_--?jky*nOz}%h5~`*PxL!ss#@R2C_zLQdb%Al@B<( zKV_J=iMDf@yEPCg`B4uUhG8$xI4Ecsl|F4$u@}^b17d;naCzbUx}2WJ>wLK!zl1KH zJ3|U<{VNHT6n`SoJzXM&E}ROgEuF4TZ(J(Am5v6$ORsI1pO;C}UpSSd(H`^LPq1f_ zj*n=%AX|yUL24ts7H8VnYuP7r`28gu8KTVw6~^kXy{+ z=0LasAGJ3k+{9+5uosoSWh_>jbVZ4JU^*#0KVdZKZa%dl+&)b|PrQdtn5f&@y1nN@ zc;N`YQ;YoPzcsPffJ8|*^Mhs`Y<2CU3tJlsiU8iO2NYQCKVjU)V{E?7^yE@W_>NQL zXL;U8m-Z8DDU@bNKalIE(!Yq6@<0)}A+4OL6cTcE?gve~BtWH|#g(q;u)_=Qm)@wI z!x+BhovokU`>S`axjnj+Wly~X`0|P_@4L=yju6nWcGHO{MxOVr-45brx{ccngJ-A2 z`)2Mq=J^Nquylk#PIXph)_ul^p9t`iHGMs+`}J)JJlPdHS1Tb5jdq;=&(aU4=f?g3 zpR)w|)%FIIL>Y6GvN*OVyFN) zm|rsu7sU%Z9-Z@dkn`KwDVG>?IITTDu}Jlz`1G_%2;I3;!N%uXb+u1ik&s5d$@PNl zzYSz!TBWMMP}!s;3)&FzcDyu2p;Z+FldhJlWWi=+74+d9qTws_5?aI`LSIGw>)uzm zcGAl=V01Tpy&>A9{yblHtJF`g>>BX{O?PZ#r~P+D^`fnlbu#euDL=aFY;qgX@es!) zp~5Sn4|MdA#y6V)TK)8&-(HJ_WJwcOR#e7{ z-$k@~(28$Yg3I2oDqH~0))nABl=RJFH4o%*id!2d8Mb~f4-`{Y= zUM=kcLW)XyzeayhIYqWyN`35%6>t&g zh`ukC>VImenzw%6;PGzpA)YGei6iQ*6h;b+tKXpz47pp^(wD^vvDHqyO7hCuywWDJ5?4-a%`H% zEXpn0!wYQlBqDeq%~=ckhJAd&yetTKwfyV%{&@FvGNdk}0IgUmC^Kaa`n-nD-wr|( z@+? z95xb?qf@r9B+2Vpr!>Ph|U%xdvx zlGpX-Eb266ysv#Dn|4o+mC54rhnp`4G%xy#9#2PhYWs4D{*0t?33x8lc&$(EY5cN2 zKN$M~!}`VgC4)>%XSmMBrT2q#go#09KIRW7P+e}#-~@z$C*Hg^<-0`+Xj5$YR{x;% z-N`}$4(WIpLu306+>rm*kU03`wJGdma$sYIrI_Lu?#L1nMWY=1@(2Oe_$I|3UeHiY zv2p*npJbmpQXq3|ifYFyMw&H|6+-yrnnxk~(H?d`W3Y_TU1EP|#@OUuOxg1A{jdX^ z-VfnQN@Lg?3U7Wk88vymKWDm>vo2c26bii^O{^8@lo-Kf}VqG6jF4 zbisz5h8D_>8TTz}C%l@1OWg1Lx85b3YrRJPdh_KKpCk!4#4tXBO|V7_Ow8hoKdmXG zwN=scL!{oeld7T1Q2zU=|H)^(j~t?+@KpzN-__oj3^s@A#T{K=wY}BbFb}ki?MSp7 zh4__b;y=SekAuL+A*%fwQ{qyD;9{Miy~idmJLhX?W$t~x;_ihf0#6mMtXB1PLz!^6 zR9pLUcR`-t!FXrw^z#_Sv_l?!DF}R}T;dtvc{ZsgakpbSM)F!=A=OtP>8X6F?8X&D~VI7{nzAwGFqU_ z@SQ&HqbSqN6rEZgeKJ~mKvXy7_%uWKujwbD1kVYfJ5R2aj8V13?PG>=L!+h3;35+K zL#_h9-Td6s0&>i5HNUqqlFjeDV&Rt^sC0d$r4FGy#8#M^Dfs1I3FIGmo`3O-lYM?( zr+AsmFn4E@W0}-h<`n@96C~1DJ|w9R!^@MVFxr%F>@>4wC~9GW=)-^M$EJMyyel5c zuP#{eFGi)i$z;O6er==JB}&4EmLoEH<9EN!&=2-ZzuA=|%MZ8RPbsG{N7@NJ475VuuTqUWdHMae8hZtm{i5S@1QoO=rQa`t0zN7D z>u$X1iHSTTaT<4t_+4#p76e@WCBenkXJeW2ht2QJqi)R5ZM??5U;n!y0G9{DX!}C( zlNf0@)aA{v4@`;Ts^?FqI)gyoB{9D7tuyWxSwJOh!Sdk&%s7r{a0K zq&Stc*;AItj1SgVv)3JMK*sgsHqK_?Q$GPtou6+u2oQEC{5c^^1K;YYs+|aenk@iv zBBjY<%D5gqpg^T>;(_uPEvqD*bL!~{RxA-I{VhoS#X9L7DOau3?Hrv4?=)LRGOy_O z-^uEsBD%0;YSzSIq-Ky_i>=OJfvZbXSl`n9Ntt4c%plyF=?@-Lc021It-e#ig>T9c6=n!s5*K8=OZ*TKHHz+dBRYCj7bgqL(I==gS>} zH?T$O;-2~YPp@>_9h0IJTDe$+U_(YzJJ8KJaN7N8FVO?pk>_N5~>r+!pxP?;r3SxVNrh$`B>?8%eLv6&A+N|T>x?#FM!MkCp@*N*@clhb!fh-Ux zZ4H-2F&tdpS0{jWiW=2wtQ%!SEoR=q)H51a$#Ih-qF`+*BOVBKmhpRsM?{+@GY+Go zjMeR@;+Y|YJnszt1X?Kau_Xi@Rb{PT+;SeUs9bOaX0$liw^)y(K9P4 zjIFQm@F2@LS;23|CU4Z4gzFo{Cf(6S%d%}>Ea=*9mVy|@nmduDCv7!cl7$r8{cXaA z_OV|4L+Gix6?D}C> zyM$h%q8p&lA!$0HSq)kX4k0Khp_7Fyplv?iYX7S2o7a;XiQ4`U72*I1Bwep&SgAq< zCu>>EJtm;kVA(sn-wc+nix7vU;eUj;!UYvllEl)T>n5uaL(qc-Sg#im6mYEA-3d#= zoWsY9W|QKV%!VCNEVRORLoOnh7ty86RYTzo2i13#6l=ZV@lehrAZh8gGJby1LTABN z{rYuZh5p3Ft8)iD;+8NFm7X-Ftb3tImR2~;r&=p)SZYcN5v_K zl9V9NHGibT5Z>oSq;;na5NTGR!xj03gY?BL)JP6Hj@BpdY^n1vdFH_<0D9k~WhcCO zovxLv85x`=AwvhA1C+_x6_|~WXp)4mO~S31=+cVeLcM?RrxleNu1GBE13N21?4g~z zG0Ewn`>Pnr5|?|x5zD}srB_rMezmJ`ZvelAY7CkYW&&0{_`!X{?_4$)^pz1?U+h_2 zZWy`J#f-tR_Rnft@NxB=zL^XW(-EZes1C^bfdZ^t3JdUTA6qjT0wJ@0R7{zvbmkTo z0OHC#!tiTW6Jz3dNUhMqL~;Z-#a~nJ{FlC2fXjz5Ze2s&9elK90&&t!8X>g-v9U{4 z75(a(m4ur8tF)BJ3BQZ|M6D;#P6ca{B(GL6t9w-(+%i|P1P$_oE~Ks7nu(JN#jL$a z1#W0{_uY0xgvqqials+$ZNcmb>u-elyD5BL9l$7T28B*Y3uj6FUEIF_X{!5HoPS&c z!Dm6DM7*YYVbZxTv{`L2rz1xf*e2k5t&oJegMf*dAdaWtNn*SNd0BGr^cc#c8aHEE zCxt<|T2)c(Iv`G%OmV+`DO?Kqq$3GXVZ^uVby4)QMMhCFdwR^o)a+?fSmvmBpD*9g ztz49xPp(p7x;k!!hNOg&b-`MpHx>ncwwT|h3=!&a?KunM$OYWmW3F4>DcD* zM^`KuLdc!3<^mDTIqKKtA_dlz@GJ;Y%n4GxlR#Ux$Yf-qAl6OwnWK69;p`@o9pyyR zz|e#nmQoJt3zHqq)-iwmBF$W;Q%1_C`BWjTVg?K?Ei$*tg;ms#_5wzjhcRu!8Tl=H z3wF!)5HfPMI=hCx6}gT$Q%3W~jjT0z-9r zYn#k@ih&;pFw^+*hHoR(lKrLLkG+PcKR?m|nSY@XgpUU|%Pde7iZw|4IhX~6Fm$3A zIM=xE@D*5%W*t<@qoX=}v3xIKcVT>)5HwNo&a^(qnpGp1ChxF_OG+{R5@lkA!d(sS zx;@Al4e6Fy#}+wvzwY*Ia_JfvU+_d_j`Vm+j$HgUwPIA>z4I&g&@S0$cDpd1&dHhM zNGKDNYS@kk&Cr<}ah#m}wrR}c|0rGbZ5O`v1XX0$k_Ot!H=Dmb(?#3zxrm25c|2Y=< ze!!hCUQ2yUzhx>l{kaxr#!NdVY;17LcyHD>QpGAniS;7#5Hy1=mU{xQfWfu5jn&qO zP3K==Z?aqtXDb?W4gR)D)aqU-v**;NuK3&RYu>e~bOYV(^8QnHdT|J4_y-D106rqd z{$K1}>XP=47}Pb$M&Xl4hgQ_aMK@uak2`ZEk7PLICPsG8PokuRins)Z%9-JiA4_B5 zND87t3BSlO1Oyg%6HT&Qe{Bg;7SL^uD*2NJsyQUgXXpUO$!h_{ndw%(wjPvrDl_na|bXICdg?H z8Hc)M8GDCn(XBGih104c$;s=3-JHia4v?S2u&e_q!Tjcx04qRCwn~D-a6^N-xPHVU zG8jo|gp_O!%c5{kNBme*6D1V=dbmr0XJ_;rUFlQfa#l^x~mP_ zG%8)vz3Uz!Ns+lhOS>#BxVpv0nbF(-s zaxVEKa>?^c&4QBIj7hKs=ls#1O|P%=ydl3(@-Hbyo!WtR^QOV!GdVNhHe&hZe6aOETu4J zN~I`fwX5?5`;wIejJZDfP*Kj4VfJ<+f3p{KCD}dmK&C?ZJIBZmx$i_?n7Bsr7Hsxd z-M+LT6nS`XRElP5L*o*d=5~m%&OKC3DOJWZj;5)#g+qlxFy|z1pH-=(}Ctd8oU z1$c}Er+4?5GJUsDt0?|MmmWk^wtJj_34{~=nzRWW{ir)q=uV(#Ffh(YwY}x+b$ox) z^aK3U)dW#bIrc8pO z0N!zi5uBU*OxyiEvF)es^DaY()|Sw`N1kZ z%+ZBjRmR~7Z>2e>ZSYxvyeh3xLV9-&Q8UzwFVj0c#3Zp$w91-E`KT_UwsQ};Tya2x zYlgWP5hSe88{FI>sj^VMb*k(By=5?Xri%iY`;eS3^=sWom@xY42DkYcNeU2l6B+fh zuLS`0+z}EK^gO%spbXfe<21=GEU_9NBiEIxZA>r=z#92`5Kgm$Pp zdp6>w0QZML*z~+zK(B_tfsG5vC z4Y-PuCjKO>%7D4Jb;gQc*hOV>RhB^=tK*{H&++;TY+oJ&qgSTnwkPT+D`acfGx zwJy@fA<~U0hNNMeM>h|B{&1 zMVA)2+a?5Jpd{Ho;P$3CwoPis=XINL4-Nwio}SxP34U(rYA5uSq5<(e ztgHp)Z0ZcdbUxR_9xDCg;HeVItfi5kRD=0sz`J7kZf(97Vv6O;Q=e*bVG@>CtY7c* zWSm}tx3A&JV=vwIMhOD}7~V1b3ujI)?yz*%Gj`L@=kgUtrOWSR0yUfQN|#iaaOde@ zeiH5Mc&29@6>b4T`qKwK2r-bZKvszJ{8hVj*fKTA)-Kq@k4Zs52y}aq#m2rwIQ68e zawj0OGSmz&az1+*nnGIC_e=l7A}PoR{YBG>9B*+kX&F%uW?vmG$Qiu5t%F_o!po~2 zQn>n{kRF@lLc>3BZugot$6O*KdHc{`0GhcRnjw!n=F5Zz7XP07t5{<+DUON;p!-Js zx00Z=3PYc@e`B1T91CPVYgEN^zFp&=0j06K>LYn()S;Bh<#pd_JvIr-|3-vb6jdDM zG;CA7dN9d%sDTe@#a`S>AJNDE4{`o3b1q`su;RpC{SIQqTeTAQ%U3T=as!GuO2*@G-XgthU_dWv;S*a~cLrp`p z!V(cMZtqd-UbcX|D^ivneUAaPgEUNr_z?l;+X@jkx6rl_?9*Vl63r}L09L>4Gm(J^ zl3rki24dU7SG!G=C=cLzHaQ(`LL?+0ZMP&1WUH*fhsw%|iCwa25|?DIZM-zNLik7B zEL6?iB;#pVmPhEeP(U$qzXn;1wju1H59SM$b>kfwaq^u!ljsJ z7Kql?v)EVtg6?QelS#U~&X~|Uy{xR~&S;LLwV`&W9~a?W6+suffChqDk0kQ_ox!X+ zG%f7$J(eG~oy(j$K=^Y)fsvQPHO+Pw$NKj46Q6Z#s%*~voLtMsZf9lEfZ5Q*zTkCH zY*9=2Eu!7HN9yu#uMm~bDeYR8+v&~E%w!4nFKY59ZYDO zc|Ns8J8)>Yt=|1m-C0DIwt9Bw6PEEOTC8<1Z$X;ax@P`&fIjf$EKR+%<_!-|*G3q#dHwT3WNo)mGH7qgxyqlQCcq|VWNhl()^>5I~{NG3DcgxLmdmmsTMQx zBLW$VOZsfBl_YBvm=Pix=)L|#;Ps#0Qh zuk7T30jAH)G=_Nzs)r5jVw&Jxd0l5_757NCv~nD}Qt8^B@Op%OBB-Br?#q>g$f}^d zfcKFTDA1a4gzG-m+%>k&oP(*r&TXg9394+$Zz#z|6|sOkeXF=T1)BNsIu8e{>@Q5U z?=MAjXjR?07k7cD{Wz>-iABF)on~o%!|l$&)Pz1)y`vm^&Wf{r-HX|fDiK|H& z?wx)EWsKJ)InEgU0~)1gD)|TTS!sEYy-vUEj5PT}!VdfeAKeHP@x3cs2SqPe*CB7+ z7=jXF1}j$tU?)|Twbw^PkMeeD%|Hl;&5Q$HwK45snf+-)gGXv<;D^~Hr@-Ldf>-gH z+*i6h=&Xr9QI@c}_YKhcJEGhJf$gGs1PBRyChm)nOtZVa`Fg2NB_Wi+P_%@xZ16e1 z_igyN7p4UhI-7dGDqA9>98I3SQ{Hzy5e z#rM_w?C)+`o9FJ`4J`5Ul-lw^}#CH>3 ztC6S{&RNlCJJe$-7gARUjv+-1pBZTXE8e)Qki@_QUAGwE*n;bYY*0HA3U$}7z{_sZ5fGnB@gS9d=;r=D2NhfIetKzyJDI_Y z9oJG>tZZH4kt+_vqD^{8) zEKNzS8b3dR$-$T6tNMPIR<&p?oDvjH0sggeepcJd_rvl&gyUy$pCmzRHQP+?|Gw~! zt5@V=)dt?c)%A*rrR{Pn8yB~fJGz4DNttb7YaO7*9nH>{?z#IDHghbHRF&2+--GU( zhq`&&XD^2yW3v2aVwE2}JG#l(ujmCXT;KovX&R*Z_dYPJFbQzj*t~6DemTNBS=H0; zya(ute2$=_l3+oXMb@3Tbf>DHUwiBZn2G6qS3QSawB=0%Pdp>{AgAv1O6#J;DH(k!c_2pBsM zkAs&V&`RpUu7$SBjzujMcgeIXs#9t{BV+tr^&U~N^6<1&+jS3VrwCY}3fRi}eUVD2 z{_@<$W>+VwM=EhmGrQUquKxuii-Mk77^sGoLXksPVagD6!xqI|9C)9D@mKKek-)2O z_(Q?lTIJ4QuljfH;6-H5s_Knf#$hQ^FyfX7{t})(qPwMwzybRFxkOwb3|R?1R87U; zoO>$5&Kn0K&ZcF--{b!MaZvKu#l>lTP7}!o30Y8**XKz2{c8TLWQ4^QDY|8A&*1?d z5Ei`I{UQ?iW8x+D_oc_svikA|d8Rh4Ms|s=R=e?CKm0t}S9%v4L5F~7$RT>5LntE@ z$P%GA*fVG?z;tYxE?>x3%2tbO0ttV@G@IE-x7NlVDRsxElt3H~UFPq^}I#=6c_4YriRi7g-+X zgGrk`Il}ffOIrPrJKOt?#@?gM&)NSD>0Ou8&^gzXq;L+6MLPV>`Cu2QWAyORIs8;Ai2t zB5~`T;QfrZs|?z9ly)xpceEn6hJ7QHP`gV?%!~3>F*j=*>ly-i@g0<=Opaqm$Ya1 z3VMqhE-Sxw=XVX$3x?kP^9&Kk+0M78(Bs7e@cGosjrU)I0FSk4(8XyGPvPK!zkV;w z*n4k=Pvjy=^u=qce+DX@;x+axoETB9!!%WJ=` z?fzk(d)>`qMIHwlLQp%DpYB|so+&HQ2t3^m+g=_|-t@2kvO6@V`8v#{_bfj8jzZnk z9E;g>0{xd%_Yoqi53#m@*oatp*!&YXUT$6i4sHPs9)2BeJ`sKa5k4U{Zf+57ZhtN0 zzW-%#cC~h}{qlbsuyA_({~1{RX9b9ZvyCUj!rATr_85{El>GC+DaxwJ)PT%G{~uYz B2V(#L diff --git a/sprites/spr_ship_weapon_macro_cannon/layers/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890/7e9c9e28-a54e-4389-8a37-9735f9adc44f.png b/sprites/spr_ship_weapon_macro_cannon/layers/a9f7a1f3-c0fb-4f8b-b270-14a3cb990890/7e9c9e28-a54e-4389-8a37-9735f9adc44f.png deleted file mode 100644 index 69eade3752927290b227df3fc5812493fab90f36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10308 zcmZ{qWl$VExVC}f?(R^e$fAqe;;t|54vVuui)(R*;tmB$ad#_Tr0C-AE(I3-`u#aG z=f{~$a?d1lCo@knlgyPTT0>193!NMt4h{}WQ9(xQpN9Rbyr{_k+9thDf`3A5rJ$t> z2j|NK2NxU;2lw=^EBFWw&Wj5U?!+7pPB;?|j>IjuLsRtM0J5dBybRp?|1X8z<*9IR z%mRusQaYbk&btkoa+kagA4CrQr6;{krw9(NLut{_OBG_f=C{64t~Q7yq&6*Bd?hLe z=uzKfPD$tAB$*l*7`O{Z?;=3}J|dR$4H;`{rEMQuD?_?=M1yHjjeqy$jb!)!c>3?$Adb6cr)e4}=Nn;gyf>?V#K-%R?fO*PUfB;$wV4t|6U8Mfj~aR*NX)M8jY#2;qqsyjSi=D{ga;*DzBmIOUe~I6=sTX={O7&P z*90Wx_e5GHKGz=agJs(hb_fOd_Q9`M0?os$FNsP>RN(D6$ZdR#`1+P8d&!J0XG~+P zEO)IMb(gBxI*hR;jpy4(8>pet{5WUpx6;u7cc6`w8|; z((w^Z7i23jI7n@T*WyeYdoBB94xj%;$>k^9R(E*w+^lc!u_mSH9m; zygvY1@h`l9LCD2jJ5COpB&Ir9@ITLM&FF|g9jM2&lsI&>SRZEVhRS=cI>V~~ZjHcT z2nH!t2>-*q8wQh$TSZ;-)y{2@?^)nvKOp;MjU&t~JDcqScE(yl5bnmMiBV#uLT)jO zn*-qje$?KGa1))K!d_JRma$lA(iJ7*f$601{Dje@yZO|LaQig-L@t z;ejLkPA&YO|JKA_0}>_O%nzD%u+_DXE^KWmC_?IXJ)pp9{|VzZ9%J)urYDz5+;^NJ zKg;t*y0o8IOQAGF`hi?OmHtJvlpBi31!?6>r4W~^b3bU>C6Q9vSzPIg4m-T?e(86O9+DYiW=oNoyZ zUulHzxAfj8-nYTi?3~VjD){S&MfLtPQcJ0)k}F#h)@z_zB_kj!3B|e1d?vi1UJT_Y z2lHvB;i7n9$D?!p4sw1wI|Ya`htt~g5eru@icL?OgwUNk6>NOIRag52h=erqPOcYZ z|7{=>)hbn$3YAStvY-tSYsX7d6kJs?FzIT!N)~8FRzV-$AsW6yFQG;JA^26qzwUhn zu#;Y{0i(O&?G4c;_2>SwTcv(_W!H!wXu4w?JMF(Kq8DwQtdoJKPx;YZXOqi_j+;0x z2^C%meW0U{G``sc*y^YM{PtQbC`+2SvVuho6%&7kF$V=L>f0}zgq`!)K5$|rvoq&aJ0->{D_n3n~BuakpCW~!OGF1Lqw0Kgd zeTlb9@8aMA3_5%G$&VIsgKPN&%_Z~muQ_XCC2SB3Ls8@@iQ4#-aD#SwYTrV}LY%qQ zoWn*!lC&?jr}QD*LgB;~D#9E4<#O7F^$h;f26n_+cWh+ z{QDuzJ5-S!`#f7azjsEz_sOby_HhH{pw!Ire3nh(hJByJJ@Q_Y3k!YUB9457MnbKr zUDCKW#I11;nOPwWZdsqH^O^CJfPW6?)U_HEqGm79it7@xHqU?=aB`V)O%(BS5F+b# zz97*{()@O3?)Liow|1jC7k6&?5t;btn*&>P9HR<5o00R|Q@S&-iq-K74uo24j*>?% z6G%z%fEtF(BM?U}mZ0xy8P{(+l4MFfa=g<){iA^dPZpKVHNH@S`yedmNIj{4omnmZ zOyauUoJF0cjOVp)WYg~Hu`*dq{&4fcpPf2rK{)+9As`*=akI zEM{;{e_$Dr{gDXdZ0S)c;!(120=NLDx9+jdhUt;OZueBOzDPXRvY{)V@-r+vEK~3& zN*8R{X=tJBm~r2tcEYPE0AhaUzx6KRTyuJWUx6@FXrg_s_m`bhIycEY)7Ky zD9EQY6aN_&dK?5k4pHsjm=cpD1Q+WB?L9Vm**RZBD|7Gj6?ZQ@5xA>(WVNcV8_I;j zCEMDUy9@IC4#qocr=Q0trXBL=OF`f(T&$CH2@wyy#i1Eabr$EO*>e@#CLCU{N=-gyF6GDg)Bw~rah4ULvAgNsP` z4gm#zyZO1N1>~6BYJP8JB%9xPM8hvTQ0e+gOC3VFiLEd-Q}D~b639PrKmXz$C;R-o zPVq9AVeZZ*$1ly zPhFtmUyMq3lgWgB{n|#cOO${OEk|VZ#_xWcp&#s-ezPk_mLG1rpHfa^#^KJkwN3o} zc5oKac!>*+CK#c7d|9g$i?kDb7-)sQU!@v%^6>d>HTDW9`$fm+2qq_ z5@J-&W=~ndGd@^f&0cr3ff?72+c=wnPyGZqb$-6tAYj;`(C36O4ScJos&*m>YBoQ_ ziIgUbDdT$dfC81ii5tpSw5*bJ&Z(y-P_aa$^tT}O7we>Vq+GR9w{vtJywhwM$-JW9 zeurgI%U((&ErV`np_-7`8~|I8-8 zyn!uJ7x&EHe|n|c?wAy<(8@(41R64$+NIo_1Gnw4!VAzb8Pa)%LZ|0LqyhIJRj3Ot zKfTuR&a;7>JhIyhWiu_E+Q)(G_P|@F&7eck1TEwCmQdB$(s z#<4eqTA!L)!Y!1_R}kAHG!2}5Vkar!9cm+{)Mg$3)(zAB3EmA$mGAhNyTeBxFU10Z z($)Yhis9h$zB&Q5Q`D$dW8EktYBBQ;rk>FNCC5#Uhyt~#jCdf_S;p@j9uaMt%s7mS zGFG>rif4up^1L(n5@?~w$CeOuRF$=U;V(a%e`#int;;)?d`WeB#NFtFFFpV=MbE6H zFt)zJ!-Fj2WCgw*o4iqH60UC)n{-DTEz7ojv7l?aSqfqpYwkprp0w3)NfuOW_qPcf z+Q)kF54pbwwj1M(5Nz30xVoe|l9H0q*3``WaAlxU^lFs*+#FJAVo|5Hr`PjRu~wvhJOF8Th(-+rNp3e?g4dZfSF|H#p)T;J6pVKq>x) zRFfN!wO}KyyPx^`*Y2_3EFf~SnS3xzdyg_PKHXU~btsip_!w`Do9AOeQFkJ)92KVk zN>YM6VE#ylA-vCvNb61;DBP?-hb#OG2kDDhsF56Y9Ia2@*;40U^2~!zK=i&z%T9Rn zI$bMSGcq_$LWT}J2Pl)Xt5h~VqDd0MHVKzvqDw1=3-$iNpH@_AxFXT05A3W6v4?i< z#w4eQ?ysUKO91zPBbI?NORuOj{AyRB-T*!e)fhA*%ml1@@Pqq?-??lq=qn?(zUZ@< z+%R&biy4Ds?Vr`Q;N$8!eKQ#%rXxt_QJoa)2MVxqDJ;OVeQeEW2!zb~Q88tv(wR$$ zUkX>|5r$v0nivzuO=^V}CY&R%DfXIr=fCvL0$e_faqAlD?%<;>6Nr;;(g>*yh>cyU zs_0kOtR&RzU!|o)PWWByCt^K;b}CSlByqKhS>3DR;Fh_PC18*rbRlis)=ZpKC~ECZ z%6~(vyYIFmEJUWAjtdT1ZwqEmSbrnT-%a85>X3@UW>Dyav~ZTx-^Kk4kfyqC#relI z5PTLSO4w_v7bcziLYvhVb2@T#fo%e=*9u9fI|!JV3F3GPo+QRgke4O*PLH8Hs&O-x zby66Vt5p@ju9LzElPT`EFNI4XpL8UVQW){=dR-LxY>`ov%$^=IF*SSI6qY$E*5}JR zbSoDnCo%n1qhdpLJd3l^bm&R?Oz5ssJ5pUd;x~4EgRa%}er@CXwLy#SQstQ+{^mp9 z{UP51s}V^-uL#%YvS^|G!>8{Ys$>b-3deQ(f3=4eL81F7wSd{9&!~AC$FdMZFCE() zzUYbtLkPL^)m$K=IY<4vTqOUR5}pM?ia9~5cM@pJ7MYAp1jM?jK65mWKb+k}vZI`6 z8W@^z!&1sYePObr**fO0U!rpY@j;*wH~zeJf>p>S1$ zyKWD1Mnk$~*0F`p-LJbnn_RjE#uq$MnIk=(k|P(tO|2M}cklelJ+w>qncXgor*m@V zI1YOI_0b5reu0*(iJx>ClSWxX31K^Koacv!JMcUBE=n z$oqtK!Fz2pBg6x+b+w3)pmsG!-6me6IEI7M{~Pmzt1)dD?ZUS_UzFWX;m+J^U<;nq zQXU*N3D0lwKlYjtHp`%E^p|^4est9}^!&sY>;zKrWx5%@jq)A!ic}d8H@MP)G3>i) zc-r(tJ<5?2#C<`Q%2DNhsdO$U{vMCQoIW^xg`w6bR?ywKf@* zd^=f(3#c~c@(Z*{TBr9bq@gv1D-`PZHdHfR^s~s3XvMIG5a(ub zSomDxN%)fcmzo77vl){>3(onYKbu}(_R;M!Jwp?#qh;J z2XBRL#rb5wb)FWPQi&6iNEc5%jfE|qJ6TF$ z%#=z|%xYKX3-%=|2^e#I@}Z)fJHzblME+(k=t`n{=7CIw@^_ArA9CM`yby7X#4XtD zvATU}Loo92;HVVM)P}|-FwN}{VV!HJno_cidmK$uYYT@8g<#G}-af0W=@3tNqSn0n zqZ44x@C6$fpIq9yMQg8w!bS)b3C;Eo?PI$FFiRvheJd&weS7+t;*xiN@C7$Um^cM> zZUb?f781jSwtge1Sex)0yRMKx)Phw{{aR3p)c+bD6k>d<@ycC%ZINm%k}3Aq^HRb>I^QL|AFPh* zqWQUv1g3ZQm@<90P^&2ZLzf;zRJMDZfboYD{+hH29sQ^~Qs_>gXD~3%NVUD?>~(y9 z()0uT)71o2j@KXIS#@8A%ctb`u%( zv#$jR_1qB@5b!*^^PmjaqT@8lE-bMcA0yY5tZhs%3&0xrd*uDi0SR8JF(JVhg9+_W zb@qI2j%nzQoDnE1Zvt8Snj_IxB0@*#Fn=b%@>*)Yx3xUlaxuMN13sN;1 zc^UwUk|zEntjd4^TsmXLFYF>YB=v&UvEmMG(QH)VRc^VQ3C<;_B&-=@{;afozdiXmy(=F!bVpFf`D@VB_;4?^L88wJHIa1TsKSs-eXM!0;SGpR$h79NQ+f9A#LlC52^i64^!zaZ%LB8!cEiE!#k zRppLfW@V@uUif_WGBky>sPC8lhecA55BiIy6FJ`EV$w3A9?ZTvT7WZncUuR$@P&s* zJEU;+K_NXh$%Te*;N0#tZH~D_M&kCNzW_9IIW$8acg&j!4J`gW`B$;VXi^Ln4M_Km z`fnvcX%&V(YyZYLJ2@7}eAcLn`+U2`KLbi*chyJo%&0>tnakt8(|T+Yl>dzgwJ54M z%4yi9di7wE_fP{L(u%#fl|G`mFV=XqBF6S&hk#5+q=Y(PDk#CvFX{t1kWwncSF-T$NOST@D}6f4frti0Lc*^z5>uhgDUA=0{)-`A6en-n#c0c*sg^SsH2@ zq7{}fzj1qyV)wEIM+>7QWhTqC|N}t!I?#VkC{#`foG7_4r!Zpy(-;cCBAIK36Rp7Bfl- zQR7f8OE><<+=8I~F!$$T^n=34DI5Da7r*ZA<@=N!Z9LlC+mE#1G}^K)oVVo%`)JB6 zV?24r;ORT-h$>}3zKajA07=0m@N!CUeE^!Px~tt`B>iymYClT;Q!NSzDEf+Rp86KP z%J&ZuaCb9(I{aIbT(?kLJbO$9m&JH?IngeP9FpMIiYla9wJwbstJ?8eU8FHkiYAP% zunNws`ygz31gHqyuFB!i&h<}f>Xw4)%MWqvw8+^@K`ZM&o8aF&-WdYIRIiX9b`IE} zrd0bjtiNA|os7*yiJZ-PBv{XI#;pp(hp#lEivib^(J2Ue2&kcmEk-898Le&p0TC|6 z+_O?>Z9R*9)i3Cd<}{h4%j=8@z0=FedhU$oNLm|eclvP=-c=EFu?uJ*nDs~^@822B zszcMl9^Yg6VcWUPsRM*RClnZYIe=-lvpCkbr=R$&V^d{w?&suMHg-EJlLpL&CiVrd zi=vBKLT?f6#yygke|rU~d`@ZCvfNH@ejfkikii!402iAq>7&8fI4m+68 zHgkV!i+149a9h3mp}Mn(EN%7d&MPG2PqbL;UfzNV`ELyPGkq*V$Qz*fS;LJ@XT;YDe^h=hq6l1lTBM(%XH$tO&E{tk645Tjbm z$d3qQEH3G@wN|3^&PQT75N>>0S<3%Y0c$b}z@}AA725PfYpLBZa6YYl`xALl-Kk26 z*}bxp2L_rxGt(I6C8!=Yw2Nwjcja}RnN{2)+0x2!=t`w)d&27x_KBc=*10cN;=-!} z_Wa&QPM|<*!V$oIthsA!ojC_nft}kYmR@q;e zYTsXq=FqCTb1&usPy2CL$r6ix!8*;-{D#Y&gQ*F9u6jo~_M9DGUe(Dba&1OXWD-}C zGTb};2Fe((OLCks`Uf;h&s6dc;Kgh#uwb(wcz~4x1SVylP|G!!rBRh6az+(!dY1Nlt;my9KXe zHMy^JdC*xCf1)fQb?+M~>+gti4+OT0<`Ezy@R^t|LNd+n_U7xQI+eI!0z=Uf#>#{i+8`nzYDIaa@7{xd*T%T&)y9f<>-q|C1_&yl5V`BZpRYbGcDM)(fK1 z{l)jy`|R&-TASzY-3=`9^5kMsSIsr|`F>=xyv5)5a9kdsRL&LpDUqP1YVXtBUgEn6 zkJU(23+JrJvmNTOqzkDl1jmpfhSvcx(Z9Asf_=ghCxP;sZ81 zsFNL`BH47Q6Youq-2z;2DkMllxw27&4)C&@bOgkwlH5q;AG*1|&p}1kyPsYf;ZA1o zV#l>q7AsqqxaEq&uqacv_LSNJv5ysAERiIbk0As+%Lv_*x8^uSUP_MaMt?cG8M{xf zflE^otH#fdU~=%K*s8wYrBy9j3#T}RQ-FW1oS)V9^8K*958?P3+$RapTFo|-`@b)| zBz5>0EV zH5FzmwN2W`_dbiao^HL_ofzfZDr1lo81;UBV_xKV5o`x@5i(O}PV9RMD$TM=2!pW$ z@i=(+fUTr1>{@86>{!&2ahFWHB08n!Gcv}{RqqiMD-TagwO#j+c8Y)ns(`Jm-xsNb z>Mzf2Y<6`bdZgmlG_$K+;rd@NvMA`Og{0K5QYdohDoh!IZrGx@iUaR+F#Za>Jra2J z4Sy(jTdUj|>{b8H6}*V-SyjDp%Q!4a3P#)##$UqIM|8Jz;Xgp1KNpV+gdr=ThpMR< zoO4Y@*m>h%#M!hg_xZ95`%3R(Bj6Aa4LL*)bO>dH zO0h&J4)zRM^D`Y=rpp)dma^62n!tkI|Ges6sIyHLPL9X(zrcrRH3Z>@HJkGf+lT7} zENY#K@U^v|Tk*A#r9m{5)`a`}i)V0A9{-@bngs?*g|FUfDFT5l2R<#{7qH(ko%e#u zo#FxG)BDe5#(`g$L|!YG`LLtCb(a?m`$@1VBHRrFznlG}Bhps}Zv)~<;*-wx!(E#~OoYT?8fpdjt;N$R_c)GyCz(w~IqD)0H7`Nh7ZZCO5%ukB zzXr=^+m@!U$fRw}voEIpgOKlJFh6T5)rN4hx`PSQ=)tQBh|zec(1lp_89aaJrq-+7?6L#AxW@j= zoRNtygPFt54Zv7$eHU+lYB~mx8YQ`nIZL9NuY%Cm(>7G6f{5;ByKJLc4g@Q9(m^e{ ziTJ;$4u&txX0U&FV6(gIbT#N9-SxP9c#iMmzq|y}AE&E7H}%DiQSGz$2;AXDH^bNT zJb&=)FW+n|lcejJZ_OM!-7M}{P{)jg-6okS)Ea$>SYG>e zZTAoR-0N-@D{?!~5Q5sFe01mh^-NibM&Rjo*!J>x@}__Nm))T`&DUXo-m}=~I|_AE zb1Y`l3G`o5-A9P5KE&DrVk2zjVe?Pmc({1@Ik@;axcPLrc!l}+g?R Date: Wed, 21 May 2025 20:18:15 +0100 Subject: [PATCH 065/155] more legacy cleanup --- .../scr_player_fleet_combat_functions.gml | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 5b1779409c..446da10203 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -32,23 +32,17 @@ function sort_ships_into_columns(combat){ with (combat){ for (var k = 0;k=3)) then combat.column_num[col]+=1; - if ((combat.column[col-1]="capital" || _ship.size>=3)) then combat.column_num[col-1]+=1; - if ((combat.column[col-2]="capital" || _ship.size>=3)) then combat.column_num[col-2]+=1; - if ((combat.column[col-3]="capital" || _ship.size>=3)) then combat.column_num[col-3]+=1; - if ((combat.column[col-4]="capital" || _ship.size>=3)) then combat.column_num[col-4]+=1; - - if (_ship.class=combat.column[col]) then combat.column_num[col]+=1; - if (_ship.class=combat.column[col-1]) then combat.column_num[col-1]+=1; - if (_ship.class=combat.column[col-2]) then combat.column_num[col-2]+=1; - if (_ship.class=combat.column[col-3]) then combat.column_num[col-3]+=1; - if (_ship.class=combat.column[col-4]) then combat.column_num[col-4]+=1; - - if ((combat.column[col]="escort" ||_ship.size=1)) then combat.column_num[col]+=1; - if ((combat.column[col-1]="escort"|| _ship.size=1)) then combat.column_num[col-1]+=1; - if ((combat.column[col-2]="escort" || _ship.size=1)) then combat.column_num[col-2]+=1; - if ((combat.column[col-3]="escort" || _ship.size=1)) then combat.column_num[col-3]+=1; - if ((combat.column[col-4]="escort" || _ship.size=1)) then combat.column_num[col-4]+=1; + for (var col = 5;col>0;col--){ + if ((combat.column[col]="capital" || _ship.size>=3)){ + combat.column_num[col]+=1; + } + if (_ship.class=combat.column[col]){ + combat.column_num[col]+=1; + } + if ((combat.column[col]="escort" ||_ship.size=1)){ + combat.column_num[col]+=1; + } + } } } From 8871f45a8a78c5af4313adc3276981c8ab2497fe Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Fri, 23 May 2025 02:27:58 +0100 Subject: [PATCH 066/155] Dock Yards --- .../scr_apothecary_ground.gml | 10 +++- .../scr_draw_planet_features.gml | 22 ++++++++ .../scr_planet_setup_functions.gml | 52 ++++++++++--------- .../scr_planetary_feature.gml | 16 +++++- .../scr_player_fleet_combat_functions.gml | 4 +- scripts/scr_system_spawn/scr_system_spawn.gml | 6 +-- .../scr_system_spawn_functions.gml | 8 +-- 7 files changed, 83 insertions(+), 35 deletions(-) diff --git a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml index cbe071efd1..d3e48a48c5 100644 --- a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml +++ b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml @@ -13,6 +13,10 @@ function calculate_full_chapter_spread(){ var _tech_spread = {}; var _apoth_spread = {}; var _unit_spread = {}; + for (var i=0;i0){ p_orks[i]=choose(1,2,3,3,4,5); } - if (p_type[i]=="Forge" || p_type[i]="Hive")){ + if (p_type[i]=="Forge" || p_type[i]="Hive"){ p_orks[i] = 5; } } diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 26e237a1bc..4717d07318 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -168,6 +168,20 @@ function PlanetFeature(feature_type, other_data={}) constructor{ case P_features.ShipDock: player_hidden = 0; size = 1; + move_data_to_current_scope(other_data); + switch(size){ + case 1: + capacity = 3; + break; + case 2: + capacity = 9; + break; + case 3: + capacity = 20; + break; + } + space_taken = 0; + break; default: player_hidden = 1; planet_display = 0; @@ -397,4 +411,4 @@ function create_starship_event(){ array_push(star.p_feature[planet], new PlanetFeature(P_features.Starship)) scr_event_log("","Ancient Starship discovered on "+string(star.name)+" "+scr_roman(planet)+".", star.name); } -} +} \ No newline at end of file diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 446da10203..ec8808c2c1 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -119,7 +119,7 @@ function draw_ellipse_rotated(){ } //data must have keys, shields, recharge, and reboot -function ShipShieldGenerator(data){ +function ShipShieldGenerator(data) constructor{ move_data_to_current_scope(data); destroyed = false; disabled = false; @@ -177,7 +177,7 @@ function setup_player_combat_ship(){ turrets=0; ship_colour=obj_controller.body_colour_replace; max_speed = ship_data.max_speed; - shields = new ShipShieldGenerator({shields, maxshields, ship_data.shields_recharge_rate, ship_data.shields_reboot_time, ship:id}) + shields = new ShipShieldGenerator({shields, maxshields, recharge_rate:ship_data.shields_recharge_rate, shields_reboot:ship_data.shields_reboot_time, ship:id}) for (var i=0;i0) and (owner == eFACTION.Imperium){ var _planet = irandom_range(1, planets); - setup_chaos_world(_current_system,planets); + setup_chaos_world(id,_planet); } } instance_deactivate_object(_current_system); From 432a181e3506c9eb4675dcb5cbbf5342c52aa6ed Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Fri, 23 May 2025 23:59:31 +0100 Subject: [PATCH 067/155] shields and docks function theoretically --- objects/obj_al_ship/Create_0.gml | 8 --- objects/obj_en_round/Collision_obj_p_ship.gml | 32 +++++++----- objects/obj_p_ship/Create_0.gml | 2 - objects/obj_p_ship/Draw_0.gml | 19 +++---- objects/obj_p_ship/Step_0.gml | 22 +++++--- .../scr_draw_planet_features.gml | 6 +-- .../scr_planet_setup_functions.gml | 13 +++-- .../scr_planetary_feature.gml | 1 + .../scr_player_fleet_combat_functions.gml | 48 ++++++++++-------- .../scr_player_ship_functions.gml | 43 +++++++++++----- .../scr_ship_weapon_struct.gml | 4 +- scripts/scr_system_spawn/scr_system_spawn.gml | 2 +- .../scr_system_spawn_functions.gml | 4 +- .../66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png | Bin 1571 -> 1571 bytes .../69575369-6061-47a6-b608-894dae3a1efd.png | Bin 1154 -> 1154 bytes .../25a3433d-721c-49ce-8a7a-3513cf831ef5.png | Bin 1571 -> 1571 bytes .../25a3433d-721c-49ce-8a7a-3513cf831ef5.png | Bin 1154 -> 1154 bytes .../26a48129-bbce-4502-98fa-bb1536100ae8.png | Bin 677 -> 677 bytes .../3c4a6865-1bd0-4736-afba-d1184eb7c9c2.png | Bin 662 -> 662 bytes .../f263cbc2-c596-4d91-bf6e-98df697e82d6.png | Bin 482 -> 482 bytes .../62b09ae3-d70e-4c96-a796-f9dc9b29190d.png | Bin 677 -> 677 bytes .../62b09ae3-d70e-4c96-a796-f9dc9b29190d.png | Bin 662 -> 662 bytes .../62b09ae3-d70e-4c96-a796-f9dc9b29190d.png | Bin 482 -> 482 bytes .../1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png | Bin 1003 -> 1003 bytes .../9bf31ffc-9a0a-492f-89fb-b703fed172b9.png | Bin 1003 -> 1003 bytes .../a43406eb-6236-415d-9902-e818a2185ba9.png | Bin 839 -> 839 bytes .../32295d2f-e43c-4d2b-a49d-2a445111c733.png | Bin 839 -> 839 bytes .../da4d2ca5-ded6-4a96-bef4-a1c048f10f67.png | Bin 1187 -> 1187 bytes .../0b5e7fba-d4a1-441e-a726-f45a72c56663.png | Bin 1187 -> 1187 bytes sprites/spr_ship_bb/spr_ship_bb.yy | 6 ++- sprites/spr_ship_hunt/spr_ship_hunt.yy | 7 ++- sprites/spr_ship_song/spr_ship_song.yy | 2 + .../8e269d92-a1bd-4360-9ab3-d9310feae634.png | Bin 1624 -> 1624 bytes .../a3482820-22c0-4934-a6c1-87b382d13fad.png | Bin 1624 -> 1624 bytes 34 files changed, 125 insertions(+), 94 deletions(-) diff --git a/objects/obj_al_ship/Create_0.gml b/objects/obj_al_ship/Create_0.gml index dd7b2a2652..04a4d1d9c7 100644 --- a/objects/obj_al_ship/Create_0.gml +++ b/objects/obj_al_ship/Create_0.gml @@ -12,15 +12,7 @@ target_r=0; bullets_for = []; turn_bonus=1; speed_bonus=1; - -cooldown[0]=0; -cooldown[1]=0; -cooldown[2]=0; -cooldown[3]=0; -cooldown[4]=0; -cooldown[5]=0; turret_cool=0; -shield_size=0; name=""; class=""; diff --git a/objects/obj_en_round/Collision_obj_p_ship.gml b/objects/obj_en_round/Collision_obj_p_ship.gml index 7daa300ebc..efc343d572 100644 --- a/objects/obj_en_round/Collision_obj_p_ship.gml +++ b/objects/obj_en_round/Collision_obj_p_ship.gml @@ -1,24 +1,32 @@ +var _rel_direction = point_direction(other.x, other.y, x, y); +var arm=other.armour_front; -var arm; -arm=other.armour_front; - -var t1;t1=0; +var t1=0; if (obj_fleet.global_defense!=1){ t1=1-(obj_fleet.global_defense-1); dam=dam*t1; } - -if (arm0) then other.shields-=dam; - if (other.shields<=0) then other.hp-=dam; +if (other.shields.active){ + other.shields.shields-=dam; +} else { + var _arm = 0; + var _rel_direction = point_direction(other.x, other.y, x, y); + if (_rel_direction <= 45 || _rel_direction >= 315){ + _arm = other.armour_front; + } else if (_rel_direction <225 && _rel_direction > 135){ + _arm = other.rear_armour; + } else { + _arm = other.side_armour; + } + if (_armdam) and (other.shields>0) then other.shields-=1; -if (arm>dam) and (other.shields<=0) then other.hp-=1; - new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); instance_destroy(); diff --git a/objects/obj_p_ship/Create_0.gml b/objects/obj_p_ship/Create_0.gml index 73818aa75d..a00c9d68f1 100644 --- a/objects/obj_p_ship/Create_0.gml +++ b/objects/obj_p_ship/Create_0.gml @@ -31,9 +31,7 @@ target_r=0; target_x=0; target_y=0; -cooldown = array_create(6, 0); turret_cool=0; -shield_size=0; board_capital=false; board_frigate=false; diff --git a/objects/obj_p_ship/Draw_0.gml b/objects/obj_p_ship/Draw_0.gml index 8e78a07727..3f92c7faf2 100644 --- a/objects/obj_p_ship/Draw_0.gml +++ b/objects/obj_p_ship/Draw_0.gml @@ -5,7 +5,7 @@ if !__b__ { shields.draw(); -if (selected=1){ +if (selected=1 || point_distance(x, y, mouse_x, mouse_y) < 50){ draw_set_color(38144); draw_circle(x,y,(sprite_width/2),1); draw_circle(x,y,(sprite_width/2)-1,1); @@ -57,12 +57,12 @@ if (boarders>0){ scr_image("ui/force",1,x-16-32,y+12-32,64,64); draw_set_color(0); - draw_text(x-16,y+12,string_hash_to_newline(string(boarders))); - draw_text(x-16-1,y+12-1,string_hash_to_newline(string(boarders))); - draw_text(x-16+1,y+12+1,string_hash_to_newline(string(boarders))); - draw_text(x-16+1,y+12,string_hash_to_newline(string(boarders))); + draw_text(x-16,y+12,string(boarders)); + draw_text(x-16-1,y+12-1,string(boarders)); + draw_text(x-16+1,y+12+1,string(boarders)); + draw_text(x-16+1,y+12,string(boarders)); draw_set_color(c_white); - draw_text(x-16,y+12,string_hash_to_newline(string(boarders))); + draw_text(x-16,y+12,string(boarders)); } draw_set_color(38144); @@ -74,13 +74,6 @@ if (maxhp!=0){ draw_text_transformed(x,y-sprite_height,hp_percent,zoom_modifier,zoom_modifier,0); } - - if (shields>0){ - draw_set_color(c_white); - var shield_percent = $"{(shields/maxshields)*100}%" - - draw_text_transformed(x,y-sprite_height,shield_percent,zoom_modifier,zoom_modifier,0); - } } if (master_present!=0) then draw_sprite_ext(spr_popup_select,0,x,y,2,2,0,c_white,1); diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index b28acf2214..a3858635b3 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -4,23 +4,30 @@ if (obj_fleet.start!=5) then exit; var dist; - -if (shields>0) and (shields=0) then board_cooldown-=1; // Need to every couple of seconds check this // with obj_en_ship if not big then disable, check nearest, and activate once more draw_targets = false; -if (instance_exists(target)){if ((target.x<3) and (target.y<3)) or (target.hp<0) then target=-50;} +if (instance_exists(target)){ + if ((target.x<3) and (target.y<3)) or (target.hp<0){ + target=-50; + } +} if (!instance_exists(target)) or (target=-50){ - with(obj_en_ship){if ((x<3) and (y<3)) or (hp<=0) then instance_deactivate_object(id);} + with(obj_en_ship){ + if ((x<3) and (y<3)) or (hp<=0) then instance_deactivate_object(id); + } target=instance_nearest(x,y,obj_en_ship); instance_activate_object(obj_en_ship); } //if (!instance_exists(target)) then exit; if (instance_exists(obj_en_ship)){ - if (!instance_exists(target) and (instance_nearest(x,y,obj_en_ship).x>500)) then target=instance_nearest(x,y,obj_en_ship); + if (!instance_exists(target) and (instance_nearest(x,y,obj_en_ship).x>500)){ + target=instance_nearest(x,y,obj_en_ship); + + } if (!instance_exists(target)) then target=instance_nearest(x,y,obj_en_ship); } @@ -51,7 +58,8 @@ if (hp<=0) and (x>-5000){ if (obj_fleet.start!=0){ destroy_ship_and_leave_husk(); } - x=-7000;y=room_height/2; + x=-7000; + y=room_height/2; } if (hp>0) and (instance_exists(target)){ is_targeted(); @@ -183,6 +191,8 @@ if (hp>0) and (instance_exists(target)){ } +shields.step(); + /* */ diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index fa30b3507f..ce15a989a1 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -227,7 +227,7 @@ function FeatureSelected(Feature, system, planet) constructor{ title = "Ship Dock"; var _size_description = ""; var _size_literal - switch(size){ + switch(feature.size){ case 1: _size_description = "are small and unsuited to working on medium and large vessels and are mostly for the convieniencce of local traders of the planet"; _size_literal = "Escort"; @@ -242,9 +242,9 @@ function FeatureSelected(Feature, system, planet) constructor{ break; } var _description = $"The Docks of {planet_data.name()} {_size_description}\n\n"; - _description += $"The docks are capable of berthing {capacity} ships of sizes up to {_size_literal} ships, ships being worked on in berths will not be able to participate in combat while they are being worked on and will take 2 months to recomission to duty once work has commenced"; + _description += $"The docks are capable of berthing {feature.capacity} ships of sizes up to {_size_literal} ships, ships being worked on in berths will not be able to participate in combat while they are being worked on and will take 2 months to recomission to duty once work has commenced"; draw_text_ext(xx+10, yy+40,mission_description,-1,area_width-20); - + case P_features.Mission: var mission_description=$""; var planet_name = planet_numeral_name(planet_data.planet, obj_star_select.target); diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml index ef341e7dea..2c867ab463 100644 --- a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -47,10 +47,13 @@ function setup_tau_world(star, planet){ } function setup_chaos_world(star, planet){ - planet[planet]=1; - p_owner[planet]=10; - p_heresy[planet] = irandom_range(30, 80); - owner = eFACTION.Chaos; + var _p = planet; + with (star){ + planet[_p]=1; + p_owner[_p]=10; + p_heresy[_p] = irandom_range(30, 80); + owner = eFACTION.Chaos; + } } function setup_star_planet_defualts(){ @@ -133,7 +136,7 @@ function setup_star_planet_defualts(){ p_max_population[i] = p_population[i]; break; } - if (system_setup_data.map_dock_qouta){ + if (_sys_data.map_dock_qouta){ switch (p_type[i]) { case "Temperate": case "Shrine": diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 4717d07318..fb594cc267 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -181,6 +181,7 @@ function PlanetFeature(feature_type, other_data={}) constructor{ break; } space_taken = 0; + planet_display = "Docks"; break; default: player_hidden = 1; diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index ec8808c2c1..66351a4e50 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -59,7 +59,7 @@ function player_fleet_ship_spawner(){ if (col<5) then x2-=column_width[col]; if (column_num[col]>0){// Start ship creation - if (column[col]=="capital"){ + if (column[col]=="capital" || "Battle Barge"){ hei=160; sizz=3; } @@ -124,12 +124,30 @@ function ShipShieldGenerator(data) constructor{ destroyed = false; disabled = false; disabled_timer = 0; + x_scale = 1; + y_scale = 1; + shield_sprite = spr_ship_shields; + var _ship_sprite = ship.sprite_index; + x_scale = sprite_get_width(_ship_sprite) / sprite_get_width(shield_sprite); + y_scale = sprite_get_height(_ship_sprite) / sprite_get_height(shield_sprite); + + static draw = function(){ if (shields > 0 && !destroyed && !disabled){ - draw_sprite_ext(spr_ship_shields, 0, ship.x, ship.y, 1, 1, ship.direction, c_white, 1); + draw_sprite_ext(shield_sprite, 0, ship.x, ship.y, x_scale, y_scale, ship.direction, c_white, 1); + + draw_set_color(c_white); + var shield_percent = $"{(shields/maxshields)*100}%" + + draw_text_transformed(ship.x,ship.y-sprite_height,shield_percent,x_scale*obj_controller.scale_mod,y_scale*obj_controller.scale_mod,0); + } } + static active = function(){ + return (shields && !destroyed && !disabled); + } + static step = function(){ if (destroyed){ exit; @@ -156,13 +174,6 @@ function setup_player_combat_ship(){ action=""; direction=0; - - cooldown1=0; - cooldown2=0; - cooldown3=0; - cooldown4=0; - cooldown5=0; - ship_data = obj_ini.ship_data[ship_id]; weapons = ship_data.weapons; @@ -174,10 +185,10 @@ function setup_player_combat_ship(){ maxshields=shields; armour_front = ship_data.front_armour; side_armour=ship_data.side_armour; + rear_armour = ship_data.rear_armour; turrets=0; ship_colour=obj_controller.body_colour_replace; max_speed = ship_data.max_speed; - shields = new ShipShieldGenerator({shields, maxshields, recharge_rate:ship_data.shields_recharge_rate, shields_reboot:ship_data.shields_reboot_time, ship:id}) for (var i=0;i0){ with(_struct){ - left_broad_positions = [[56, 16],[65, 16],[74,16],[83, 16]]; - right_broad_positions = [[56, 37],[65, 37],[74,37],[83, 37]]; - add_weapon_to_ship("Weapons Battery", {facing : "left", firing_arc: 30}); - add_weapon_to_ship("Weapons Battery", {facing : "right", firing_arc: 30}); - add_weapon_to_ship("Light Weapons Battery", {facing : "front"}); + left_broad_positions = [[162, 36],[173, 36],[185,36],[197, 36],[210,36],[222, 36]]; + right_broad_positions = [[162, 75],[173, 75],[185,75],[197, 75],[210,75],[222, 75]]; + var _broadsl = left_broad_positions; + var _broadsr = right_broad_positions; + for (var i=0;i0){ with(_struct){ class = "Gladius"; - add_weapon_to_ship("Light Weapons Battery"); + add_weapon_to_ship("Macro Cannon"); turrets = [{}]; hp = 200; max_hp = 200; @@ -326,13 +345,13 @@ function new_player_ship(type, start_loc="home", new_name=""){ with(_struct){ class = "Hunter"; add_weapon_to_ship("Torpedoes"); - add_weapon_to_ship("Light Weapons Battery"); + add_weapon_to_ship("Macro Cannon"); turrets = [{}]; hp = 200; max_hp = 200; capacity = 25; - turning_speed = 0.3; - max_speed = 33; + turning_speed = 0.4; + max_speed = 38; front_armour = 4; side_armour = 3; rear_armour = 1; diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index 44dfb991d4..17387fbb54 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -28,7 +28,7 @@ function ShipWeaponExplosion(explosion_sprite, x, y, scale = 1) constructor{ animation_frames = sprite_get_number(bang_sprite); current_index = 0; static draw = function(){ - draw_sprite_ext(bang_sprite,floor(current_index),x, y,1*scale,1*scale,0,c_white,1); + draw_sprite_ext(bang_sprite,floor(current_index),x, y,(scale/2),(scale/2),0,c_white,1); current_index += 0.2; if (floor(current_index) > animation_frames){ return -1; @@ -242,7 +242,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ } static draw_weapon_firing_arc = function(){ var _tangent_direction = weapon_direction(); - var _facing = facings + var _facing = facing var _max_distance = range; diff --git a/scripts/scr_system_spawn/scr_system_spawn.gml b/scripts/scr_system_spawn/scr_system_spawn.gml index 79c93d4f30..8793cf477e 100644 --- a/scripts/scr_system_spawn/scr_system_spawn.gml +++ b/scripts/scr_system_spawn/scr_system_spawn.gml @@ -341,7 +341,7 @@ if (did){ } for (var s=1;s<=planets;s++){ - if (p_type[i]!="Dead"){ + if (p_type[s] != "Dead" && choose(0,1)){ setup_tau_world(_current_system, s); break; } diff --git a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml index 4030bf2b0c..877e130033 100644 --- a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml +++ b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml @@ -180,8 +180,8 @@ function spawn_chaos_stars(){ // Chaos var _chaos_stars = 2+irandom(4); repeat(_chaos_stars){ - var xx=floor(random(1152))+64; - var yy=floor(random(748))+64; + var xx=irandom(1152)+64; + var yy=irandom(748)+64; var _current_system=instance_nearest(xx,yy,obj_star); with (_current_system){ var _planet = irandom_range(1, planets); diff --git a/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png b/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png index d02cd42edc3ef5c5c59e205b53a7fcf56da6d026..1cdcd53724f30f92cbb9d2b64c78d975eb82c8fb 100644 GIT binary patch delta 145 zcmZ3?vzTYYY}R^HT_fWV14AogBP&w_Z36=<1A`u}$OHxk2GtVRh?11Vl2ohQ{FKbJ zN(LhXBU4=iEE@iXKfD9fpaIuVl9`)YT#}eufLqThrvuDDJ)8`lu6{1-oD!MTtwZt`|BqgyV)hahXB{Qv( y!N|bKRM!BD26xUozkwPw;2KIYb5n~;5_1c1>k*Los{+)+$>8bg=d#Wzp$PyM-zG2s diff --git a/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png b/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png index ff2657fd3a1a2ada927e905d6e835d8098e0774a..4d7fe19e119970cbb0fe2364e014487c852f8d9f 100644 GIT binary patch delta 123 zcmZqTY~tMTi&@-M*T^`;z|hLr$ja0}+rYrez@UdKGGVeHi&Qukxxe8L?=UbhXq31{ sl%ynKb6tv&!iJGf)qMr>mdKI;Vst0Q=D)5dZ)H delta 123 zcmZqTY~tMTi&@-A*T_7?z`)AX#LCb@8^|y)m^*jxhRK2~QsG$S-W*`%VPIg;C~=J_ rNl7e8wJOQXO)V}-%q?IrGB7gLHNc{0_f?h4Ks^keu6{1-oD!MTtwZt`|BqgyV)hahXB{Qv( y!N|bKRM!BD26xUozkwPw;2KIYb5n~;5_1c1>k*Los{+)+$>8bg=d#Wzp$PyM-zG2s diff --git a/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png b/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png index ff2657fd3a1a2ada927e905d6e835d8098e0774a..4d7fe19e119970cbb0fe2364e014487c852f8d9f 100644 GIT binary patch delta 123 zcmZqTY~tMTi&@-M*T^`;z|hLr$ja0}+rYrez@UdKGGVeHi&Qukxxe8L?=UbhXq31{ sl%ynKb6tv&!iJGf)qMr>mdKI;Vst0Q=D)5dZ)H delta 123 zcmZqTY~tMTi&@-A*T_7?z`)AX#LCb@8^|y)m^*jxhRK2~QsG$S-W*`%VPIg;C~=J_ rNl7e8wJOQXO)V}-%q?IrGB7gLHNc{0_f?h4Ks^keu6{1-oD!MUO_Qmu0H zQ!>*k8H@~!uxprqhW7$cg9cnfNoHUO_Qmu0H zQ!>*k8H@~!uxprqhW7$cg9cnfNoH}?pi$x) pQIe8al4@0wnVVW%l9*e-U}Ru~U60I~$Q3|644$rjF6*2Ung9vVBPRd= diff --git a/sprites/spr_indomitus_backpack_variants/layers/26a48129-bbce-4502-98fa-bb1536100ae8/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png b/sprites/spr_indomitus_backpack_variants/layers/26a48129-bbce-4502-98fa-bb1536100ae8/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png index 5cb06a2525c5bf6d382efe24d2b8a3e6bd87d91a..4ce42230196eb8373bebf30f38b94154a8d58b5a 100644 GIT binary patch delta 148 zcmZ3=x|DT;6jQyau7Rnpk#UHDp_Q?bm8pTYfq|8QK@V4C0s{ksYKdz^NlIc#s#R`& zN@iLmgOPy|b`5{SAKn3K(12?w$;?eHE=kNSz^!MM(*b54pe6=SS3j3^P6cVb?JCbfgwgg9cnfNoHUO_Qmu0H zQ!>*k8H@~!uxprqhW7$cg9cnfNoH}?pi$x) pQIe8al4@0wnVVW%l9*e-U}Ru~U60I~$Q3|644$rjF6*2Ung9vVBPRd= diff --git a/sprites/spr_mk3_complex_backpack/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png b/sprites/spr_mk3_complex_backpack/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png index eeffda3174f66d991ea2b9ebeef2b6e8c140ad8c..226da4fca940cdee6e6ed434dd3122d3b06488af 100644 GIT binary patch delta 126 zcmaFO{+fM50<*WNu7Rnpk#UHDp_Q?bm8pTYfq|8QK@V4C0s{ksYKdz^NlIc#s#R`& qN@iLmgOPy|b`5{SAKsa~npsK>yYwoj1I$447(8A5T-G@yGywo@DIvB1 delta 126 zcmaFO{+fM50<*V?uAzahkwJ)&ft9J5m7%G&fq|8Q!K2HWj~EyjR7+eVN>UO_Qmu0H qQ!>*k8H@~!uxpsycQJ1AYGx@l?9xYOe`o}n$KdJe=d#Wzp$P!`C?m%J diff --git a/sprites/spr_mk3_complex_backpack/layers/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f/9bf31ffc-9a0a-492f-89fb-b703fed172b9.png b/sprites/spr_mk3_complex_backpack/layers/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f/9bf31ffc-9a0a-492f-89fb-b703fed172b9.png index eeffda3174f66d991ea2b9ebeef2b6e8c140ad8c..226da4fca940cdee6e6ed434dd3122d3b06488af 100644 GIT binary patch delta 126 zcmaFO{+fM50<*WNu7Rnpk#UHDp_Q?bm8pTYfq|8QK@V4C0s{ksYKdz^NlIc#s#R`& qN@iLmgOPy|b`5{SAKsa~npsK>yYwoj1I$447(8A5T-G@yGywo@DIvB1 delta 126 zcmaFO{+fM50<*V?uAzahkwJ)&ft9J5m7%G&fq|8Q!K2HWj~EyjR7+eVN>UO_Qmu0H qQ!>*k8H@~!uxpsycQJ1AYGx@l?9xYOe`o}n$KdJe=d#Wzp$P!`C?m%J diff --git a/sprites/spr_mk4_complex_backpack/a43406eb-6236-415d-9902-e818a2185ba9.png b/sprites/spr_mk4_complex_backpack/a43406eb-6236-415d-9902-e818a2185ba9.png index f5c405e1bef9456e2c0a6f1b4d4b3c805ae19143..9737c2dba7f620e070ccf1ec123a207dd4656297 100644 GIT binary patch delta 148 zcmX@kcARa)9;SLzT?12HBjXSQLn~t=D^mk)0|P4qgC4HP1O^5M)e_f;l9a@fRIA+l zl+3hB1|tI_>>B=tKfD9fpaIuVl9`)YT#}eufLqThrvuD9Kurvuu6{1-oD!M<@JA?f delta 148 zcmX@kcARa)9;SK|T|)z1BZCkl11l3tDcVb}0NIj0V&K?AO#Br`X)xFj*R0Jom~X1)t~fSMRQUHx3vIVCg!07juG A=>Px# diff --git a/sprites/spr_mk4_complex_backpack/layers/a43406eb-6236-415d-9902-e818a2185ba9/32295d2f-e43c-4d2b-a49d-2a445111c733.png b/sprites/spr_mk4_complex_backpack/layers/a43406eb-6236-415d-9902-e818a2185ba9/32295d2f-e43c-4d2b-a49d-2a445111c733.png index f5c405e1bef9456e2c0a6f1b4d4b3c805ae19143..9737c2dba7f620e070ccf1ec123a207dd4656297 100644 GIT binary patch delta 148 zcmX@kcARa)9;SLzT?12HBjXSQLn~t=D^mk)0|P4qgC4HP1O^5M)e_f;l9a@fRIA+l zl+3hB1|tI_>>B=tKfD9fpaIuVl9`)YT#}eufLqThrvuD9Kurvuu6{1-oD!M<@JA?f delta 148 zcmX@kcARa)9;SK|T|)z1BZCkl11l3tDcVb}0NIj0V&K?AO#Br`X)xFj*R0Jom~X1)t~fSMRQUHx3vIVCg!07juG A=>Px# diff --git a/sprites/spr_psy_hood_complex/da4d2ca5-ded6-4a96-bef4-a1c048f10f67.png b/sprites/spr_psy_hood_complex/da4d2ca5-ded6-4a96-bef4-a1c048f10f67.png index f2fb69297c83cc16e5aef5b79da2b34d915c258e..3a6e90b47316e5bbd8fa66b35b6e81957cfc446d 100644 GIT binary patch delta 145 zcmZ3?xtMc^NS3j3^P6!C8<`q`6-!c zl?+A(My9$3STv+|dVB(E(12?w$;?eHE=kNSz^%t^NS3j3^P6!C8<`q`6-!c zl?+A(My9$3STv+|dVB(E(12?w$;?eHE=kNSz^%t","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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":35, "yorigin":12, diff --git a/sprites/spr_ship_song/spr_ship_song.yy b/sprites/spr_ship_song/spr_ship_song.yy index 73d98f425b..7bf1268299 100644 --- a/sprites/spr_ship_song/spr_ship_song.yy +++ b/sprites/spr_ship_song/spr_ship_song.yy @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":150.0, + "seqWidth":350.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png b/sprites/spr_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png index a93adbc8b62c4ccb0779307a601b1c6740f53113..6225ba49b50fd0919a7234f42896cf358ff78ce6 100644 GIT binary patch delta 120 zcmcb?bAxBY1y&DJT_fWV14AogBP&w_Z36=<1A`u}$OHxk2GtVRh?11Vl2ohQ{FKbJ qN(LhXBU4=iEE@iXKfE(pf=yN#i`*)w1I$3f7(8A5T-G@yGywq8ARtu$ delta 120 zcmcb?bAxBY1y&CuT_cMSBV#KgBP#=AZ36=<1B0c}&Ylbm45}rr5hW>!C8<`q`6-!c ql?+A(My9$3STtN=`~7vY1e>ff7P)5OTUtQF7(8A5T-G@yGywqIl^{O= diff --git a/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png index a93adbc8b62c4ccb0779307a601b1c6740f53113..6225ba49b50fd0919a7234f42896cf358ff78ce6 100644 GIT binary patch delta 120 zcmcb?bAxBY1y&DJT_fWV14AogBP&w_Z36=<1A`u}$OHxk2GtVRh?11Vl2ohQ{FKbJ qN(LhXBU4=iEE@iXKfE(pf=yN#i`*)w1I$3f7(8A5T-G@yGywq8ARtu$ delta 120 zcmcb?bAxBY1y&CuT_cMSBV#KgBP#=AZ36=<1B0c}&Ylbm45}rr5hW>!C8<`q`6-!c ql?+A(My9$3STtN=`~7vY1e>ff7P)5OTUtQF7(8A5T-G@yGywqIl^{O= From 4be36278e4345edd009269d4e7319545ef9f83c8 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 24 May 2025 00:31:58 +0100 Subject: [PATCH 068/155] few glitches --- objects/obj_star_select/Draw_64.gml | 7 ++++++- .../scr_draw_planet_features/scr_draw_planet_features.gml | 3 ++- .../scr_planet_setup_functions.gml | 2 +- .../scr_player_fleet_combat_functions.gml | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/objects/obj_star_select/Draw_64.gml b/objects/obj_star_select/Draw_64.gml index 6d9ad5c1bb..5ccdb4a11d 100644 --- a/objects/obj_star_select/Draw_64.gml +++ b/objects/obj_star_select/Draw_64.gml @@ -249,7 +249,12 @@ if (obj_controller.selecting_planet!=0){ var slate_draw_scale = 420/850; if (feature!=""){ if (is_struct(feature)){ - feature.draw_planet_features(344+main_data_slate.width-4,165) + try{ + feature.draw_planet_features(344+main_data_slate.width-4,165); + } catch(_exception){ + handle_exception(_exception); + feature = ""; + } if (feature.remove){ feature=""; }else if (feature.destroy){ diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index ce15a989a1..f0388ef146 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -243,7 +243,8 @@ function FeatureSelected(Feature, system, planet) constructor{ } var _description = $"The Docks of {planet_data.name()} {_size_description}\n\n"; _description += $"The docks are capable of berthing {feature.capacity} ships of sizes up to {_size_literal} ships, ships being worked on in berths will not be able to participate in combat while they are being worked on and will take 2 months to recomission to duty once work has commenced"; - draw_text_ext(xx+10, yy+40,mission_description,-1,area_width-20); + draw_text_ext(xx+10, yy+40,_description,-1,area_width-20); + break; case P_features.Mission: var mission_description=$""; diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml index 2c867ab463..9a9da3ae01 100644 --- a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -132,7 +132,7 @@ function setup_star_planet_defualts(){ break; case "Craftworld": p_population[i] = irandom_range(150000, 300000); - p_station = 6; + p_station[i] = 6; p_max_population[i] = p_population[i]; break; } diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 66351a4e50..b871fc440a 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -59,7 +59,7 @@ function player_fleet_ship_spawner(){ if (col<5) then x2-=column_width[col]; if (column_num[col]>0){// Start ship creation - if (column[col]=="capital" || "Battle Barge"){ + if (column[col] == "capital" || column[col] == "Battle Barge"){ hei=160; sizz=3; } @@ -139,7 +139,7 @@ function ShipShieldGenerator(data) constructor{ draw_set_color(c_white); var shield_percent = $"{(shields/maxshields)*100}%" - draw_text_transformed(ship.x,ship.y-sprite_height,shield_percent,x_scale*obj_controller.scale_mod,y_scale*obj_controller.scale_mod,0); + draw_text_transformed(ship.x,ship.y-ship.sprite_height,shield_percent,x_scale*obj_controller.scale_mod,y_scale*obj_controller.scale_mod,0); } } From 35a6771dc8fba8e34431089f5b6f3230e9a2293a Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 24 May 2025 02:55:32 +0100 Subject: [PATCH 069/155] kill old fleet screen --- ChapterMaster.yyp | 1 + scripts/scr_DataSlate/scr_DataSlate.gml | 344 +++++++++++++ scripts/scr_DataSlate/scr_DataSlate.yy | 13 + .../scr_controller_helpers.gml | 61 +-- .../scr_draw_planet_features.gml | 346 ------------- .../scr_fleet_advisor/scr_fleet_advisor.gml | 453 ++++++++++-------- .../scr_player_fleet_combat_functions.gml | 31 +- .../scr_player_ship_functions.gml | 13 +- 8 files changed, 623 insertions(+), 639 deletions(-) create mode 100644 scripts/scr_DataSlate/scr_DataSlate.gml create mode 100644 scripts/scr_DataSlate/scr_DataSlate.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 159a645387..908b46c89b 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -774,6 +774,7 @@ {"id":{"name":"scr_creation","path":"scripts/scr_creation/scr_creation.yy",},}, {"id":{"name":"scr_crusade","path":"scripts/scr_crusade/scr_crusade.yy",},}, {"id":{"name":"scr_culture_visuals","path":"scripts/scr_culture_visuals/scr_culture_visuals.yy",},}, + {"id":{"name":"scr_DataSlate","path":"scripts/scr_DataSlate/scr_DataSlate.yy",},}, {"id":{"name":"scr_demand","path":"scripts/scr_demand/scr_demand.yy",},}, {"id":{"name":"scr_destroy_planet","path":"scripts/scr_destroy_planet/scr_destroy_planet.yy",},}, {"id":{"name":"scr_destroy_vehicle","path":"scripts/scr_destroy_vehicle/scr_destroy_vehicle.yy",},}, diff --git a/scripts/scr_DataSlate/scr_DataSlate.gml b/scripts/scr_DataSlate/scr_DataSlate.gml new file mode 100644 index 0000000000..444a43bd40 --- /dev/null +++ b/scripts/scr_DataSlate/scr_DataSlate.gml @@ -0,0 +1,344 @@ +function draw_building_builder(xx, yy, req_require, building_sprite){ + var clicked =false; + draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); + var image_bottom = yy+50; + var image_middle = xx-15; + if (obj_controller.requisition>=req_require){ + if (scr_hit(image_middle+30, image_bottom+28, image_middle+78, image_bottom+44)){ + draw_sprite_ext(spr_slate_2, 5, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + if (scr_click_left()){ + clicked=true; + } + } else { + draw_sprite_ext(spr_slate_2, 3, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + } + } else { + draw_sprite_ext(spr_slate_2, 7, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + } + draw_sprite_ext(spr_requisition,0,image_middle+65,image_bottom+30,1,1,0,c_white,1); + draw_set_halign(fa_left); + draw_text(image_middle+32, image_bottom+30, req_require); + return clicked; +} + +function DataSlateMKTwo()constructor{ + height=0; + width=0; + XX=0; + YY=0; + static entered = function(){ + return scr_hit(XX, YY, XX+width, YY+height); + } + static draw = function(xx,yy,x_scale=1, y_scale=1){ + XX=xx; + YY=yy; + height = 250*y_scale; + width=365*x_scale; + draw_sprite_ext(spr_slate_2, 1, xx, yy, x_scale, y_scale, 0, c_white, 1); + draw_sprite_ext(spr_slate_2, 0, xx, yy, x_scale, y_scale, 0, c_white, 1); + draw_sprite_ext(spr_slate_2, 2, xx, yy, x_scale, y_scale, 0, c_white, 1); + //draw_sprite_ext(spr_slate_2, 0, xx, yy, 1, 1, 0, c_white, 1) + } +} + +function RackAndPinion(Type="forward") constructor{ + reverse =false; + rack_y=0; + rotation = 360; + type=Type + if (type="forward"){ + draw = function(x, y, freeze=false, Reverse=""){ + x+=19; + if (!freeze){ + if (Reverse != ""){ + if (Reverse){ + reverse=true; + } else { + reverse=false; + } + } + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + if (!reverse){ + rotation-=4; + } else { + rotation+=4; + } + rack_y = (75.3982236862/360)*(360-rotation); + if (rack_y > 70){ + reverse = true; + } else if (rack_y < 2){ + reverse = false; + } + draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) + } else { + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) + } + } + } else if (type="backward"){ + draw = function(x, y, freeze=false, Reverse=""){ + x-=19; + if (!freeze){ + if (Reverse != ""){ + if (Reverse){ + reverse=true; + } else { + reverse=false; + } + } + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + if (!reverse){ + rotation+=4; + } else { + rotation-=4; + } + rack_y = (75.3982236862/360)*(360-rotation) + if (rack_y > 70){ + reverse = true; + } else if (rack_y < 2){ + reverse = false; + } + draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) + } else { + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) + } + } + } +} +function SpeedingDot(XX,YY, limit) constructor{ + bottom_limit = limit; + stack = 0; + yyy=YY; + xxx=XX; + draw = function(xx,yy){ + if (bottom_limit+(48*0.7)0 ? 36-stack :0; + var bottom_cut = bottom_limit 1*flash_modifier){ + flash_size-=flash_modifier; + }else { + flash_size+=flash_modifier; + flash = 0; + } + } + draw_set_alpha(1); + } + draw_one_flash = function(xx, yy){ + if (one_flash_finished) then exit; + draw_set_color(c_green); + for (var i=0; i<=flash_size;i++){ + draw_set_alpha(1 - ((1/40)*i)) + draw_circle(xx, yy, (i/3), 1); + } + if (flash==0){ + if (flash_size<40){ + flash_size++; + } else { + flash = 1; + flash_size--; + } + } else { + if (flash_size > 1){ + flash_size--; + }else { + flash_size++; + flash = 0; + one_flash_finished = true; + } + } + } +} + +function ShutterButton() constructor{ + time_open = 0; + click_timer = 0; + Width = 315; + Height = 90; + XX=0; + YY=0; + width=0; + height=0; + right_rack = new RackAndPinion(); + left_rack = new RackAndPinion("backward"); + draw_shutter = function(xx,yy,text, scale=1, entered = ""){ + XX=xx; + YY=yy; + draw_set_alpha(1); + + draw_set_font(fnt_40k_12); + draw_set_halign(fa_left); + draw_set_color(c_gray); + width = Width *scale; + height = Height *scale; + if (text=="") then entered = false; + if (entered==""){ + entered = scr_hit(xx, yy, xx+width, yy+height); + } else { + entered=entered; + } + var shutter_backdrop = 5; + if (entered || click_timer>0){ + if (time_open<20){ + time_open++; + right_rack.draw(xx+width, yy, false, false); + left_rack.draw(xx, yy, false, false); + } else { + right_rack.draw(xx+width, yy, true); + left_rack.draw(xx, yy, true); + } + if (point_and_click([xx, yy, xx+width, yy+height]) || click_timer>0 ){ + shutter_backdrop = 6; + click_timer++; + } + } else if (time_open>0){ + time_open--; + right_rack.draw(xx+width, yy, false, true); + left_rack.draw(xx, yy, false, true); + } else { + right_rack.draw(xx+width, yy, true); + left_rack.draw(xx, yy, true); + } + var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); + var main_sprite = 0; + if (time_open<2){ + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) + } else if (time_open<8 && time_open>=2){ + main_sprite=1; + }else if (time_open<13 && time_open>=8){ + main_sprite=2; + }else if (time_open<18 && time_open>=13){ + main_sprite=3; + } else if (time_open>=18){ + main_sprite=4; + } + if (time_open>=2){ + draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) + draw_set_color(c_red); + if (click_timer>0){ + draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); + } else { + draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); + } + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) + } + draw_set_color(c_grey); + if (click_timer>7){ + click_timer = 0; + return true; + } else { + return false; + } + } +} + +function DataSlate() constructor{ + static_line=1; + title=""; + sub_title=""; + body_text = ""; + inside_method = ""; + XX=0; + YY=0; + width=0; + height=0; + percent_cut=0; + + static entered = function(){ + return (scr_hit( + XX-4, + YY, + XX + width, + YY + height, + )); + } + static draw_with_dimensions = function(xx,yy, width , height){ + var _scale_x = width/860; + var _scale_y = height/850; + draw(xx,yy, _scale_x, _scale_y); + } + static draw = function(xx,yy, scale_x=1, scale_y=1){ + XX=xx; + YY=yy; + width = 860*scale_x; + height = 850*scale_y; + draw_sprite_ext(spr_data_slate,1, xx,yy, scale_x, scale_y, 0, c_white, 1); + if (is_callable(inside_method)){ + inside_method(); + } + if (static_line<=10) then draw_set_alpha(static_line/10); + if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); + draw_set_color(5998382); + var line_move = yy+(70*scale_y)+((36*scale_y)*static_line); + draw_line(xx+(30*scale_x),line_move,xx+(820*scale_x),line_move); + draw_set_alpha(1); + if (irandom(75)=0 && static_line>1){static_line--;} + else{ + static_line+=0.1; + } + if (static_line>20) then static_line=1; + draw_set_color(c_gray); + draw_set_halign(fa_center); + var draw_height = 5; + if (title!=""){ + draw_text_transformed(xx+(0.5*width), yy+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); + draw_height += (string_height(title)*3)*scale_y; + } + if (sub_title!=""){ + draw_text_transformed(xx+(0.5*width), yy+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); + draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; + } + if (body_text!=""){ + draw_text_ext(xx+(0.5*width), yy+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); + } + } + static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ + XX=xx; + YY=yy; + draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); + width = 860*scale_x; + height = (69+(683*(middle_percent/100))+98 )*scale_y; + if (is_callable(inside_method)){ + inside_method(); + } + } + + static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ + percent_cut = min(percent_cut+mod_edit, 100); + if (!percent_cut) then percent_cut=0; + draw_cut(xx,yy, scale_x, scale_y); + } +} + + + diff --git a/scripts/scr_DataSlate/scr_DataSlate.yy b/scripts/scr_DataSlate/scr_DataSlate.yy new file mode 100644 index 0000000000..d36967fe94 --- /dev/null +++ b/scripts/scr_DataSlate/scr_DataSlate.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_DataSlate", + "isCompatibility":false, + "isDnD":false, + "name":"scr_DataSlate", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_controller_helpers/scr_controller_helpers.gml b/scripts/scr_controller_helpers/scr_controller_helpers.gml index 02bf966cb2..1fb8b403fc 100644 --- a/scripts/scr_controller_helpers/scr_controller_helpers.gml +++ b/scripts/scr_controller_helpers/scr_controller_helpers.gml @@ -357,69 +357,12 @@ function scr_toggle_fleet_area() { if (menu != 16) { //TODO rewrite all this shit when fleets finally become OOP menu = 16; + fleet_advisor_data_setup(); + cooldown = 8000; click = 1; - for (var i = 37; i <= 41; i++) { - temp[i] = ""; - } - - for (var i = 101; i < 120; i++) { - temp[i] = ""; - } - - var g = 0, - u = 0, - m = 0, - d = 0; - temp[37] = 0; - temp[38] = 0; - temp[39] = 0; - for (var i = 0; i < array_length(obj_ini.ship_data); i++) { - var _ship = obj_ini.ship_data[i]; - - switch(_ship.size){ - case 3: - temp[37]++; - break; - case 2: - temp[38]++; - break; - case 1: - temp[39]++; - break; - } - - } - g = 0; - temp[41] = "1"; - for (var i = 0; i < array_length(obj_ini.ship_data); i++) { - var _ship = fetch_ship(i); - if ((g != 0)) { - if ((_ship.ship_hp_percentage()) < u) { - g = i; - u = _ship.ship_hp_percentage(); - } - } - if ((g == 0)) { - g = i; - u = _ship.ship_hp_percentage(); - } - - m = i; - - if ((_ship.ship_hp_percentage() < 0.25)) { - d += 1; - } - } - if (g != 0) { - temp[40] = $"{_ship.class} ' {_ship.name}"; - temp[41] = string(u); - temp[42] = string(d); - } - man_max = m; - man_current = 0; } else if (menu == 16) { menu = 0; diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index f0388ef146..76a8a6c71f 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -342,349 +342,3 @@ function FeatureSelected(Feature, system, planet) constructor{ } } -function draw_building_builder(xx, yy, req_require, building_sprite){ - var clicked =false; - draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); - var image_bottom = yy+50; - var image_middle = xx-15; - if (obj_controller.requisition>=req_require){ - if (scr_hit(image_middle+30, image_bottom+28, image_middle+78, image_bottom+44)){ - draw_sprite_ext(spr_slate_2, 5, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - if (scr_click_left()){ - clicked=true; - } - } else { - draw_sprite_ext(spr_slate_2, 3, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - } else { - draw_sprite_ext(spr_slate_2, 7, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - draw_sprite_ext(spr_requisition,0,image_middle+65,image_bottom+30,1,1,0,c_white,1); - draw_set_halign(fa_left); - draw_text(image_middle+32, image_bottom+30, req_require); - return clicked; -} - -function DataSlateMKTwo()constructor{ - height=0; - width=0; - XX=0; - YY=0; - static entered = function(){ - return scr_hit(XX, YY, XX+width, YY+height); - } - static draw = function(xx,yy,x_scale=1, y_scale=1){ - XX=xx; - YY=yy; - height = 250*y_scale; - width=365*x_scale; - draw_sprite_ext(spr_slate_2, 1, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 0, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 2, xx, yy, x_scale, y_scale, 0, c_white, 1); - //draw_sprite_ext(spr_slate_2, 0, xx, yy, 1, 1, 0, c_white, 1) - } -} - -function RackAndPinion(Type="forward") constructor{ - reverse =false; - rack_y=0; - rotation = 360; - type=Type - if (type="forward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x+=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation-=4; - } else { - rotation+=4; - } - rack_y = (75.3982236862/360)*(360-rotation); - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } - } - } else if (type="backward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x-=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation+=4; - } else { - rotation-=4; - } - rack_y = (75.3982236862/360)*(360-rotation) - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } - } - } -} -function SpeedingDot(XX,YY, limit) constructor{ - bottom_limit = limit; - stack = 0; - yyy=YY; - xxx=XX; - draw = function(xx,yy){ - if (bottom_limit+(48*0.7)0 ? 36-stack :0; - var bottom_cut = bottom_limit 1*flash_modifier){ - flash_size-=flash_modifier; - }else { - flash_size+=flash_modifier; - flash = 0; - } - } - draw_set_alpha(1); - } - draw_one_flash = function(xx, yy){ - if (one_flash_finished) then exit; - draw_set_color(c_green); - for (var i=0; i<=flash_size;i++){ - draw_set_alpha(1 - ((1/40)*i)) - draw_circle(xx, yy, (i/3), 1); - } - if (flash==0){ - if (flash_size<40){ - flash_size++; - } else { - flash = 1; - flash_size--; - } - } else { - if (flash_size > 1){ - flash_size--; - }else { - flash_size++; - flash = 0; - one_flash_finished = true; - } - } - } -} - -function ShutterButton() constructor{ - time_open = 0; - click_timer = 0; - Width = 315; - Height = 90; - XX=0; - YY=0; - width=0; - height=0; - right_rack = new RackAndPinion(); - left_rack = new RackAndPinion("backward"); - draw_shutter = function(xx,yy,text, scale=1, entered = ""){ - XX=xx; - YY=yy; - draw_set_alpha(1); - - draw_set_font(fnt_40k_12); - draw_set_halign(fa_left); - draw_set_color(c_gray); - width = Width *scale; - height = Height *scale; - if (text=="") then entered = false; - if (entered==""){ - entered = scr_hit(xx, yy, xx+width, yy+height); - } else { - entered=entered; - } - var shutter_backdrop = 5; - if (entered || click_timer>0){ - if (time_open<20){ - time_open++; - right_rack.draw(xx+width, yy, false, false); - left_rack.draw(xx, yy, false, false); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - if (point_and_click([xx, yy, xx+width, yy+height]) || click_timer>0 ){ - shutter_backdrop = 6; - click_timer++; - } - } else if (time_open>0){ - time_open--; - right_rack.draw(xx+width, yy, false, true); - left_rack.draw(xx, yy, false, true); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); - var main_sprite = 0; - if (time_open<2){ - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } else if (time_open<8 && time_open>=2){ - main_sprite=1; - }else if (time_open<13 && time_open>=8){ - main_sprite=2; - }else if (time_open<18 && time_open>=13){ - main_sprite=3; - } else if (time_open>=18){ - main_sprite=4; - } - if (time_open>=2){ - draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) - draw_set_color(c_red); - if (click_timer>0){ - draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); - } else { - draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); - } - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } - draw_set_color(c_grey); - if (click_timer>7){ - click_timer = 0; - return true; - } else { - return false; - } - } -} - -function DataSlate() constructor{ - static_line=1; - title=""; - sub_title=""; - body_text = ""; - inside_method = ""; - XX=0; - YY=0; - width=0; - height=0; - percent_cut=0; - - static entered = function(){ - return (scr_hit( - XX-4, - YY, - XX + width, - YY + height, - )); - } - static draw = function(xx,yy, scale_x=1, scale_y=1){ - XX=xx; - YY=yy; - width = 860*scale_x; - height = 850*scale_y; - draw_sprite_ext(spr_data_slate,1, xx,yy, scale_x, scale_y, 0, c_white, 1); - if (is_callable(inside_method)){ - inside_method(); - } - if (static_line<=10) then draw_set_alpha(static_line/10); - if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); - draw_set_color(5998382); - var line_move = yy+(70*scale_y)+((36*scale_y)*static_line); - draw_line(xx+(30*scale_x),line_move,xx+(820*scale_x),line_move); - draw_set_alpha(1); - if (irandom(75)=0 && static_line>1){static_line--;} - else{ - static_line+=0.1; - } - if (static_line>20) then static_line=1; - draw_set_color(c_gray); - draw_set_halign(fa_center); - var draw_height = 5; - if (title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); - draw_height += (string_height(title)*3)*scale_y; - } - if (sub_title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); - draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; - } - if (body_text!=""){ - draw_text_ext(xx+(0.5*width), yy+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); - } - } - static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ - XX=xx; - YY=yy; - draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); - width = 860*scale_x; - height = (69+(683*(middle_percent/100))+98 )*scale_y; - if (is_callable(inside_method)){ - inside_method(); - } - } - - static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ - percent_cut = min(percent_cut+mod_edit, 100); - if (!percent_cut) then percent_cut=0; - draw_cut(xx,yy, scale_x, scale_y); - } -} - - - - - - - - - - diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index eb9f7be5aa..36fdc80b0d 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -1,3 +1,78 @@ +function fleet_advisor_data_setup(){ + fleet_temps = { + capitals : 0, + frigates : 0, + escorts : 0, + ships_with_damage : false, + heavy_damaged_ships : 0, + most_damaged_ship : -1, + view_ship : -1, + view_ship_struct : false, + view_ship_occupants : "", + } + ship_slate = new DataSlate(); + list_slate = new DataSlate(); + for (var i = 0; i < array_length(obj_ini.ship_data); i++) { + var _ship = obj_ini.ship_data[i]; + + switch(_ship.size){ + case 3: + fleet_temps.capitals++; + break; + case 2: + fleet_temps.frigates++; + break; + case 1: + fleet_temps.escorts++; + break; + } + + } + + var _most_damage = 100; + for (var i = 0; i < array_length(obj_ini.ship_data); i++) { + var _ship = fetch_ship(i); + var _percent = _ship.ship_hp_percentage(); + if (_percent<100 && !fleet_temps.ships_with_damage){ + fleet_temps.ships_with_damage = true; + } + if (_percent<25){ + fleet_temps.heavy_damaged_ships++; + } + if (_percent<_most_damage){ + fleet_temps.most_damaged_ship = i; + _most_damage = _percent; + } + } + man_max = i; + man_current = 0; + var _text = "Greetings, Chapter Master.\n\nYou requested a report? Our fleet contains "; + _text += $"Your fleet contains {fleet_temps.capitals} Capital Ships, {fleet_temps.frigates} Frigates, and {fleet_temps.escorts} Escorts"; + if (fleet_temps.ships_with_damage == 0){ + _text += ", none of which are damaged."; + } + if (_most_damage < 100){ + _text += $". Our most damaged vessel is the {fetch_ship(fleet_temps.most_damaged_ship).name} - it has {_most_damage}% Hull Integrity."; + } + + if (fleet_temps.heavy_damaged_ships == 2){ + _text += " Two of our ships are highly damaged. You may wish to purchase a Repair License from the Sector Governerner."; + } + if (fleet_temps.heavy_damaged_ships > 2){ + _text += " Several of our ships are highly damaged. It is advisable that you purchase a Repair License from the Sector Governer."; + } + + _text += "\n\nHere are the current positions of our ships and their contents:"; + if (menu_adept = 1) { + _text = string_replace(_text, "Our", "Your"); + _text = string_replace(_text, " our", " your"); + _text = string_replace(_text, "We", "You"); + } + fleet_temps.advisor_text = _text; +} + + + // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information /// @mixin @@ -6,19 +81,6 @@ function scr_fleet_advisor(){ var xx = __view_get(e__VW.XView, 0) + 0; var yy = __view_get(e__VW.YView, 0) + 0; draw_sprite(spr_rock_bg, 0, xx, yy); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 0); - draw_set_alpha(1); - draw_set_color(c_gray); - draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 1); - draw_line(xx + 326 + 16, yy + 426, xx + 887 + 16, yy + 426); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 0); - draw_set_alpha(1); - draw_set_color(c_gray); - draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 1); if (menu_adept = 0) { if(struct_exists(obj_ini.custom_advisors, "admiral")){ @@ -32,7 +94,6 @@ function scr_fleet_advisor(){ draw_text_transformed(xx + 336 + 16, yy + 66, "Flagship Bridge", 1, 1, 0); draw_text_transformed(xx + 336 + 16, yy + 100, $"Master of the Fleet {obj_ini.lord_admiral_name}", 0.6, 0.6, 0); draw_set_font(fnt_40k_14); - blurp = "Greetings, Chapter Master.\n\nYou requested a report? Our fleet contains "; } if (menu_adept = 1) { scr_image("advisor/splash", 1, xx + 16, yy + 43, 310, 828); @@ -43,30 +104,9 @@ function scr_fleet_advisor(){ draw_text_transformed(xx + 336 + 16, yy + 40, "Flagship Bridge", 1, 1, 0); draw_text_transformed(xx + 336 + 16, yy + 100, $"Adept {obj_controller.adept_name}" , 0.6, 0.6, 0); draw_set_font(fnt_40k_14); - blurp = "Your fleet contains "; } - blurp += string(temp[37]) + " Capital Ships, "; - blurp += string(temp[38]) + " Frigates, and "; - blurp += string(temp[39]) + " Escorts"; - - va = real(temp[41]); - - if (va >= 1) then blurp += ", none of which are damaged."; - if (va < 1) then blurp += $". Our most damaged vessel is the {temp[40]} - it has {min(99, round(va * 100))}% Hull Integrity."; - - va = real(temp[42]); - if (va = 2) then blurp += " Two of our ships are highly damaged. You may wish to purchase a Repair License from the Sector Governerner."; - if (va > 2) then blurp += " Several of our ships are highly damaged. It is advisable that you purchase a Repair License from the Sector Governer."; - blurp += "\n\nHere are the current positions of our ships and their contents:"; - - if (menu_adept = 1) { - blurp = string_replace(blurp, "Our", "Your"); - blurp = string_replace(blurp, " our", " your"); - blurp = string_replace(blurp, "We", "You"); - } - - draw_text_ext(xx + 336 + 16, yy + 130, blurp, -1, 536); + draw_text_ext(xx + 336 + 16, yy + 130, fleet_temps.advisor_text, -1, 536); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); @@ -80,203 +120,212 @@ function scr_fleet_advisor(){ // TODO: Probably a good idea to turn this whole interactive list/sheet generating logic into a constructor, that can be reused on many screens. // I have no passion for this atm. - var _columns = { - name: { - w: 176, - text: "Name", - h_align: fa_left, - }, - class: { - w: 154, - text: "Class", - h_align: fa_left, - }, - location: { - w: 130, - text: "Location", - h_align: fa_left, - }, - hp: { - w: 44, - text: "HP", - h_align: fa_right, - }, - carrying: { - w: 84, - text: "Carrying", - h_align: fa_right, - }, - }; - - var _column_x = xx + 953; - var _header_offset = 80; - var _columns_array = ["name", "class", "location", "hp", "carrying"]; - - for (var i = 0; i < array_length(_columns_array); i++) { - with(_columns[$ _columns_array[i]]) { - x1 = _column_x; - _column_x += w; - x2 = x1 + w; - y1 = yy + _header_offset; - header_y = (y1 - 2); - switch (h_align) { - case fa_right: - header_x = x2; - break; - case fa_center: - header_x = (x1 + x2) / 2; - break; - case fa_left: - default: - header_x = x1; - break; - } - draw_set_halign(h_align); - draw_text(header_x, header_y, text); - } - } - draw_set_halign(fa_left); - - var _row_height = 20; - var _row_gap = 2; - for (var i = ship_current; i < ship_current + 34; i++) { - if (i>= array_length(obj_ini.ship_data)) then continue; - - var _row_y = _columns[$ "name"].y1 + _row_height + (i * (_row_height + _row_gap)); - draw_rectangle(xx + 950, _row_y, xx + 1546, _row_y + _row_height, 1); - - var _goto_button = { - x1: _columns.location.x1 - 20, - y1: _row_y + 4, - sprite: spr_view_small, - click: function() { - return point_and_click([x1, y1, x2, y2]); - } + list_slate.inside_method = function(){ + + var _columns = { + name: { + w: 176, + text: "Name", + h_align: fa_left, + y1 : 0, + }, + class: { + w: 154, + text: "Class", + h_align: fa_left, + y1 : 0, + }, + location: { + w: 130, + text: "Location", + h_align: fa_left, + y1 : 0, + }, + hp: { + w: 44, + text: "HP", + h_align: fa_right, + y1 : 0, + }, + carrying: { + w: 84, + text: "Carrying", + h_align: fa_right, + y1 : 0, + }, }; - with(_goto_button) { - w = sprite_get_width(sprite); - h = sprite_get_height(sprite); - x2 = x1 + w; - y2 = y1 + h; - draw_sprite(sprite, 0, x1, y1); - } - var _ship = obj_ini.ship_data[i]; - - with(_columns) { - name.contents = string_truncate(_ship.name, _columns.name.w - 6); - class.contents = _ship.class; - location.contents = _ship.location; - hp.contents = $"{round(_ship.hp / _ship.max_hp * 100)}%"; - carrying.contents = $"{_ship.carrying}/{_ship.capacity}"; - } - for (var g = 0; g < array_length(_columns_array); g++) { - with(_columns[$ _columns_array[g]]) { - draw_set_halign(h_align); + var _column_x = list_slate.XX + 10 + var yy = list_slate.YY; + var _header_offset = 80; + var _columns_array = ["name", "class", "location", "hp", "carrying"]; + + for (var i = 0; i < array_length(_columns_array); i++) { + with(_columns[$ _columns_array[i]]) { + x1 = _column_x; + _column_x += w; + x2 = x1 + w; + y1 = yy + _header_offset; + header_y = (y1 - 2); switch (h_align) { case fa_right: - draw_text(x2, _row_y, contents); + header_x = x2; break; case fa_center: - draw_text((x1 + x2) / 2, _row_y, contents); + header_x = (x1 + x2) / 2; break; case fa_left: default: - draw_text(x1, _row_y, contents); + header_x = x1; break; - } + } + draw_set_halign(h_align); + draw_text(header_x, header_y, text); } } + draw_set_halign(fa_left); - if scr_hit(xx + 950, _row_y, xx + 1546, _row_y + _row_height) { - var _struct = obj_ini.ship_data[i]; - if (temp[101] != _struct.name) { - temp[101] = _struct.name; - temp[102] = _struct.class; - - temp[103] = _struct.hp; - temp[104] = _struct.max_hp; - temp[105] = _struct.shields * 100; - - temp[106] = string(_struct.max_speed); - - temp[107] = string(_struct.front_armour); - temp[108] = string(_struct.side_armour); + var _row_height = 20; + var _row_gap = 2; + for (var i = ship_current; i < ship_current + 34; i++) { + if (i >= array_length(obj_ini.ship_data)){ + continue; + } - temp[109] = string(array_length(_struct.turrets)); + var _row_y = _columns.name.y1 + _row_height + (i * (_row_height + _row_gap)); + draw_rectangle(xx + 25, _row_y, xx + 1546, _row_y + _row_height, 1); - temp[110] = _struct.weapons; + var _goto_button = { + x1: _columns.location.x1 - 20, + y1: _row_y + 4, + sprite: spr_view_small, + click: function() { + return point_and_click([x1, y1, x2, y2]); + } + }; + with(_goto_button) { + w = sprite_get_width(sprite); + h = sprite_get_height(sprite); + x2 = x1 + w; + y2 = y1 + h; + draw_sprite(sprite, 0, x1, y1); + } + var _ship = obj_ini.ship_data[i]; + + with(_columns) { + name.contents = string_truncate(_ship.name, _columns.name.w - 6); + class.contents = _ship.class; + location.contents = _ship.location; + hp.contents = $"{round(_ship.hp / _ship.max_hp * 100)}%"; + carrying.contents = $"{_ship.carrying}/{_ship.capacity}"; + } - temp[118] = $"{_struct.carrying}/{_struct.capacity}"; - temp[119] = ""; - if (_struct.carrying > 0) then temp[119] = scr_ship_occupants(i); + for (var g = 0; g < array_length(_columns_array); g++) { + with(_columns[$ _columns_array[g]]) { + draw_set_halign(h_align); + switch (h_align) { + case fa_right: + draw_text(x2, _row_y, contents); + break; + case fa_center: + draw_text((x1 + x2) / 2, _row_y, contents); + break; + case fa_left: + default: + draw_text(x1, _row_y, contents); + break; + } + } } - tooltip_draw($"Carrying ({temp[118]}): {temp[119]}"); - if (_goto_button.click()) { - with(obj_p_fleet) { - var _fleet_ships = fleet_full_ship_array(); - if (array_contains(_fleet_ships, i)){ - obj_controller.x = x; - obj_controller.y = y; - obj_controller.menu = 0; - with(obj_fleet_show) { - instance_destroy(); - } - instance_create(x, y, obj_fleet_show); + + if scr_hit(xx + 25, _row_y, xx + 1546, _row_y + _row_height) { + var _struct = obj_ini.ship_data[i]; + if (fleet_temps.view_ship != i){ + fleet_temps.view_ship = i; + fleet_temps.view_ship_struct = _struct; + fleet_temps.view_ship_occupants = scr_ship_occupants(i); + } + tooltip_draw($"Carrying ({_struct.carrying}/{_struct.capacity}"); + if (_goto_button.click()) { + with(obj_p_fleet) { + var _fleet_ships = fleet_full_ship_array(); + if (array_contains(_fleet_ships, i)){ + obj_controller.x = x; + obj_controller.y = y; + obj_controller.menu = 0; + with(obj_fleet_show) { + instance_destroy(); + } + instance_create(x, y, obj_fleet_show); + } } } } - } + } } - if (temp[101] != "") { - draw_set_font(fnt_40k_30b); - draw_set_halign(fa_center); - draw_text_transformed(xx + 622, yy + 434, temp[101], 0.75, 0.75, 0); - draw_text_transformed(xx + 622, yy + 464, temp[102], 0.5, 0.5, 0); - draw_set_color(c_gray); - draw_rectangle(xx + 488, yy + 492, xx + 756, yy + 634, 1); - var ships = ["Battle Barge", "Strike Cruiser","Gladius","Hunter"]; - var ship_im = 0; - for (var i=0;i-1) { + var _ship = fleet_temps.view_ship_struct; + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + draw_text_transformed(xx + 280, yy + 368, _ship.name, 0.75, 0.75, 0); + draw_text_transformed(xx + 280, yy + 398, _ship.class, 0.5, 0.5, 0); + + draw_set_color(c_gray); + draw_rectangle(xx + 488, yy + 492, xx + 756, yy + 634, 1); + var ships = ["Battle Barge", "Strike Cruiser","Gladius","Hunter"]; + var ship_im = 0; + for (var i=0;i0){ @@ -355,7 +358,8 @@ function new_player_ship(type, start_loc="home", new_name=""){ front_armour = 4; side_armour = 3; rear_armour = 1; - shields = 1; + shields = 1; + sprite_index=spr_ship_hunt; } @@ -379,7 +383,8 @@ function new_player_ship(type, start_loc="home", new_name=""){ front_armour = 6; side_armour = 8; rear_armour = 2; - shields = 24; + shields = 24; + sprite_index=spr_ship_song; } } From 022cbe7b4d9cf0e6b3be536a04c1207892c95b04 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 24 May 2025 13:39:18 +0100 Subject: [PATCH 070/155] rethink weapon equip spots --- scripts/scr_ShipStruct/scr_ShipStruct.gml | 50 ++++++ .../scr_fleet_advisor/scr_fleet_advisor.gml | 17 +- .../scr_player_ship_functions.gml | 167 +++++++++++++++--- .../scr_ship_weapon_struct.gml | 4 +- sprites/spr_ship_bb/spr_ship_bb.yy | 2 +- 5 files changed, 204 insertions(+), 36 deletions(-) diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 2a6fd70ceb..e295da6af7 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -34,6 +34,9 @@ function ShipStruct() constructor{ shields_reboot_time = 20; captain = false; engineer = false; + left_broad_positions = []; + right_broad_positions = []; + forward_positions = []; uid = floor(random(99999999))+1; @@ -78,4 +81,51 @@ function ShipStruct() constructor{ } return _final_speed; } + + static add_weapon_to_slot = function(weapon_name,overide_data,slot){ + var _s_data = slot; + with (overide_data){ + move_data_to_current_scope(_s_data); + } + var _wep = new ShipWeapon(weapon_name, overide_data); + array_push(weapons, _wep); + slot.weapon = _wep; + } + + static draw_ui_manage = function(x, y){ + var _x_offset = sprite_get_xoffset(sprite_index); + var _y_offset = sprite_get_yoffset(sprite_index); + draw_sprite(sprite_index, 0, x+280, y+180); + var _draw_corner = [x+280 - _x_offset, y+180-_y_offset]; + var _l_length = array_length(left_broad_positions); + var _r_length = array_length(right_broad_positions); + var _f_length = array_length(forward_positions); + var iter = max(_l_length, _r_length, _f_length); + var draw_weapon_box = function(pos, corner){ + var coords = pos.ship_position; + var draw_coords = [corner[0]+ coords[0]-10, corner[1]+coords[1]-10, corner[0]+coords[0]+10, corner[1]+coords[1]+10]; + if (scr_hit(draw_coords)){ + draw_set_colour(c_green); + tooltip_draw("click to equip new weapon"); + obj_controller.weapon_slate.weapon = pos.weapon; + } else { + draw_set_colour(c_blue); + } + draw_rectangle(corner[0]+ coords[0]-10, corner[1]+coords[1]-10, corner[0]+coords[0]+10, corner[1]+coords[1]+10, true); + } + for (var i=0;i-1) { var _ship = fleet_temps.view_ship_struct; draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); - draw_text_transformed(xx + 280, yy + 368, _ship.name, 0.75, 0.75, 0); - draw_text_transformed(xx + 280, yy + 398, _ship.class, 0.5, 0.5, 0); + draw_text_transformed(xx + 280, yy + 30, _ship.name, 0.75, 0.75, 0); + draw_text_transformed(xx + 280, yy + 60, _ship.class, 0.5, 0.5, 0); draw_set_color(c_gray); draw_rectangle(xx + 488, yy + 492, xx + 756, yy + 634, 1); @@ -289,7 +292,7 @@ function scr_fleet_advisor(){ } } draw_set_color(c_white); - draw_sprite(spr_ship_back_white, ship_im, xx + 488, yy + 492); + draw_sprite(spr_ship_back_white, ship_im, _center_x, yy + 492); draw_set_color(c_gray); draw_set_font(fnt_40k_14); @@ -322,7 +325,7 @@ function scr_fleet_advisor(){ draw_set_font(fnt_40k_14); */ - draw_sprite(_ship.sprite_index, 0, xx+280, yy+180); + _ship.draw_ui_manage(xx, yy); } } ship_slate.draw_with_dimensions(xx + 342, yy + 66, 561, 752); diff --git a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml index 1c0c1d0d69..eec3f0f3f1 100644 --- a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml +++ b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml @@ -247,32 +247,128 @@ function new_player_ship(type, start_loc="home", new_name=""){ _struct.location = start_loc; _struct.name=new_name; _struct.class = type; + if (string_count("Battle Barge",type)>0){ with(_struct){ - left_broad_positions = [[162, 36],[173, 36],[185,36],[197, 36],[210,36],[222, 36]]; - right_broad_positions = [[162, 75],[173, 75],[185,75],[197, 75],[210,75],[222, 75]]; + left_broad_positions = [ + { + ship_position : [162, 36], + slot_size : 2, + weapon : false; + facing : "left" + }, + { + ship_position : [173, 36], + slot_size : 2, + weapon : false; + facing : "left" + }, + { + ship_position : [185,36], + slot_size : 2, + weapon : false; + facing : "left" + }, + { + ship_position : [197, 36], + slot_size : 2, + weapon : false; + facing : "left" + }, + { + ship_position : [210,36], + slot_size : 2, + weapon : false; + facing : "left" + }, + { + ship_position : [222, 36], + slot_size : 2, + weapon : false; + facing : "left" + }, + ]; + right_broad_positions = [ + { + ship_position : [162, 75], + slot_size : 2, + weapon : false; + facing : "right" + }, + { + ship_position : [173, 75], + slot_size : 2, + weapon : false; + facing : "right" + }, + { + ship_position : [185,75], + slot_size : 2, + weapon : false; + facing : "right" + }, + { + ship_position : [197, 75], + slot_size : 2, + weapon : false; + facing : "right" + }, + { + ship_position : [210,75], + slot_size : 2, + weapon : false; + facing : "right" + }, + { + ship_position : [222, 75], + slot_size : 2, + weapon : false; + facing : "right" + }, + ]; var _broadsl = left_broad_positions; var _broadsr = right_broad_positions; for (var i=0;i0){ with(_struct){ - left_broad_positions = [[56, 16],[65, 16],[74,16],[83, 16]]; + left_broad_positions = [ + { + ship_position : [56, 37], + slot_size : 2, + weapon : false; + facing : "left" + }, + { + ship_position : [65, 37], + slot_size : 2, + weapon : false; + facing : "left" + }, + { + ship_position : [74,37], + slot_size : 2, + weapon : false; + facing : "left" + }, + { + ship_position : [83, 37], + slot_size : 2, + weapon : false; + facing : "left" + }, + ] right_broad_positions = [[56, 37],[65, 37],[74,37],[83, 37]]; var _broadsl = left_broad_positions; var _broadsr = right_broad_positions; for (var i=0;i Date: Sun, 25 May 2025 00:19:51 +0100 Subject: [PATCH 071/155] changing weapons ui --- objects/obj_p_ship/Step_0.gml | 3 +- scripts/scr_ShipStruct/scr_ShipStruct.gml | 32 +++++++++ .../scr_fleet_advisor/scr_fleet_advisor.gml | 35 +++++++--- .../scr_player_ship_functions.gml | 69 +++++++++++++------ .../scr_ship_weapon_struct.gml | 3 +- sprites/spr_mk3_complex/spr_mk3_complex.yy | 2 + 6 files changed, 110 insertions(+), 34 deletions(-) diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index a3858635b3..7cacf081c9 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -207,7 +207,8 @@ if (instance_exists(obj_en_ship)) and (boarders>0) and (board_cooldown<=0) and ( te=instance_nearest(x,y,obj_en_capital); } } - if (eh=2) and (board_frigate=true){if (instance_exists(obj_en_cruiser)) then te=instance_nearest(x,y,obj_en_cruiser);} + if (eh=2) and (board_frigate=true){ + if (instance_exists(obj_en_cruiser)) then te=instance_nearest(x,y,obj_en_cruiser);} if (te!=0) and (instance_exists(te)){ if (point_distance(x,y,te.x,te.y)<=428){ create_boarding_craft(te); diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index e295da6af7..b9d3ddda8c 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -11,6 +11,14 @@ function get_ship_by_name(ship_name){ } } +function convert_to_kilometers(pix_distance){ + return pix_distance/50; +} + +function per_step_to_kilometers(rate_dist){ + return convert_to_kilometers((rate_dist*60)); +} + function ShipStruct() constructor{ features = []; turrets = []; @@ -108,23 +116,47 @@ function ShipStruct() constructor{ draw_set_colour(c_green); tooltip_draw("click to equip new weapon"); obj_controller.weapon_slate.weapon = pos.weapon; + obj_controller.weapon_slate.slot = pos; + } else { draw_set_colour(c_blue); } draw_rectangle(corner[0]+ coords[0]-10, corner[1]+coords[1]-10, corner[0]+coords[0]+10, corner[1]+coords[1]+10, true); } + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_left); + var _h_scale = 0.6; + draw_text_transformed(x + 30, y + 350, "Left Batteries", _h, _h, 0); + draw_text_transformed(x + 200, y + 350, "Forward Batteries", _h, _h, 0); + draw_text_transformed(x + 370, y + 350, "Right Batteries", _h, _h, 0); + draw_set_font(fnt_40k_12); for (var i=0;i Date: Sun, 25 May 2025 12:43:45 +0100 Subject: [PATCH 072/155] display ship stats --- scripts/scr_ShipStruct/scr_ShipStruct.gml | 25 ++++++++++------- .../scr_fleet_advisor/scr_fleet_advisor.gml | 27 +++++++------------ 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index b9d3ddda8c..9c726e840e 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -32,14 +32,18 @@ function ShipStruct() constructor{ max_hp = 0; acceleration = 0.008; max_speed = 20; + turning_speed = 0.2; + front_armour = 6; side_armour = 3; rear_armour = 1; + name = ""; shields = 0; shields_damage = 0; shields_recharge_rate = 0.2; shields_reboot_time = 20; + captain = false; engineer = false; left_broad_positions = []; @@ -111,24 +115,25 @@ function ShipStruct() constructor{ var iter = max(_l_length, _r_length, _f_length); var draw_weapon_box = function(pos, corner){ var coords = pos.ship_position; - var draw_coords = [corner[0]+ coords[0]-10, corner[1]+coords[1]-10, corner[0]+coords[0]+10, corner[1]+coords[1]+10]; + var _box_size = pos.slot_size *3; + var draw_coords = [corner[0]+ coords[0]-_box_size, corner[1]+coords[1]-_box_size, corner[0]+coords[0]+_box_size, corner[1]+coords[1]+_box_size]; if (scr_hit(draw_coords)){ draw_set_colour(c_green); - tooltip_draw("click to equip new weapon"); + tooltip_draw("Emplacement direction : {pos.facing}\nEmplacement Size : {pos.slot_size}\nclick to equip new weapon"); obj_controller.weapon_slate.weapon = pos.weapon; obj_controller.weapon_slate.slot = pos; } else { draw_set_colour(c_blue); } - draw_rectangle(corner[0]+ coords[0]-10, corner[1]+coords[1]-10, corner[0]+coords[0]+10, corner[1]+coords[1]+10, true); + draw_rectangle_array(draw_coords,true); } draw_set_font(fnt_40k_30b); draw_set_halign(fa_left); var _h_scale = 0.6; - draw_text_transformed(x + 30, y + 350, "Left Batteries", _h, _h, 0); - draw_text_transformed(x + 200, y + 350, "Forward Batteries", _h, _h, 0); - draw_text_transformed(x + 370, y + 350, "Right Batteries", _h, _h, 0); + draw_text_transformed(x + 30, y + 350, "Left Batteries", _h_scale, _h_scale, 0); + draw_text_transformed(x + 200, y + 350, "Forward Batteries", _h_scale, _h_scale, 0); + draw_text_transformed(x + 370, y + 350, "Right Batteries", _h_scale, _h_scale, 0); draw_set_font(fnt_40k_12); for (var i=0;i Date: Mon, 26 May 2025 16:49:59 +0100 Subject: [PATCH 073/155] mostly finish ui foor ship weapons --- objects/obj_ini/Create_0.gml | 2 ++ scripts/scr_ShipStruct/scr_ShipStruct.gml | 6 +++++- scripts/scr_fleet_advisor/scr_fleet_advisor.gml | 17 +++++++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 60bdfb9a92..731de5f96f 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -30,6 +30,8 @@ home_planet = 2; artifact_struct = array_create(200); flagship = 0; +ship_weapons = []; + // Equipment- maybe the bikes should go here or something? yes they should equipment = {}; i=-1; diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 9c726e840e..8344b7b2c7 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -19,6 +19,10 @@ function per_step_to_kilometers(rate_dist){ return convert_to_kilometers((rate_dist*60)); } +function fps_to_secs(val){ + return val/60; +} + function ShipStruct() constructor{ features = []; turrets = []; @@ -119,7 +123,7 @@ function ShipStruct() constructor{ var draw_coords = [corner[0]+ coords[0]-_box_size, corner[1]+coords[1]-_box_size, corner[0]+coords[0]+_box_size, corner[1]+coords[1]+_box_size]; if (scr_hit(draw_coords)){ draw_set_colour(c_green); - tooltip_draw("Emplacement direction : {pos.facing}\nEmplacement Size : {pos.slot_size}\nclick to equip new weapon"); + tooltip_draw($"Emplacement direction : {pos.facing}\nEmplacement Size : {pos.slot_size}\nclick to equip new weapon"); obj_controller.weapon_slate.weapon = pos.weapon; obj_controller.weapon_slate.slot = pos; diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index e6371ca284..b4d024af35 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -327,11 +327,24 @@ function scr_fleet_advisor(){ var _wep = weapon_slate.weapon; var xx = weapon_slate.XX; var yy = weapon_slate.YY; + draw_set_halign(fa_middle); draw_set_halign(fa_center); draw_set_font(fnt_40k_30b); - draw_text_transformed(xx + 280, yy + 30, _wep.name, 1, 1, 0); - draw_set_font(fnt_40k_12); + draw_text(xx + 280 - (string_width(_wep.name)/2), yy + 30, _wep.name) + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_left); + draw_text(xx+50, yy+60, $"Range : {convert_to_kilometers(_wep.range)}km"); + draw_text(xx+50, yy+90, $"minrange : {convert_to_kilometers(_wep.minrange)}km"); + draw_text(xx+50, yy+120, $"Rate of fire : {1/fps_to_secs(_wep.cooldown)}/s"); + draw_text(xx+50, yy+150, $"Damage : {_wep.dam}"); + draw_text(xx+50, yy+180, $"Firing Arc : {_wep.firing_arc*2} degrees"); + draw_text(xx+50, yy+210, $"Bullet Speed : {convert_to_kilometers(_wep.bullet_speed)}km/s"); + draw_text(xx+50, yy+240, $"Base Accuracy : {_wep.accuracy}%"); + draw_text(xx+50, yy+270, $"Size : {_wep.size}"); + draw_text(xx+50, yy+300, $"bombard_value : {_wep.bombard_value}"); } + + weapon_slate.draw_with_dimensions(xx, yy+66, 340, 400); } From 0d7700cb9f7a3d14bd0e0f51415587d87196660b Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 26 May 2025 19:14:41 +0100 Subject: [PATCH 074/155] unify projectile collision --- .../obj_al_round/Collision_obj_en_ship.gml | 21 +--------- objects/obj_al_ship/Draw_0.gml | 3 ++ .../obj_en_round/Collision_obj_al_ship.gml | 19 +--------- objects/obj_en_round/Collision_obj_p_ship.gml | 33 +--------------- objects/obj_en_ship/Draw_0.gml | 4 +- objects/obj_p_round/Collision_obj_en_ship.gml | 24 +----------- objects/obj_p_ship/Draw_0.gml | 13 +------ .../scr_ship_combat_data.gml | 26 +++++++++++-- .../scr_ship_weapon_struct.gml | 38 ++++++++++++++++++- 9 files changed, 69 insertions(+), 112 deletions(-) diff --git a/objects/obj_al_round/Collision_obj_en_ship.gml b/objects/obj_al_round/Collision_obj_en_ship.gml index a85ef7b1fa..d11e694a5c 100644 --- a/objects/obj_al_round/Collision_obj_en_ship.gml +++ b/objects/obj_al_round/Collision_obj_en_ship.gml @@ -1,20 +1 @@ -// Handles damage allocation on space combat against ships based on shields and hp -var arm = other.armour_front; -var t1 = 0; - -if (arm < dam) { - dam -= arm; - if (other.shields > 0) other.shields -= dam / 2; - else other.hp -= dam / 2; -} - -if (arm > dam) { - if (other.shields > 0) other.shields -= 0.5; - if (other.shields <= 0) other.hp -= 0.5; -} - -if (sprite_index == spr_torpedo) { - instance_create(x, y, obj_explosion); -} - -instance_destroy(); \ No newline at end of file +round_collision_with_ship(); \ No newline at end of file diff --git a/objects/obj_al_ship/Draw_0.gml b/objects/obj_al_ship/Draw_0.gml index ed4732623b..d3ffe40288 100644 --- a/objects/obj_al_ship/Draw_0.gml +++ b/objects/obj_al_ship/Draw_0.gml @@ -1,6 +1,9 @@ // Draws the ships and their shields var __b__; __b__ = action_if_variable(name, "", 0); + +draw_ship_heathshields(); + if (!__b__){ { diff --git a/objects/obj_en_round/Collision_obj_al_ship.gml b/objects/obj_en_round/Collision_obj_al_ship.gml index 521eef49e5..e6918d728a 100644 --- a/objects/obj_en_round/Collision_obj_al_ship.gml +++ b/objects/obj_en_round/Collision_obj_al_ship.gml @@ -1,19 +1,2 @@ - - - -var arm; -arm=other.armour_front; - -if (arm0) then other.shields-=dam/2; - if (other.shields<=0) then other.hp-=dam/2; -} - -if (arm>dam) and (other.shields>0) then other.shields-=0.5; -if (arm>dam) and (other.shields<=0) then other.hp-=0.5; - -new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); - -instance_destroy(); +round_collision_with_ship(); diff --git a/objects/obj_en_round/Collision_obj_p_ship.gml b/objects/obj_en_round/Collision_obj_p_ship.gml index efc343d572..e6918d728a 100644 --- a/objects/obj_en_round/Collision_obj_p_ship.gml +++ b/objects/obj_en_round/Collision_obj_p_ship.gml @@ -1,33 +1,2 @@ - - -var _rel_direction = point_direction(other.x, other.y, x, y); -var arm=other.armour_front; - -var t1=0; -if (obj_fleet.global_defense!=1){ - t1=1-(obj_fleet.global_defense-1); - dam=dam*t1; -} -if (other.shields.active){ - other.shields.shields-=dam; -} else { - var _arm = 0; - var _rel_direction = point_direction(other.x, other.y, x, y); - if (_rel_direction <= 45 || _rel_direction >= 315){ - _arm = other.armour_front; - } else if (_rel_direction <225 && _rel_direction > 135){ - _arm = other.rear_armour; - } else { - _arm = other.side_armour; - } - if (_arm=1){ - - var arm; - arm=other.armour_front; - - dam=dam*obj_fleet.global_attack; - - if (arm0) then other.shields-=dam; - if (other.shields<=0) then other.hp-=dam; - } - - if (arm>dam) and (other.shields>0) then other.shields-=1; - if (arm>dam) and (other.shields<=0) then other.hp-=1; - - new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); - -} - -instance_destroy(); - +round_collision_with_ship(); \ No newline at end of file diff --git a/objects/obj_p_ship/Draw_0.gml b/objects/obj_p_ship/Draw_0.gml index 3f92c7faf2..ca18f604f4 100644 --- a/objects/obj_p_ship/Draw_0.gml +++ b/objects/obj_p_ship/Draw_0.gml @@ -3,8 +3,6 @@ __b__ = action_if_variable(name, "", 0); if !__b__ { { - -shields.draw(); if (selected=1 || point_distance(x, y, mouse_x, mouse_y) < 50){ draw_set_color(38144); draw_circle(x,y,(sprite_width/2),1); @@ -65,16 +63,7 @@ if (boarders>0){ draw_text(x-16,y+12,string(boarders)); } draw_set_color(38144); - - -if (maxhp!=0){ - var zoom_modifier = obj_controller.zoomed?2:1; - if (shields<=0){ - var hp_percent = $"{(hp/maxhp)*100}%" - - draw_text_transformed(x,y-sprite_height,hp_percent,zoom_modifier,zoom_modifier,0); - } -} +draw_ship_heathshields() if (master_present!=0) then draw_sprite_ext(spr_popup_select,0,x,y,2,2,0,c_white,1); diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index d49cf0f764..cdfbd14fcf 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -1,10 +1,11 @@ global.ship_weapons_stats = { "Lance Battery" : { - range : 900, - dam : 14, - cooldown : 15, + range : 1200, + dam : 6, + cooldown : 60, facing : "front", - firing_arc : 25, + firing_arc : 20, + bullet_speed : 40, img : spr_ground_las, explosion_sprite : spr_explosion3, }, @@ -232,6 +233,9 @@ function facing_weapon_angle(facing){ function assign_ship_stats(){ + rear_armour = 1; + shields_recharge_rate = 0.2; + shields_reboot_time = 20; if (class="Apocalypse Class Battleship"){ sprite_index=spr_ship_apoc; ship_size=3; @@ -846,6 +850,7 @@ function assign_ship_stats(){ } } + shields = new ShipShieldGenerator({shields, maxshields, recharge_rate:shields_recharge_rate, shields_reboot:shields_reboot_time}) if (owner != eFACTION.Eldar){ hp/=2; maxhp=hp; @@ -881,3 +886,16 @@ function assign_ship_stats(){ // show_message(string(class)); } + + +function draw_ship_heathshields(){ + shields.draw(); + if (maxhp!=0){ + var zoom_modifier = obj_controller.zoomed?2:1; + if (if !shields.active()<=0){ + var hp_percent = $"{(hp/maxhp)*100}%" + + draw_text_transformed(x,y-sprite_height,hp_percent,zoom_modifier,zoom_modifier,0); + } + } +} diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index 193731ecd9..a31af22dd4 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -288,4 +288,40 @@ function add_weapon_to_ship(weapon_name, overide_data={}){ } var _wep = new ShipWeapon(weapon_name, overide_data); array_push(weapons, _wep); -}; \ No newline at end of file +}; + + +function round_collision_with_ship(){ + + + var _rel_direction = point_direction(other.x, other.y, x, y); + var arm=other.armour_front; + + var t1=0; + /*if (obj_fleet.global_defense!=1){ + t1=1-(obj_fleet.global_defense-1); + dam=dam*t1; + }*/ + if (other.shields.active()){ + other.shields.shields-=dam; + } else { + var _arm = 0; + var _rel_direction = point_direction(other.x, other.y, x, y); + if (_rel_direction <= 45 || _rel_direction >= 315){ + _arm = other.armour_front; + } else if (_rel_direction <225 && _rel_direction > 135){ + _arm = other.rear_armour; + } else { + _arm = other.side_armour; + } + if (_arm Date: Mon, 26 May 2025 19:23:29 +0100 Subject: [PATCH 075/155] unify projectile step --- objects/obj_al_round/Step_0.gml | 20 +-------- objects/obj_en_round/Step_0.gml | 24 +---------- objects/obj_p_round/Step_0.gml | 18 +------- .../scr_ship_combat_data.gml | 2 +- .../scr_ship_weapon_struct.gml | 43 +++++++++++++++++++ 5 files changed, 47 insertions(+), 60 deletions(-) diff --git a/objects/obj_al_round/Step_0.gml b/objects/obj_al_round/Step_0.gml index 8fe3452409..2151dd3ed0 100644 --- a/objects/obj_al_round/Step_0.gml +++ b/objects/obj_al_round/Step_0.gml @@ -1,19 +1 @@ -image_angle = direction; - -if (x < -1000) - or(x > room_width + 1000) - or(y < -1000) - or(y > room_height + 1000) - then instance_destroy(); - -var th, thd; -if (dam <= 4) { - if (instance_exists(obj_p_th)) { - th = instance_nearest(x, y, obj_p_th); - thd = point_distance(x, y, th.x, th.y); - if (thd < 6) { - th.hp -= (self.dam - 1); - instance_destroy(); - } - } -} \ No newline at end of file +round_step_logic(); \ No newline at end of file diff --git a/objects/obj_en_round/Step_0.gml b/objects/obj_en_round/Step_0.gml index 6a61b4d4a6..7b2cf3f60d 100644 --- a/objects/obj_en_round/Step_0.gml +++ b/objects/obj_en_round/Step_0.gml @@ -1,26 +1,4 @@ -image_angle=direction; - -if (x<-1000) or (x>room_width+1000) or (y<-1000) or (y>room_height+1000) then instance_destroy(); - -var th, thd; -if (dam<=4){ - if (instance_exists(obj_p_small)){ - th=instance_nearest(x,y,obj_p_small); - thd=point_distance(x,y,th.x,th.y); - if (thd<6){ - th.hp-=(self.dam-1); - new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); - } - } - if (instance_exists(obj_al_in)){ - th=instance_nearest(x,y,obj_al_in); - thd=point_distance(x,y,th.x,th.y); - if (thd<6){ - th.hp-=(self.dam-1); - new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); - } - } -} +round_step_logic(); diff --git a/objects/obj_p_round/Step_0.gml b/objects/obj_p_round/Step_0.gml index b000d404b2..2151dd3ed0 100644 --- a/objects/obj_p_round/Step_0.gml +++ b/objects/obj_p_round/Step_0.gml @@ -1,17 +1 @@ -image_angle=direction; - -if (x<-1000) or (x>room_width+1000) or (y<-1000) or (y>room_height+1000) then instance_destroy(); - -var th, thd; -if (dam<=4){ - if (instance_exists(obj_en_in)){ - th=instance_nearest(x,y,obj_en_in); - thd=point_distance(x,y,th.x,th.y); - if (thd<6){ - th.hp-=(self.dam-1); - new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); - instance_destroy() - ;} - } -} - +round_step_logic(); \ No newline at end of file diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index cdfbd14fcf..661e785746 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -1,7 +1,7 @@ global.ship_weapons_stats = { "Lance Battery" : { range : 1200, - dam : 6, + dam : 22, cooldown : 60, facing : "front", firing_arc : 20, diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index a31af22dd4..b0ca850c88 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -324,4 +324,47 @@ function round_collision_with_ship(){ new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); instance_destroy(); +} + + +function round_step_logic = functino(){ + image_angle=direction; + + if (x<-1000) or (x>room_width+1000) or (y<-1000) or (y>room_height+1000){ + instance_destroy(); + } + + var th, thd; + if (object_index == obj_en_round){ + if (dam<=4){ + if (instance_exists(obj_p_small)){ + th=instance_nearest(x,y,obj_p_small); + thd=point_distance(x,y,th.x,th.y); + if (thd<6){ + th.hp-=(self.dam-1); + new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); + } + } + if (instance_exists(obj_al_in)){ + th=instance_nearest(x,y,obj_al_in); + thd=point_distance(x,y,th.x,th.y); + if (thd<6){ + th.hp-=(self.dam-1); + new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); + } + } + } + } else { + if (dam<=4){ + if (instance_exists(obj_en_in)){ + th=instance_nearest(x,y,obj_en_in); + thd=point_distance(x,y,th.x,th.y); + if (thd<6){ + th.hp-=(self.dam-1); + new ShipWeaponExplosion(explosion_sprite, x,y, image_xscale); + instance_destroy(); + } + } + } + } } \ No newline at end of file From 1d17333516cac4cdd5bb8480ceaebbeda5fb9cbc Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 26 May 2025 20:05:23 +0100 Subject: [PATCH 076/155] basic idea of ship captains --- datafiles/data/traits.json | 5 +++-- scripts/scr_ShipStruct/scr_ShipStruct.gml | 16 +++++++++++--- .../scr_fleet_advisor/scr_fleet_advisor.gml | 21 +++++++++++++++++++ .../scr_manage_task_selector.gml | 9 ++++++++ .../scr_marine_struct/scr_marine_struct.gml | 15 +++++++++++++ .../scr_ship_combat_data.gml | 1 + .../scr_ship_weapon_struct.gml | 7 ++++++- 7 files changed, 68 insertions(+), 6 deletions(-) diff --git a/datafiles/data/traits.json b/datafiles/data/traits.json index 9f9507339f..ecde1f990b 100644 --- a/datafiles/data/traits.json +++ b/datafiles/data/traits.json @@ -460,7 +460,7 @@ }, "perfectionist": { "display_name": "Perfectionist", - "flavour_text": "Obsessed with doing things correctly", + "flavour_text": "Obsessed with doing things correctly and Training to perfection", "wisdom": [ 2, 2, @@ -483,7 +483,8 @@ "piety": [ 2, 1 - ] + ], + "effect": "When captaining a ship weapons are have a 10% increased reload time" }, "guardian": { "display_name": "Guardian", diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 8344b7b2c7..a8e97332c9 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -48,18 +48,28 @@ function ShipStruct() constructor{ shields_recharge_rate = 0.2; shields_reboot_time = 20; - captain = false; - engineer = false; + engineer = ""; left_broad_positions = []; right_broad_positions = []; forward_positions = []; + captain = ""; + captain_data = false; - uid = floor(random(99999999))+1; + uid = scr_uuid_generate(); static ship_hp_percentage = function(){ return (hp/max_hp )* 100 } + static fetch_captain = function(){ + var _cap = fetch_unit_uid(captain); + if (_cap != "none"){ + captain_data = _cap; + } else { + captain = ""; + } + } + static final_acceleration = function(){ var _acel = acceleration; diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index b4d024af35..707a7d35cd 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -36,6 +36,7 @@ function fleet_advisor_data_setup(){ var _most_damage = 100; for (var i = 0; i < array_length(obj_ini.ship_data); i++) { var _ship = fetch_ship(i); + _ship.fetch_captain(); var _percent = _ship.ship_hp_percentage(); if (_percent<100 && !fleet_temps.ships_with_damage){ fleet_temps.ships_with_damage = true; @@ -283,6 +284,26 @@ function scr_fleet_advisor(){ draw_set_halign(fa_center); draw_text_transformed(xx + 280, yy + 60, _ship.name, 0.75, 0.75, 0); draw_text_transformed(xx + 280, yy + 90, _ship.class, 0.5, 0.5, 0); + if (_ship.captain != ""){ + draw_text_transformed(xx + 280, yy + 120, "Current Captain : {_ship.captain_data.name_role()}", 0.5, 0.5, 0); + } else { + var _new_cap = draw_unit_buttons([xx + 280, yy + 120], "Choose Captain", [1, 1], 38144, , fnt_40k_14b); + if (point_and_click(_new_cap)){ + var _candidates = collect_role_group("all", ["",0,fleet_temps.view_ship]); + var _select_data = { + purpose:"Ship Management", + purpose_code : "ship_captain", + number:1, + system:0, + feature:"none", + planet : 0, + ship : fleet_temps.view_ship, + selections : [], + } + group_selection(_candidates) + } + + } draw_set_color(c_gray); draw_rectangle(xx + 146, yy + 492, xx + 411, yy + 634, 1); diff --git a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml index 799387f950..dda24a98d2 100644 --- a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml +++ b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml @@ -189,6 +189,15 @@ function scr_manage_task_selector(){ exit_adhoc_manage(); exit; break; + case "ship_captain": + var _unit = display_unit[i]; + var _ship = fetch_ship(selection_data.ship); + _ship.captain = _unit.uid; + _unit.captain = _ship.uid; + scr_toggle_fleet_area(); + fleet_temps.view_ship = selection_data.ship; + exit; + break; } } else { switch(selection_data.purpose_code){ diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index 902085e01b..d0b77544a0 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -404,6 +404,7 @@ global.base_stats = { }; function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {}) constructor { + uid = scr_uuid_generate(); constitution = 0; strength = 0; luck = 0; @@ -436,6 +437,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} corruption = 0; religion_sub_cult = "none"; base_group = "none"; + captain = ""; role_history = []; enum eROLE_TAG { Techmarine = 0, @@ -2311,3 +2313,16 @@ function jsonify_marine_struct(company, marine, stringify=true) { function fetch_unit(unit) { return obj_ini.TTRPG[unit[0]][unit[1]]; } + +function fetch_unit_uid(uuid){ + for (var i=0;i Date: Tue, 27 May 2025 15:54:56 +0100 Subject: [PATCH 077/155] determining tech support and docking capabilities --- datafiles/data/traits.json | 2 +- objects/obj_controller/Alarm_5.gml | 49 +++++---- objects/obj_controller/Create_0.gml | 75 ++----------- objects/obj_controller/Step_0.gml | 1 - scripts/scr_ShipStruct/scr_ShipStruct.gml | 104 +++++++++++++++++- .../scr_fleet_advisor/scr_fleet_advisor.gml | 28 ++--- .../scr_manage_task_selector.gml | 15 +++ .../scr_marine_struct/scr_marine_struct.gml | 46 +++++++- .../scr_planetary_feature.gml | 8 ++ .../scr_player_ship_functions.gml | 59 +++++----- .../scr_ship_combat_data.gml | 2 +- .../scr_ship_weapon_struct.gml | 2 +- .../scr_specialist_points.gml | 21 ++-- 13 files changed, 262 insertions(+), 150 deletions(-) diff --git a/datafiles/data/traits.json b/datafiles/data/traits.json index ecde1f990b..73f7ef8af2 100644 --- a/datafiles/data/traits.json +++ b/datafiles/data/traits.json @@ -484,7 +484,7 @@ 2, 1 ], - "effect": "When captaining a ship weapons are have a 10% increased reload time" + "effect": "When captaining a ship weapons have a 10% increased reload time" }, "guardian": { "display_name": "Guardian", diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 73556c3af5..4b3fdecf88 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -683,37 +683,38 @@ with(obj_ground_mission){instance_destroy();} scr_random_event(true); // ** Random events here ** -if (hurssy_time>0) and (hurssy>0) then hurssy_time-=1; +if (hurssy_time>0) and (hurssy>0){ + hurssy_time-=1; +} if (hurssy_time==0) and (hurssy>0){hurssy_time=-1;hurssy=0;} with(obj_p_fleet){ - if (hurssy_time>0) and (hurssy>0) then hurssy_time-=1; - if (hurssy_time==0) and (hurssy>0){hurssy_time=-1;hurssy=0;} -} -with(obj_star){ - if (p_hurssy_time[1]>0) and (p_hurssy[1]>0) then p_hurssy_time[1]-=1; - if (p_hurssy_time[1]==0) and (p_hurssy[1]>0){ - p_hurssy_time[1]=-1; - p_hurssy[1]=0; + if (hurssy_time>0) and (hurssy>0){ + hurssy_time-=1; } - if (p_hurssy_time[2]>0) and (p_hurssy[2]>0) then p_hurssy_time[2]-=1; - if (p_hurssy_time[2]==0) and (p_hurssy[2]>0){ - p_hurssy_time[2]=-1; - p_hurssy[2]=0; + if (hurssy_time==0) and (hurssy>0){ + hurssy_time=-1; + hurssy=0; } - if (p_hurssy_time[3]>0) and (p_hurssy[3]>0) then p_hurssy_time[3]-=1; - if (p_hurssy_time[3]=0) and (p_hurssy[3]>0){ - p_hurssy_time[3]=-1; - p_hurssy[3]=0; - } - if (p_hurssy_time[4]>0) and (p_hurssy[4]>0) then p_hurssy_time[4]-=1; - if (p_hurssy_time[4]==0) and (p_hurssy[4]>0){ - p_hurssy_time[4]=-1; - p_hurssy[4]=0; +} +with(obj_star){ + for (var i=1;i<=planets;i++){ + if (p_hurssy[i]<=0){ + continue; + } + if (p_hurssy_time[i]>0) { + p_hurssy_time[i]-=1; + } + if (p_hurssy_time[i]==0) { + p_hurssy_time[i]=-1; + p_hurssy[i]=0; + } } } if (turn==2){ - if (obj_ini.master_name=="Zakis Randi") or (global.chapter_name=="Knights Inductor") and (obj_controller.faction_status[eFACTION.Imperium]!="War") then alarm[8]=1; + if (obj_ini.master_name=="Zakis Randi") or (global.chapter_name=="Knights Inductor") and (obj_controller.faction_status[eFACTION.Imperium]!="War"){ + alarm[8]=1; + } } // ** Player-set events ** if (fest_scheduled>0) and (fest_repeats>0){ @@ -764,7 +765,7 @@ init_ork_waagh(); return_lost_ships_chance(); //complex route plotting for player fleets with (obj_p_fleet){ - if (array_length(complex_route)>0 && action == ""){ + if (array_length(complex_route) > 0 && action == ""){ set_new_player_fleet_course(complex_route); } } diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 1934b882e6..4c702e2fdc 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -621,19 +621,16 @@ stc_un_total=0; stc_wargear_un=0; stc_vehicles_un=0; stc_ships_un=0; -stc_bonus[0]=0; -stc_bonus[1]=0; -stc_bonus[2]=0; -stc_bonus[3]=0; -stc_bonus[4]=0; -stc_bonus[5]=0; -stc_bonus[6]=0; +stc_bonus = array_create(7,0); + stc_research = { wargear:0, vehicles:0, ships:0, research_focus:"wargear", } + +flagship = 0; // ** Resets the years ** check_number=0; year_fraction=0; @@ -755,36 +752,9 @@ temp[90] = 0; temp[9000] = ""; // ** Resets all audiences ** audiences=0; -audien[0]=0; -audien[1]=0; -audien[2]=0; -audien[3]=0; -audien[4]=0; -audien[5]=0; -audien[6]=0; -audien[7]=0; -audien[8]=0; -audien[9]=0; -audien[10]=0; -audien[11]=0; -audien[12]=0; -audien[13]=0; -audien[14]=0; -audien_topic[0]=""; -audien_topic[1]=""; -audien_topic[2]=""; -audien_topic[3]=""; -audien_topic[4]=""; -audien_topic[5]=""; -audien_topic[6]=""; -audien_topic[7]=""; -audien_topic[8]=""; -audien_topic[9]=""; -audien_topic[10]=""; -audien_topic[11]=""; -audien_topic[12]=""; -audien_topic[13]=""; -audien_topic[14]=""; +audien = array_create(15, 0); +audien_topic = array_create(15, ""); + // ** Sets default recruiting vars ** recruits=0; recruiting_worlds=""; @@ -1212,35 +1182,10 @@ ignore[eFACTION.Heretics]=0; ignore[12]=0; ignore[eFACTION.Necrons]=0; // ** Sets diplomacy turns to be ignored ** -turns_ignored[0]=0; -turns_ignored[1]=0; -turns_ignored[2]=0; -turns_ignored[3]=0; -turns_ignored[4]=0; -turns_ignored[5]=0; -turns_ignored[6]=0; -turns_ignored[7]=0; -turns_ignored[8]=0; -turns_ignored[9]=0; -turns_ignored[10]=0; -turns_ignored[11]=0; -turns_ignored[12]=0; -turns_ignored[13]=0; +turns_ignored = array_create(15, 0); + // ** Sets faction defeated ** -faction_defeated[0]=0; -faction_defeated[1]=0; -faction_defeated[2]=0; -faction_defeated[3]=0; -faction_defeated[4]=0; -faction_defeated[5]=0; -faction_defeated[6]=0; -faction_defeated[7]=0; -faction_defeated[8]=0; -faction_defeated[9]=0; -faction_defeated[10]=0; -faction_defeated[11]=0; -faction_defeated[12]=0; -faction_defeated[13]=0; +faction_defeated = array_create(15, 0); // **** CHAPTER CREATION VARS **** // ** Sets up Chapter configuration variables ** diff --git a/objects/obj_controller/Step_0.gml b/objects/obj_controller/Step_0.gml index 97c8ba8722..1fa370e9e4 100644 --- a/objects/obj_controller/Step_0.gml +++ b/objects/obj_controller/Step_0.gml @@ -802,7 +802,6 @@ try { obj_ini.loc[company][unit_id] = _ship.location; unit.ship_location = -1; unit.planet_location = unload; - obj_ini.uid[company][unit_id] = 0; ma_loc[q] = _ship.location; ma_lid[q] = -1; ma_wid[q] = unload; diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index a8e97332c9..43d4d73b1a 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -55,6 +55,11 @@ function ShipStruct() constructor{ captain = ""; captain_data = false; + minimum_tech_requirements = 8; + tech_fulfilment = 0; + tech_suppliers = []; + docked = false; + uid = scr_uuid_generate(); static ship_hp_percentage = function(){ @@ -62,19 +67,102 @@ function ShipStruct() constructor{ } static fetch_captain = function(){ - var _cap = fetch_unit_uid(captain); - if (_cap != "none"){ - captain_data = _cap; + if (captain!=""){ + var _cap = fetch_unit_uid(captain); + if (_cap != "none"){ + captain_data = _cap; + } else { + determine_new_captain(); + } + } else { + determine_new_captain(); + } + } + + static determine_new_captain = function(fetch_new_occupants=true){ + if (fetch_new_occupants){ + var _occupants = get_occupants(); + } else { + var _occupants = occupants; + } + if (array_length(_occupants)){ + var _new_cap = determine_highest_ranking(_occupants); + captain = _new_cap.uid; + captain_data = _new_cap; } else { captain = ""; } } + /// @description figers out how many forge points the ship has working towards it's running. + /// @param {bool} collect ship occupants again if done recently this can be false, saves overhead + static tech_fulfilment = function(fetch_new_occupants=true){ + if (fetch_new_occupants){ + var _occupants = get_occupants(); + }else { + var _occupants = occupants; + } + for (var i=0;i= 0){ managing = selection_data.system; update_general_manage_view(); @@ -192,10 +202,15 @@ function scr_manage_task_selector(){ case "ship_captain": var _unit = display_unit[i]; var _ship = fetch_ship(selection_data.ship); + show_debug_message(_unit.uid); _ship.captain = _unit.uid; _unit.captain = _ship.uid; + show_debug_message(_ship.name); + _ship.captain_data = _unit; + exit_adhoc_manage(); scr_toggle_fleet_area(); fleet_temps.view_ship = selection_data.ship; + fleet_temps.view_ship_struct = _ship; exit; break; } diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index d0b77544a0..82100b5b3b 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -2317,12 +2317,56 @@ function fetch_unit(unit) { function fetch_unit_uid(uuid){ for (var i=0;i= dock_space_wanted){ + return (capacity-space_taken >= dock_space_wanted); + } else { + return false; + } + } planet_display = "Docks"; break; default: diff --git a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml index 82c6838ef8..4183042fcb 100644 --- a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml +++ b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml @@ -382,6 +382,7 @@ function new_player_ship(type, start_loc="home", new_name=""){ rear_armour = 3; shields = 1; sprite_index=spr_ship_bb; + minimum_tech_requirements = 20; } @@ -392,30 +393,30 @@ function new_player_ship(type, start_loc="home", new_name=""){ if (string_count("Strike Cruiser",type)>0){ with(_struct){ left_broad_positions = [ - { - ship_position : [56, 37], - slot_size : 2, - weapon : false, - facing : "left" - }, - { - ship_position : [65, 37], - slot_size : 2, - weapon : false, - facing : "left" - }, - { - ship_position : [74,37], - slot_size : 2, - weapon : false, - facing : "left" - }, - { - ship_position : [83, 37], - slot_size : 2, - weapon : false, - facing : "left" - }, + { + ship_position : [56, 37], + slot_size : 2, + weapon : false, + facing : "left" + }, + { + ship_position : [65, 37], + slot_size : 2, + weapon : false, + facing : "left" + }, + { + ship_position : [74,37], + slot_size : 2, + weapon : false, + facing : "left" + }, + { + ship_position : [83, 37], + slot_size : 2, + weapon : false, + facing : "left" + }, ] right_broad_positions = [ { @@ -461,10 +462,10 @@ function new_player_ship(type, start_loc="home", new_name=""){ side_armour = 4; rear_armour = 3; shields = 6; - sprite_index=spr_ship_stri; + sprite_index=spr_ship_stri; + minimum_tech_requirements = 14; } - _struct.turrets = [{}]; } if (string_count("Gladius",type)>0){ @@ -481,7 +482,8 @@ function new_player_ship(type, start_loc="home", new_name=""){ side_armour = 4; rear_armour = 1; shields = 1; - sprite_index=spr_ship_glad; + sprite_index=spr_ship_glad; + minimum_tech_requirements = 6; } } if (string_count("Hunter",type)>0){ @@ -499,7 +501,8 @@ function new_player_ship(type, start_loc="home", new_name=""){ side_armour = 3; rear_armour = 1; shields = 1; - sprite_index=spr_ship_hunt; + sprite_index=spr_ship_hunt; + minimum_tech_requirements = 8; } diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index d20bce4278..d7dbdb2ffe 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -893,7 +893,7 @@ function draw_ship_heathshields(){ shields.draw(); if (maxhp!=0){ var zoom_modifier = obj_controller.zoomed?2:1; - if (if !shields.active()<=0){ + if (!shields.active()){ var hp_percent = $"{(hp/maxhp)*100}%" draw_text_transformed(x,y-sprite_height,hp_percent,zoom_modifier,zoom_modifier,0); diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index c7521fbdde..f769236179 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -332,7 +332,7 @@ function round_collision_with_ship(){ } -function round_step_logic = functino(){ +function round_step_logic(){ image_angle=direction; if (x<-1000) or (x>room_width+1000) or (y<-1000) or (y>room_height+1000){ diff --git a/scripts/scr_specialist_points/scr_specialist_points.gml b/scripts/scr_specialist_points/scr_specialist_points.gml index 5eaebf1131..f51da267d6 100644 --- a/scripts/scr_specialist_points/scr_specialist_points.gml +++ b/scripts/scr_specialist_points/scr_specialist_points.gml @@ -12,7 +12,7 @@ function unit_apothecary_points_gen(turn_end=false){ return [points,reasons]; } -function unit_forge_point_generation(turn_end=false){ +function unit_forge_point_generation(turn_end=false, base=false){ var _trained_person = IsSpecialist(SPECIALISTS_TECHS); var crafter = has_trait("crafter"); var reasons = {}; @@ -20,8 +20,11 @@ function unit_forge_point_generation(turn_end=false){ if (_trained_person){ var points = technology / 5; reasons.trained = points; + } else if (technology >= 40){ + var points = (technology-40) / 5; + reasons.talented = points; } - if (job!="none"){ + if (job!="none" && !base){ if (job.type == "forge"){ if (crafter){ @@ -45,12 +48,14 @@ function unit_forge_point_generation(turn_end=false){ points+=10; reasons.master = 10; } - var maintenance = equipment_maintenance_burden(); - points -= maintenance; - reasons.maintenance = $"-{maintenance}"; - if (has_trait("tinkerer")){ - reasons.maintenance += "\n X0.5"; - } + if (!base){ + var maintenance = equipment_maintenance_burden(); + points -= maintenance; + reasons.maintenance = $"-{maintenance}"; + if (has_trait("tinkerer")){ + reasons.maintenance += "\n X0.5"; + } + } return [points,reasons]; } From 70ec2ec93f04047ddac73e08f74a1718895b05ab Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 27 May 2025 21:48:19 +0100 Subject: [PATCH 078/155] try fix broadside behaviuor --- objects/obj_al_ship/Step_0.gml | 20 +++------- objects/obj_p_ship/Step_0.gml | 25 ++++++++----- .../scr_automated_ship_combat_functions.gml | 37 +++++++++++++++---- .../scr_player_fleet_combat_functions.gml | 15 +++++--- .../scr_ship_combat_data.gml | 21 +++-------- .../scr_ship_weapon_struct.gml | 11 +++--- 6 files changed, 70 insertions(+), 59 deletions(-) diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index cf16240c8f..87ab5e25cf 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -180,13 +180,15 @@ if (!__b__){ xx=x; yy=y; // Turret targetting - if (turrets>0) and (instance_exists(obj_en_in)) and (turret_cool=0){ + if (turrets>0) and (instance_exists(obj_en_in)) and (turret_cool==0){ targe=instance_nearest(x,y,obj_en_in); if (instance_exists(targe)) then dist=point_distance(x,y,targe.x,targe.y); + if (dist>64) and (dist<300){ bull=instance_create(x,y,obj_al_round); bull.direction=point_direction(x,y,targe.x,targe.y); - if (owner == eFACTION.Tyranids) then bull.sprite_index=spr_glob; + if (owner = eFACTION.Tyranids) then bull.sprite_index=spr_glob; + if (owner = eFACTION.Tau) or (owner = eFACTION.Eldar) then bull.sprite_index=spr_pulse; bull.speed=20; bull.dam=3; bull.image_xscale=0.5; @@ -195,8 +197,7 @@ if (!__b__){ bull.direction+=choose(random(10),1*-(random(10))); } } - targe=0; - dist=9999; + ship_shoot_weapons(); xx=lengthdir_x(64,direction+90); yy=lengthdir_y(64,direction+90); @@ -215,17 +216,6 @@ if (!__b__){ if (collision_line(x,y,x+lengthdir_x(2000,direction),y+lengthdir_y(2000,direction),obj_en_ship,0,1)) then front=1; - f=0; - facing=""; - ammo=0; - range=0; - wep=""; - dam=0; - - - for (var i=0;i0) and (instance_exists(target)){ o_dist=64; action="broadside"; } - else if (class="Battle Barge") or (class="Strike Cruiser"){ + else if (class="Battle Barge"){ o_dist=300; action="broadside"; + } else if (class == "Strike Cruiser"){ + action="broadside"; + o_dist=300; } else if (class="Hunter") or (class="Gladius"){ o_dist=64; @@ -97,10 +100,11 @@ if (hp>0) and (instance_exists(target)){ turning_speed = ship_data.calc_turn_speed(); if (paction!="move") and (paction!="attack_move") and (paction!="turn") and (paction!="attack_turn"){ - if (target!=0) and (action="attack"){ + if (target!=0) and (action=="attack"){ direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed/2); } - broadside_movement(); + ideal_broadside() + //broadside_movement(); flank_behaviour(); } @@ -147,11 +151,14 @@ if (hp>0) and (instance_exists(target)){ if (y20) and (speed<(max_speed)) then speed+=speed_up; @@ -179,8 +186,8 @@ if (hp>0) and (instance_exists(target)){ bull.direction=point_direction(x,y,targe.x,targe.y); bull.speed=20; bull.dam=3; - bull.image_xscale=0.5; - bull.image_yscale=0.5; + bull.image_xscale=0.25; + bull.image_yscale=0.25; turret_cool=floor(60/turrets); bull.direction+=choose(random(3),1*-(random(3))); bull.explosion_sprite = spr_explosion; diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 6ffac6be37..1fb767c039 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -1,6 +1,33 @@ +function point_on_circle(start_x, start_y, radius, angle){ + var _angle_radians = degtorad(angle); + var _final_x = start_x + lengthdir_x(radius, angle); + var _final_y = start_y + lengthdir_y(radius, angle); + return [_final_x, _final_y]; +} +function ideal_broadside(){ + if (action=="broadside" && target!=0){ + var _ship_direc = direction; + var _enemy_points_left = 0; + var _enemy_points_right = 0; + var _ship_x = x; + var _ship_y = y; + with (obj_en_ship){ + var _rel_direct = point_direction(_ship_x, _ship_y, x, y); + if (_rel_direct > 270){ + _enemy_points_left += size; + } else if (_rel_direct < 90) { + _enemy_points_right += size; + } + } + var _break_direction = (_enemy_points_right > _enemy_points_left) ? 90 : 270; + + + draw_targets = point_on_circle(target.x, target.y, 450 ,_break_direction); + ship_turn_towards_point(draw_targets[0],draw_targets[1]); + } - +} function broadside_movement(){ var _target_direction = target.direction; if (target!=0) and (action="broadside") and (target_distance>closing_distance){ @@ -64,6 +91,7 @@ function avoid_ship_weapon(weapon, rel_direction){ var _sx = xm+lengthdir_x(weapon.range, avoid_angle); var _sy = ym+lengthdir_y(weapon.range, avoid_angle); draw_targets = [_sx, _sy]; + ship_turn_towards_point(_sx, _sy); } function ship_rear_approach(rel_direction){ @@ -212,13 +240,6 @@ function draw_arc(x1,y1,x2,y2,x3,y3,x4,y4,precision=24){ return 0; } -function point_on_circle(start_x, start_y, radius, angle){ - var _angle_radians = degtorad(angle); - var _final_x = start_x + (radius * cos(_angle_radians)); - var _final_y = start_y + (radius * sin(_angle_radians)); - return [_final_x, _final_y]; -} - function is_targeted(){ var bullets = array_length(bullets_for); under_fire = false; diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 3fb8d5df75..d90433a378 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -75,10 +75,13 @@ function player_fleet_ship_spawner(){ hei=64; sizz=1; } - else if (column[col]=="escort"){hei=64;sizz=1;} + else if (column[col]=="escort"){ + hei=64; + sizz=1; + } - temp1=column_num[col]*hei; - temp2=((room_height/2)-(temp1/2))+64; + temp1 = max(column_num[col],1) * hei; + temp2 = ((room_height/2)-(temp1/2))+64; if (column_num[col]=1) then temp2+=20; // show_message(string(column_num[col])+" "+string(column[col])+" X:"+string(x2)); @@ -89,17 +92,17 @@ function player_fleet_ship_spawner(){ if (sizz>=3 && _ship.class!="") { man=instance_create(x2,temp2,obj_p_capital); man.ship_id=ship_id[k]; - temp2+=hei; + temp2 += hei; } if (sizz=2 && _ship.class!="") { man=instance_create(x2,temp2,obj_p_cruiser); man.ship_id=ship_id[k]; - temp2+=hei; + temp2 += hei; } if (sizz=1 && _ship.class!="") { man=instance_create(x2,temp2,obj_p_escort); man.ship_id=ship_id[k]; - temp2+=hei; + temp2 += hei; } if (instance_exists(man)){ with (man){ diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index d7dbdb2ffe..ecd8073354 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -1,11 +1,12 @@ global.ship_weapons_stats = { "Lance Battery" : { range : 1200, - dam : 22, + dam : 18, cooldown : 60, facing : "front", firing_arc : 20, bullet_speed : 40, + accuracy : 85, img : spr_ground_las, explosion_sprite : spr_explosion3, }, @@ -33,6 +34,7 @@ global.ship_weapons_stats = { firing_arc : 5, accuracy : 70, explosion_sprite : spr_explosion2, + range : 450, }, "Weapons Battery" : { facing : "front", @@ -850,14 +852,14 @@ function assign_ship_stats(){ if (obj_fleet.en_mutation[i]=="Turret") then turrets+=1; } } - - shields = new ShipShieldGenerator({shields, maxshields, recharge_rate:shields_recharge_rate, shields_reboot:shields_reboot_time}) if (owner != eFACTION.Eldar){ hp/=2; maxhp=hp; shields=shields/2; maxshields=shields; } + shields = new ShipShieldGenerator({shields, maxshields, recharge_rate:shields_recharge_rate, shields_reboot:shields_reboot_time, ship:id}); + // if (obj_fleet.enemy=2){hp=hp*0.75;maxhp=hp;shields=shields*0.75;maxshields=shields;} // hp=1;shields=1; // if (obj_fleet.enemy="orks") then name=global.name_generator.generate_ork_ship_name(); @@ -866,19 +868,6 @@ function assign_ship_stats(){ bridge=maxhp; - /* - if (obj_fleet.enemy == 2) { - hp = hp * 0.75; - maxhp = hp; - shields = shields * 0.75; - maxshields = shields; - } - */ - // hp=1; - shields=1; - - - // if (obj_fleet.enemy="orks") then name=global.name_generator.generate_ork_ship_name(); name="sdagdsagdasg"; diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index f769236179..53a267fde1 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -11,7 +11,7 @@ global.ship_weapon_defualts = { bullet_obj : obj_en_round, img : spr_round, damage_type : "full", - draw_scale : 1.5, + draw_scale :0.75, barrel_count : 1, melee : false, accuracy : 98, @@ -65,13 +65,14 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ static create_projectile = function(){ var _bullet = -1; var _tangent_direction = weapon_direction(); - var _bul_x = ship.x+lengthdir_x(32,_tangent_direction); + + var _bul_x = x var barrel_offset = 32; - var _bul_y = ship.y+lengthdir_y(32,_tangent_direction); + var _bul_y = y if (barrel_count> 1){ var barrel_offset = -20*(barrel_offset/2); } - var _bul_y = ship.y+lengthdir_y(barrel_offset,_tangent_direction); + if (bullet_obj==obj_en_round){ if (ship.ai_type = "player" ){ bullet_obj = obj_p_round @@ -82,7 +83,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ var _direction = point_direction(_bul_x,_bul_y, target.x,target.y); if (accuracy < 100){ - _direction += (100-accuracy * random(1)); + _direction += ((100-accuracy) * random_range(-1,1)); } repeat(barrel_count){ var _bullet_qualities = { From caac4b93444070e3f95336347f3c656d518143f3 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 28 May 2025 13:56:47 +0100 Subject: [PATCH 079/155] runtime upgrade --- ChapterMaster.yyp | 2 +- options/main/options_main.yy | 3 +- options/operagx/options_operagx.yy | 3 +- scripts/scr_ShipStruct/scr_ShipStruct.gml | 2 + sounds/snd_battle/snd_battle.yy | 3 +- sounds/snd_blood/snd_blood.yy | 3 +- sounds/snd_buzz/snd_buzz.yy | 3 +- sounds/snd_click/snd_click.yy | 3 +- sounds/snd_click_small/snd_click_small.yy | 3 +- sounds/snd_defeat/snd_defeat.yy | 3 +- sounds/snd_diboz/snd_diboz.yy | 3 +- sounds/snd_end_turn/snd_end_turn.yy | 3 +- sounds/snd_error/snd_error.yy | 3 +- sounds/snd_identify/snd_identify.yy | 3 +- sounds/snd_legal/snd_legal.yy | 3 +- sounds/snd_postbattle/snd_postbattle.yy | 3 +- sounds/snd_prologue/snd_prologue.yy | 3 +- sounds/snd_redownload/snd_redownload.yy | 3 +- sounds/snd_royal/snd_royal.yy | 3 +- sounds/snd_stc/snd_stc.yy | 3 +- sounds/snd_vode/snd_vode.yy | 3 +- sprites/Sprite544/Sprite544.yy | 8 +- sprites/bg_space/bg_space.yy | 8 +- sprites/dsgsdgsdg/dsgsdgsdg.yy | 74 +-- .../mk7_chest_variants/mk7_chest_variants.yy | 14 +- sprites/spr_advisors/spr_advisors.yy | 2 +- .../spr_apoth_area_pad/spr_apoth_area_pad.yy | 8 +- .../spr_apothecary_lights.yy | 8 +- .../spr_aquila_colors/spr_aquila_colors.yy | 86 +-- sprites/spr_arrow/spr_arrow.yy | 26 +- .../spr_artifact_button.yy | 50 +- .../spr_artificer_armour.yy | 8 +- .../spr_artificer_chest.yy | 14 +- .../spr_artificer_colors.yy | 80 +-- .../spr_artificer_colors2.yy | 80 +-- .../spr_artificer_left_leg.yy | 20 +- .../spr_artificer_left_pad.yy | 8 +- .../spr_artificer_left_trim.yy | 8 +- .../spr_artificer_mouth.yy | 14 +- .../spr_artificer_right_leg.yy | 20 +- .../spr_artificer_thorax.yy | 14 +- sprites/spr_assault_ram/spr_assault_ram.yy | 8 +- sprites/spr_attacked/spr_attacked.yy | 2 +- sprites/spr_azreal/spr_azreal.yy | 8 +- sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy | 14 +- sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy | 14 +- sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy | 14 +- .../spr_backpack_fastening.yy | 8 +- .../spr_ballistic_skill_icon.yy | 8 +- sprites/spr_bar/spr_bar.yy | 68 +- sprites/spr_bare_eyes/spr_bare_eyes.yy | 164 ++--- .../spr_bare_head_facial_hair.yy | 320 +++------ .../spr_bare_head_facial_hair_colourable.yy | 62 +- sprites/spr_bare_heads/spr_bare_heads.yy | 272 +++----- .../spr_bare_heads_colourable.yy | 38 +- .../spr_bare_neck_colourable.yy | 8 +- sprites/spr_bare_necks/spr_bare_necks.yy | 50 +- sprites/spr_battle_block/spr_battle_block.yy | 14 +- .../spr_battle_block2/spr_battle_block2.yy | 8 +- .../spr_beakie_colors/spr_beakie_colors.yy | 86 +-- .../spr_binders_robes/spr_binders_robes.yy | 14 +- sprites/spr_bio_fighter/spr_bio_fighter.yy | 8 +- sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy | 26 +- .../spr_bionic_left_arm.yy | 14 +- .../spr_bionic_left_eyes.yy | 20 +- .../spr_bionic_leg_left.yy | 20 +- .../spr_bionic_leg_right.yy | 20 +- .../spr_bionic_right_arm.yy | 14 +- .../spr_bionic_right_eyes.yy | 20 +- sprites/spr_bionics_arm/spr_bionics_arm.yy | 14 +- .../spr_bionics_arm_2/spr_bionics_arm_2.yy | 14 +- sprites/spr_bionics_eye/spr_bionics_eye.yy | 14 +- sprites/spr_bionics_hand/spr_bionics_hand.yy | 26 +- sprites/spr_bionics_leg/spr_bionics_leg.yy | 26 +- .../spr_bionics_leg_2/spr_bionics_leg_2.yy | 26 +- .../spr_bionics_leg_3/spr_bionics_leg_3.yy | 26 +- sprites/spr_blog/spr_blog.yy | 38 +- sprites/spr_bolt/spr_bolt.yy | 8 +- .../spr_bonding_studs_left.yy | 8 +- .../spr_bonding_studs_right.yy | 8 +- sprites/spr_build_tiny/spr_build_tiny.yy | 8 +- sprites/spr_build_tiny2/spr_build_tiny2.yy | 8 +- sprites/spr_bullet/spr_bullet.yy | 20 +- sprites/spr_cancel_small/spr_cancel_small.yy | 8 +- sprites/spr_cannon/spr_cannon.yy | 8 +- .../spr_carrion_breath/spr_carrion_breath.yy | 50 +- .../spr_chain_mail_tabbard.yy | 8 +- .../spr_chap_area_pad/spr_chap_area_pad.yy | 8 +- .../spr_chap_trim_left/spr_chap_trim_left.yy | 8 +- .../spr_chap_trim_right.yy | 8 +- .../spr_chaplain_helm/spr_chaplain_helm.yy | 8 +- .../spr_chaplain_term_helm.yy | 8 +- .../spr_chaplain_wolf_helm.yy | 8 +- .../spr_chaplain_wolfterm_helm.yy | 8 +- .../spr_charisma_icon/spr_charisma_icon.yy | 8 +- .../spr_checker_texture.yy | 16 +- sprites/spr_cloak_cloth/spr_cloak_cloth.yy | 8 +- sprites/spr_cloak_fur/spr_cloak_fur.yy | 8 +- .../spr_cloak_image_0/spr_cloak_image_0.yy | 32 +- .../spr_cloak_image_1/spr_cloak_image_1.yy | 20 +- sprites/spr_cloak_scale/spr_cloak_scale.yy | 14 +- .../spr_cloth_tabbard/spr_cloth_tabbard.yy | 8 +- .../spr_clothing_colors.yy | 38 +- sprites/spr_cm_specialty/spr_cm_specialty.yy | 2 +- sprites/spr_cog_pinion/spr_cog_pinion.yy | 8 +- .../spr_company_title/spr_company_title.yy | 32 +- .../spr_constitution_icon.yy | 8 +- sprites/spr_craftworld/spr_craftworld.yy | 8 +- .../spr_creation_arrow/spr_creation_arrow.yy | 32 +- .../spr_creation_check/spr_creation_check.yy | 26 +- .../spr_creation_existing.yy | 8 +- .../spr_creation_founding.yy | 8 +- .../spr_creation_icon/spr_creation_icon.yy | 8 +- .../spr_creation_nosplash.yy | 2 +- .../spr_creation_other/spr_creation_other.yy | 2 +- .../spr_creation_slate/spr_creation_slate.yy | 2 +- sprites/spr_credits_bg/spr_credits_bg.yy | 8 +- sprites/spr_crusader/spr_crusader.yy | 8 +- .../spr_crux_on_chain/spr_crux_on_chain.yy | 8 +- .../spr_cthonian_tabbard.yy | 8 +- sprites/spr_cursor/spr_cursor.yy | 32 +- sprites/spr_da_backpack/spr_da_backpack.yy | 14 +- sprites/spr_da_chaplain/spr_da_chaplain.yy | 14 +- sprites/spr_da_mk3/spr_da_mk3.yy | 8 +- sprites/spr_da_mk4/spr_da_mk4.yy | 8 +- sprites/spr_da_mk5/spr_da_mk5.yy | 8 +- .../spr_da_mk5_helm_crests.yy | 8 +- sprites/spr_da_mk6/spr_da_mk6.yy | 8 +- .../spr_da_mk6_helm_crests.yy | 8 +- sprites/spr_da_mk7/spr_da_mk7.yy | 8 +- .../spr_da_mk7_helm_crests.yy | 8 +- sprites/spr_da_mk8/spr_da_mk8.yy | 8 +- sprites/spr_da_standard/spr_da_standard.yy | 26 +- .../spr_da_term_honor/spr_da_term_honor.yy | 8 +- sprites/spr_dante/spr_dante.yy | 14 +- sprites/spr_darkstar/spr_darkstar.yy | 8 +- sprites/spr_data_slate/spr_data_slate.yy | 14 +- .../spr_data_slate_back.yy | 8 +- .../spr_data_slate_border.yy | 8 +- .../spr_death_watch_pauldron.yy | 8 +- sprites/spr_def_fortress/spr_def_fortress.yy | 8 +- sprites/spr_def_mine/spr_def_mine.yy | 8 +- sprites/spr_def_platform/spr_def_platform.yy | 14 +- sprites/spr_def_silo/spr_def_silo.yy | 14 +- sprites/spr_def_station/spr_def_station.yy | 14 +- sprites/spr_defeat/spr_defeat.yy | 2 +- .../spr_dev_pack_complex.yy | 14 +- .../spr_dexterity_icon/spr_dexterity_icon.yy | 8 +- .../spr_diplo_symbols/spr_diplo_symbols.yy | 8 +- sprites/spr_diplomacy/spr_diplomacy.yy | 8 +- .../spr_diplomacy_dae/spr_diplomacy_dae.yy | 2 +- .../spr_diplomacy_defeated.yy | 14 +- .../spr_diplomacy_med/spr_diplomacy_med.yy | 2 +- .../spr_diplomacy_small.yy | 158 ++--- sprites/spr_disposition/spr_disposition.yy | 134 ++-- .../spr_disposition_small.yy | 122 ++-- .../spr_dread_assault_cannon.yy | 26 +- .../spr_dread_autocannon.yy | 26 +- sprites/spr_dread_claw/spr_dread_claw.yy | 26 +- sprites/spr_dread_colors/spr_dread_colors.yy | 38 +- .../spr_dread_heavy_bolter.yy | 26 +- .../spr_dread_iron_clad.yy | 26 +- .../spr_dread_lascannon.yy | 26 +- .../spr_dread_missile/spr_dread_missile.yy | 26 +- .../spr_dread_plasma_cannon.yy | 26 +- .../spr_dreadnought_chasis_colors.yy | 8 +- .../spr_dreadnought_complex.yy | 20 +- .../spr_dreadnought_decorations.yy | 20 +- sprites/spr_eldar_hire/spr_eldar_hire.yy | 14 +- .../spr_errant_colors/spr_errant_colors.yy | 86 +-- sprites/spr_explosion/spr_explosion.yy | 44 +- sprites/spr_explosion2/spr_explosion2.yy | 86 +-- sprites/spr_explosion3/spr_explosion3.yy | 146 ++--- .../spr_explosion_plas/spr_explosion_plas.yy | 44 +- .../spr_facial_colors/spr_facial_colors.yy | 38 +- .../spr_faction_icons/spr_faction_icons.yy | 98 +-- sprites/spr_faith_icon/spr_faith_icon.yy | 8 +- sprites/spr_fast_forward/spr_fast_forward.yy | 8 +- sprites/spr_fighta/spr_fighta.yy | 8 +- sprites/spr_flame/spr_flame.yy | 50 +- sprites/spr_flame2/spr_flame2.yy | 50 +- sprites/spr_flamer_new/spr_flamer_new.yy | 128 ++-- sprites/spr_fleet_alert/spr_fleet_alert.yy | 170 ++--- sprites/spr_fleet_chaos/spr_fleet_chaos.yy | 62 +- .../spr_fleet_civilian/spr_fleet_civilian.yy | 26 +- sprites/spr_fleet_eldar/spr_fleet_eldar.yy | 38 +- .../spr_fleet_imperial/spr_fleet_imperial.yy | 62 +- .../spr_fleet_inquisition.yy | 20 +- .../spr_fleet_mechanicus.yy | 8 +- sprites/spr_fleet_necron/spr_fleet_necron.yy | 56 +- sprites/spr_fleet_ork/spr_fleet_ork.yy | 62 +- sprites/spr_fleet_tau/spr_fleet_tau.yy | 68 +- sprites/spr_fleet_tiny/spr_fleet_tiny.yy | 62 +- .../spr_fleet_tyranid/spr_fleet_tyranid.yy | 74 +-- .../spr_flora_camo_texture.yy | 16 +- sprites/spr_force_icon/spr_force_icon.yy | 8 +- sprites/spr_forge_holo/spr_forge_holo.yy | 8 +- .../spr_forge_points_icon.yy | 14 +- .../spr_formation_arrow.yy | 8 +- .../spr_formation_bars/spr_formation_bars.yy | 92 +-- .../spr_formation_splash.yy | 8 +- sprites/spr_fur_tabbard/spr_fur_tabbard.yy | 8 +- .../spr_fur_tail_topknot.yy | 8 +- sprites/spr_gear_apoth/spr_gear_apoth.yy | 14 +- sprites/spr_gear_chap/spr_gear_chap.yy | 26 +- .../spr_gear_combat_shield.yy | 14 +- sprites/spr_gear_halo/spr_gear_halo.yy | 26 +- sprites/spr_gear_hood1/spr_gear_hood1.yy | 74 +-- sprites/spr_gear_hood2/spr_gear_hood2.yy | 8 +- sprites/spr_gear_hood3/spr_gear_hood3.yy | 62 +- .../spr_gear_librarian/spr_gear_librarian.yy | 8 +- .../spr_gear_librarian_term.yy | 8 +- sprites/spr_gear_techa/spr_gear_techa.yy | 8 +- .../spr_generic_honor_guard.yy | 38 +- .../spr_generic_sgt_mk3.yy | 26 +- .../spr_generic_sgt_mk4.yy | 32 +- .../spr_generic_sgt_mk5.yy | 26 +- .../spr_generic_sgt_mk6.yy | 26 +- .../spr_generic_sgt_mk7.yy | 26 +- .../spr_generic_sgt_mk8.yy | 26 +- .../spr_generic_terminator_sgt.yy | 26 +- .../spr_gladiator_crest.yy | 8 +- sprites/spr_glob/spr_glob.yy | 8 +- .../spr_gothic_numbers_right_pauldron.yy | 68 +- sprites/spr_green_las/spr_green_las.yy | 8 +- sprites/spr_ground_conv/spr_ground_conv.yy | 8 +- sprites/spr_ground_las/spr_ground_las.yy | 8 +- .../spr_ground_plasma/spr_ground_plasma.yy | 8 +- .../spr_happenings_blue.yy | 158 ++--- .../spr_happenings_green.yy | 158 ++--- .../spr_happenings_purple.yy | 158 ++--- .../spr_happenings_red/spr_happenings_red.yy | 158 ++--- .../spr_happenings_white.yy | 158 ++--- .../spr_hazzard_texture.yy | 16 +- .../spr_helm_decorations.yy | 14 +- sprites/spr_helm_stripe/spr_helm_stripe.yy | 20 +- .../spr_helm_stripe_term.yy | 14 +- sprites/spr_help_exit/spr_help_exit.yy | 14 +- sprites/spr_help_panel/spr_help_panel.yy | 8 +- .../spr_heresy_colors/spr_heresy_colors.yy | 80 +-- sprites/spr_hero/spr_hero.yy | 98 +-- sprites/spr_hero_skull/spr_hero_skull.yy | 8 +- sprites/spr_honor_helm/spr_honor_helm.yy | 32 +- .../spr_icon_apothecarion.yy | 8 +- .../spr_icon_ballistic_skill.yy | 8 +- sprites/spr_icon_bionics/spr_icon_bionics.yy | 8 +- sprites/spr_icon_change/spr_icon_change.yy | 8 +- sprites/spr_icon_health/spr_icon_health.yy | 8 +- .../spr_icon_iron_halo/spr_icon_iron_halo.yy | 8 +- .../spr_icon_iron_hands.yy | 8 +- .../spr_icon_iron_hands2.yy | 8 +- .../spr_icon_iron_hands3.yy | 8 +- .../spr_icon_librarius/spr_icon_librarius.yy | 8 +- sprites/spr_icon_psyker/spr_icon_psyker.yy | 8 +- sprites/spr_icon_shield/spr_icon_shield.yy | 8 +- sprites/spr_icon_shield2/spr_icon_shield2.yy | 8 +- .../spr_icon_telepatica.yy | 8 +- .../spr_icon_telepatica2.yy | 8 +- sprites/spr_icon_veteran/spr_icon_veteran.yy | 8 +- .../spr_icon_weapon_skill.yy | 8 +- sprites/spr_icon_weight/spr_icon_weight.yy | 8 +- sprites/spr_icon_wounds/spr_icon_wounds.yy | 8 +- sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy | 20 +- sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy | 32 +- sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy | 14 +- sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy | 14 +- sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy | 14 +- sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy | 14 +- .../spr_indomitus_backpack_variants.yy | 20 +- .../spr_indomitus_belt/spr_indomitus_belt.yy | 20 +- .../spr_indomitus_chest_variants.yy | 20 +- .../spr_indomitus_complex.yy | 8 +- .../spr_indomitus_head_variants.yy | 8 +- .../spr_indomitus_knightly_robe.yy | 8 +- .../spr_indomitus_left_arm.yy | 8 +- .../spr_indomitus_left_arm_bionic.yy | 8 +- .../spr_indomitus_left_eye_bionic.yy | 26 +- .../spr_indomitus_left_knee_crux.yy | 8 +- .../spr_indomitus_left_leg_bionic.yy | 8 +- .../spr_indomitus_left_shin.yy | 20 +- .../spr_indomitus_leg_variants.yy | 14 +- .../spr_indomitus_right_arm.yy | 8 +- .../spr_indomitus_right_arm_bionic.yy | 8 +- .../spr_indomitus_right_eye_bionic.yy | 26 +- .../spr_indomitus_right_knee_crux.yy | 8 +- .../spr_indomitus_right_leg_bionic.yy | 8 +- .../spr_indomitus_right_shin.yy | 20 +- sprites/spr_ingame_menu/spr_ingame_menu.yy | 8 +- .../spr_inspect_small/spr_inspect_small.yy | 8 +- .../spr_intelligence_icon.yy | 8 +- sprites/spr_iron2_colors/spr_iron2_colors.yy | 86 +-- sprites/spr_iron_colors/spr_iron_colors.yy | 86 +-- .../spr_jump_pack_complex.yy | 8 +- .../spr_knightly_belt/spr_knightly_belt.yy | 8 +- .../spr_knightly_personal_livery.yy | 32 +- .../spr_knightly_robes/spr_knightly_robes.yy | 20 +- sprites/spr_laurel/spr_laurel.yy | 8 +- .../spr_left_pauldron_chainmail.yy | 16 +- .../spr_left_pauldron_fur_hanging.yy | 34 +- .../spr_left_shin_spikes.yy | 8 +- .../spr_leopard_sprite/spr_leopard_sprite.yy | 16 +- sprites/spr_lib_area_pad/spr_lib_area_pad.yy | 8 +- sprites/spr_lion_belt/spr_lion_belt.yy | 8 +- sprites/spr_load_splash/spr_load_splash.yy | 8 +- sprites/spr_load_text/spr_load_text.yy | 20 +- sprites/spr_loadbar/spr_loadbar.yy | 8 +- .../spr_loadbar_cover/spr_loadbar_cover.yy | 608 ++++++------------ .../spr_loadbar_empty/spr_loadbar_empty.yy | 8 +- sprites/spr_loading/spr_loading.yy | 74 +-- sprites/spr_loading2/spr_loading2.yy | 50 +- sprites/spr_loc_icon/spr_loc_icon.yy | 32 +- sprites/spr_luck_icon/spr_luck_icon.yy | 8 +- sprites/spr_mahreen/spr_mahreen.yy | 92 +-- sprites/spr_mahreen_gun/spr_mahreen_gun.yy | 92 +-- .../spr_mahreen_secondary.yy | 92 +-- .../spr_mahreen_visor/spr_mahreen_visor.yy | 92 +-- sprites/spr_manta/spr_manta.yy | 8 +- .../spr_mantis_warriors_icon.yy | 14 +- .../spr_mar_collision/spr_mar_collision.yy | 104 +-- .../spr_mar_fire_body1/spr_mar_fire_body1.yy | 26 +- .../spr_mar_fire_body2/spr_mar_fire_body2.yy | 26 +- .../spr_mar_fire_body3/spr_mar_fire_body3.yy | 26 +- .../spr_mar_fire_pauldron1.yy | 26 +- .../spr_mar_fire_pauldron2.yy | 26 +- .../spr_mar_walk_body1/spr_mar_walk_body1.yy | 104 +-- .../spr_mar_walk_body2/spr_mar_walk_body2.yy | 104 +-- .../spr_mar_walk_body3/spr_mar_walk_body3.yy | 104 +-- .../spr_mar_walk_legs1/spr_mar_walk_legs1.yy | 104 +-- .../spr_mar_walk_legs3/spr_mar_walk_legs3.yy | 104 +-- .../spr_mar_walk_legs4/spr_mar_walk_legs4.yy | 104 +-- .../spr_mar_walk_pauldron1.yy | 104 +-- .../spr_mar_walk_pauldron2.yy | 104 +-- sprites/spr_marine_base/spr_marine_base.yy | 44 +- .../spr_marine_cloth_hood.yy | 8 +- sprites/spr_marine_head/spr_marine_head.yy | 38 +- sprites/spr_marine_robes/spr_marine_robes.yy | 14 +- .../spr_marksmans_honor.yy | 14 +- .../spr_master_splash/spr_master_splash.yy | 8 +- sprites/spr_master_title/spr_master_title.yy | 8 +- .../spr_maximus_colors/spr_maximus_colors.yy | 80 +-- .../spr_maximus_colors2.yy | 86 +-- .../spr_medicine_icon/spr_medicine_icon.yy | 8 +- sprites/spr_melta/spr_melta.yy | 50 +- .../spr_metal_tabbard/spr_metal_tabbard.yy | 8 +- sprites/spr_mk3_belt/spr_mk3_belt.yy | 8 +- sprites/spr_mk3_chest/spr_mk3_chest.yy | 8 +- sprites/spr_mk3_colors/spr_mk3_colors.yy | 106 +-- sprites/spr_mk3_complex/spr_mk3_complex.yy | 8 +- .../spr_mk3_complex_backpack.yy | 8 +- .../spr_mk3_forehead_variants.yy | 44 +- .../spr_mk3_head_variants.yy | 14 +- sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy | 8 +- .../spr_mk3_left_leg_variants.yy | 20 +- .../spr_mk3_left_trim/spr_mk3_left_trim.yy | 26 +- sprites/spr_mk3_mouth/spr_mk3_mouth.yy | 20 +- .../spr_mk3_mouth_flame_cult.yy | 8 +- .../spr_mk3_mouth_prussian.yy | 8 +- .../spr_mk3_right_arm/spr_mk3_right_arm.yy | 8 +- .../spr_mk3_right_leg_variants.yy | 20 +- .../spr_mk3_right_trim/spr_mk3_right_trim.yy | 26 +- .../spr_mk3_runic_chest.yy | 8 +- .../spr_mk4_chest_fastenings.yy | 26 +- .../spr_mk4_chest_variants.yy | 14 +- sprites/spr_mk4_colors/spr_mk4_colors.yy | 98 +-- sprites/spr_mk4_complex/spr_mk4_complex.yy | 8 +- .../spr_mk4_complex_backpack.yy | 8 +- .../spr_mk4_head_variants.yy | 8 +- sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy | 8 +- .../spr_mk4_left_trim/spr_mk4_left_trim.yy | 32 +- .../spr_mk4_leg_variants.yy | 26 +- .../spr_mk4_mongol_chest_variants.yy | 8 +- .../spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy | 8 +- .../spr_mk4_mouth_variants.yy | 32 +- .../spr_mk4_right_arm/spr_mk4_right_arm.yy | 8 +- .../spr_mk4_right_trim/spr_mk4_right_trim.yy | 32 +- .../spr_mk5_chest_variants.yy | 8 +- sprites/spr_mk5_colors/spr_mk5_colors.yy | 86 +-- sprites/spr_mk5_complex/spr_mk5_complex.yy | 8 +- .../spr_mk5_complex_backpack.yy | 8 +- .../spr_mk5_head_variants.yy | 8 +- sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy | 8 +- .../spr_mk5_right_arm/spr_mk5_right_arm.yy | 8 +- .../spr_mk5_samuri_faceplate.yy | 8 +- sprites/spr_mk6_complex/spr_mk6_complex.yy | 8 +- .../spr_mk6_complex_backpack.yy | 8 +- .../spr_mk6_cthonian_heads.yy | 8 +- .../spr_mk6_forehead_knightly.yy | 20 +- .../spr_mk6_head_variants.yy | 20 +- .../spr_mk6_knightly_mouth_variants.yy | 8 +- sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy | 8 +- .../spr_mk6_mongol_chest_variants.yy | 8 +- .../spr_mk6_mouth_prussian.yy | 20 +- .../spr_mk6_mouth_variants.yy | 20 +- .../spr_mk6_right_arm/spr_mk6_right_arm.yy | 8 +- .../spr_mk7_chest_ultra.yy | 20 +- .../spr_mk7_chest_variants.yy | 32 +- sprites/spr_mk7_colors/spr_mk7_colors.yy | 86 +-- sprites/spr_mk7_complex/spr_mk7_complex.yy | 16 +- .../spr_mk7_complex_backpack.yy | 8 +- .../spr_mk7_complex_belt.yy | 20 +- .../spr_mk7_complex_crux_belt.yy | 8 +- .../spr_mk7_complex_knees.yy | 16 +- .../spr_mk7_complex_left_pauldron.yy | 16 +- .../spr_mk7_complex_right_pauldron.yy | 22 +- .../spr_mk7_full_colour.yy | 26 +- .../spr_mk7_gladiator_chest.yy | 20 +- .../spr_mk7_head_variants.yy | 8 +- .../spr_mk7_knightly_chest.yy | 8 +- sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy | 8 +- .../spr_mk7_left_trim/spr_mk7_left_trim.yy | 26 +- .../spr_mk7_leg_variants.yy | 20 +- .../spr_mk7_mongol_chest_variants.yy | 14 +- .../spr_mk7_mouth_prussian.yy | 20 +- .../spr_mk7_mouth_variants.yy | 26 +- .../spr_mk7_prussia_chest.yy | 32 +- .../spr_mk7_right_arm/spr_mk7_right_arm.yy | 8 +- .../spr_mk7_right_trim/spr_mk7_right_trim.yy | 26 +- .../spr_mk7_rope_belt/spr_mk7_rope_belt.yy | 8 +- .../spr_mk7_runic_belt/spr_mk7_runic_belt.yy | 8 +- .../spr_mk7_sculpted_chest.yy | 44 +- .../spr_mk7_thorax_variants.yy | 38 +- .../spr_mk7_wolf_cult_belt.yy | 8 +- .../spr_mk7_wolf_cult_chest_variants.yy | 8 +- sprites/spr_mk8_colors/spr_mk8_colors.yy | 80 +-- sprites/spr_mk8_gorget/spr_mk8_gorget.yy | 44 +- sprites/spr_mm_butts/spr_mm_butts.yy | 32 +- .../spr_mm_butts_small/spr_mm_butts_small.yy | 14 +- sprites/spr_mm_glow/spr_mm_glow.yy | 16 +- sprites/spr_mm_glowold/spr_mm_glowold.yy | 16 +- sprites/spr_mongol_hat/spr_mongol_hat.yy | 14 +- .../spr_mongol_topknots.yy | 20 +- sprites/spr_narthecium_2/spr_narthecium_2.yy | 8 +- sprites/spr_new_banner/spr_new_banner.yy | 8 +- sprites/spr_new_mm/spr_new_mm.yy | 8 +- sprites/spr_new_resource/spr_new_resource.yy | 26 +- sprites/spr_new_ui/spr_new_ui.yy | 14 +- sprites/spr_new_ui_cover/spr_new_ui_cover.yy | 8 +- .../spr_noarmour_colors.yy | 14 +- sprites/spr_none/spr_none.yy | 8 +- .../spr_numeral_left_knee.yy | 68 +- sprites/spr_ork_target/spr_ork_target.yy | 8 +- sprites/spr_p_name_bg/spr_p_name_bg.yy | 8 +- sprites/spr_pa_arms/spr_pa_arms.yy | 14 +- .../spr_pa_arms_ornate/spr_pa_arms_ornate.yy | 14 +- sprites/spr_pa_hands/spr_pa_hands.yy | 74 +-- sprites/spr_pack_arm/spr_pack_arm.yy | 14 +- sprites/spr_pack_arms/spr_pack_arms.yy | 20 +- sprites/spr_pack_brazier/spr_pack_brazier.yy | 20 +- .../spr_pack_brazier2/spr_pack_brazier2.yy | 8 +- .../spr_pack_brazier3/spr_pack_brazier3.yy | 8 +- .../spr_pack_devastator.yy | 20 +- sprites/spr_pack_jump/spr_pack_jump.yy | 20 +- .../spr_pauldron_spikes_left.yy | 8 +- .../spr_pauldron_spikes_right.yy | 8 +- sprites/spr_penitent_ui/spr_penitent_ui.yy | 8 +- .../spr_pixel_button_left.yy | 8 +- .../spr_pixel_button_middle.yy | 8 +- .../spr_pixel_button_right.yy | 8 +- .../spr_planet_screen/spr_planet_screen.yy | 8 +- .../spr_planet_splash/spr_planet_splash.yy | 8 +- sprites/spr_planets/spr_planets.yy | 128 ++-- sprites/spr_popup/spr_popup.yy | 14 +- .../spr_popup_dialogue/spr_popup_dialogue.yy | 8 +- sprites/spr_popup_event/spr_popup_event.yy | 14 +- .../spr_popup_event_avatar.yy | 8 +- sprites/spr_popup_large/spr_popup_large.yy | 14 +- sprites/spr_popup_manage/spr_popup_manage.yy | 8 +- sprites/spr_popup_medium/spr_popup_medium.yy | 14 +- sprites/spr_popup_pic/spr_popup_pic.yy | 8 +- sprites/spr_popup_select/spr_popup_select.yy | 8 +- sprites/spr_popup_small/spr_popup_small.yy | 8 +- sprites/spr_postbattle/spr_postbattle.yy | 2 +- .../spr_postbattle_space.yy | 2 +- .../spr_prussian_spike/spr_prussian_spike.yy | 32 +- sprites/spr_psy_hood/spr_psy_hood.yy | 26 +- .../spr_psy_hood_complex.yy | 8 +- sprites/spr_pulse/spr_pulse.yy | 8 +- sprites/spr_purge_1/spr_purge_1.yy | 2 +- sprites/spr_purge_2/spr_purge_2.yy | 2 +- .../spr_purge_buttons/spr_purge_buttons.yy | 8 +- sprites/spr_purge_panel/spr_purge_panel.yy | 8 +- sprites/spr_purity_s/spr_purity_s.yy | 14 +- sprites/spr_purity_seal/spr_purity_seal.yy | 26 +- sprites/spr_rack/spr_rack.yy | 20 +- .../spr_rack_and_pinion.yy | 14 +- sprites/spr_raid/spr_raid.yy | 2 +- sprites/spr_railgun/spr_railgun.yy | 8 +- sprites/spr_rectangle/spr_rectangle.yy | 8 +- sprites/spr_red_button/spr_red_button.yy | 32 +- sprites/spr_requisition/spr_requisition.yy | 8 +- sprites/spr_research_bar/spr_research_bar.yy | 20 +- sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy | 14 +- sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy | 14 +- sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy | 14 +- .../spr_right_pauldron_chainmail.yy | 16 +- .../spr_right_pauldron_fur_hanging.yy | 34 +- .../spr_right_shin_spikes.yy | 8 +- sprites/spr_rock_bg/spr_rock_bg.yy | 8 +- sprites/spr_rocket/spr_rocket.yy | 14 +- sprites/spr_rocket_ork/spr_rocket_ork.yy | 8 +- sprites/spr_rocket_whirl/spr_rocket_whirl.yy | 8 +- .../spr_roman_centurian_crest.yy | 20 +- sprites/spr_roman_cloak/spr_roman_cloak.yy | 8 +- .../spr_roman_tabbard/spr_roman_tabbard.yy | 26 +- sprites/spr_round/spr_round.yy | 8 +- .../spr_runes_hanging/spr_runes_hanging.yy | 20 +- sprites/spr_runi/spr_runi.yy | 8 +- sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy | 14 +- sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy | 14 +- sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy | 14 +- .../spr_sanguin_guard/spr_sanguin_guard.yy | 14 +- sprites/spr_save_data/spr_save_data.yy | 14 +- sprites/spr_save_footer/spr_save_footer.yy | 8 +- sprites/spr_save_header/spr_save_header.yy | 8 +- sprites/spr_save_headers/spr_save_headers.yy | 14 +- sprites/spr_saveload/spr_saveload.yy | 8 +- sprites/spr_scout_arms/spr_scout_arms.yy | 14 +- sprites/spr_scout_colors/spr_scout_colors.yy | 74 +-- .../spr_scout_complex/spr_scout_complex.yy | 8 +- sprites/spr_scout_heads/spr_scout_heads.yy | 14 +- sprites/spr_scout_left/spr_scout_left.yy | 8 +- sprites/spr_scout_new/spr_scout_new.yy | 56 +- sprites/spr_scout_right/spr_scout_right.yy | 8 +- sprites/spr_servo_arm/spr_servo_arm.yy | 8 +- .../spr_servo_harness/spr_servo_harness.yy | 8 +- sprites/spr_settings_bg/spr_settings_bg.yy | 8 +- .../spr_settings_button.yy | 8 +- sprites/spr_ship_aconite/spr_ship_aconite.yy | 8 +- sprites/spr_ship_ammer/spr_ship_ammer.yy | 8 +- sprites/spr_ship_apoc/spr_ship_apoc.yy | 8 +- sprites/spr_ship_aven/spr_ship_aven.yy | 8 +- .../spr_ship_back_black.yy | 26 +- .../spr_ship_back_white.yy | 26 +- sprites/spr_ship_bb/spr_ship_bb.yy | 8 +- sprites/spr_ship_black/spr_ship_black.yy | 8 +- sprites/spr_ship_cairn/spr_ship_cairn.yy | 8 +- sprites/spr_ship_carnage/spr_ship_carnage.yy | 8 +- .../spr_ship_castellan/spr_ship_castellan.yy | 8 +- .../spr_ship_craftworld.yy | 8 +- .../spr_ship_custodian/spr_ship_custodian.yy | 8 +- sprites/spr_ship_daemon/spr_ship_daemon.yy | 8 +- sprites/spr_ship_dese/spr_ship_dese.yy | 8 +- sprites/spr_ship_deth/spr_ship_deth.yy | 8 +- sprites/spr_ship_dirge/spr_ship_dirge.yy | 8 +- .../spr_ship_dreadclaw/spr_ship_dreadclaw.yy | 8 +- .../spr_ship_emissary/spr_ship_emissary.yy | 8 +- sprites/spr_ship_glad/spr_ship_glad.yy | 8 +- sprites/spr_ship_gorbag/spr_ship_gorbag.yy | 8 +- .../spr_ship_hellebore/spr_ship_hellebore.yy | 8 +- sprites/spr_ship_hulk/spr_ship_hulk.yy | 8 +- sprites/spr_ship_hunt/spr_ship_hunt.yy | 8 +- sprites/spr_ship_icono/spr_ship_icono.yy | 8 +- sprites/spr_ship_inter/spr_ship_inter.yy | 8 +- sprites/spr_ship_jackal/spr_ship_jackal.yy | 8 +- sprites/spr_ship_krool/spr_ship_krool.yy | 8 +- sprites/spr_ship_kroozer/spr_ship_kroozer.yy | 8 +- .../spr_ship_leviathan/spr_ship_leviathan.yy | 8 +- sprites/spr_ship_nem/spr_ship_nem.yy | 8 +- .../spr_ship_protector/spr_ship_protector.yy | 8 +- sprites/spr_ship_prowler/spr_ship_prowler.yy | 8 +- sprites/spr_ship_ravager/spr_ship_ravager.yy | 8 +- .../spr_ship_razorfiend.yy | 8 +- sprites/spr_ship_reaper/spr_ship_reaper.yy | 8 +- sprites/spr_ship_shadow/spr_ship_shadow.yy | 8 +- sprites/spr_ship_shields/spr_ship_shields.yy | 8 +- sprites/spr_ship_shroud/spr_ship_shroud.yy | 8 +- sprites/spr_ship_slam/spr_ship_slam.yy | 8 +- sprites/spr_ship_song/spr_ship_song.yy | 8 +- sprites/spr_ship_stalker/spr_ship_stalker.yy | 8 +- sprites/spr_ship_stri/spr_ship_stri.yy | 8 +- sprites/spr_ship_sword/spr_ship_sword.yy | 8 +- sprites/spr_ship_th/spr_ship_th.yy | 8 +- sprites/spr_ship_veng/spr_ship_veng.yy | 8 +- sprites/spr_ship_void/spr_ship_void.yy | 8 +- sprites/spr_ship_warden/spr_ship_warden.yy | 8 +- .../spr_shutter_button/spr_shutter_button.yy | 44 +- .../spr_sister_hospitaler.yy | 8 +- .../spr_sister_of_battle.yy | 8 +- sprites/spr_skitarii/spr_skitarii.yy | 8 +- .../spr_skull_on_chain/spr_skull_on_chain.yy | 8 +- sprites/spr_skulls_belt/spr_skulls_belt.yy | 8 +- sprites/spr_slate_2/spr_slate_2.yy | 62 +- sprites/spr_sororitas1/spr_sororitas1.yy | 14 +- sprites/spr_space_bg/spr_space_bg.yy | 8 +- sprites/spr_special_helm/spr_special_helm.yy | 8 +- sprites/spr_star/spr_star.yy | 38 +- sprites/spr_star_hulk/spr_star_hulk.yy | 8 +- sprites/spr_star_pulse/spr_star_pulse.yy | 218 +++---- sprites/spr_star_screen/spr_star_screen.yy | 44 +- .../spr_strength_icon/spr_strength_icon.yy | 8 +- sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy | 14 +- sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy | 14 +- sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy | 14 +- .../spr_sword_pendant/spr_sword_pendant.yy | 8 +- .../spr_tartaros2_colors.yy | 68 +- .../spr_tartaros_arms/spr_tartaros_arms.yy | 8 +- .../spr_tartaros_chest/spr_tartaros_chest.yy | 32 +- .../spr_tartaros_colors.yy | 62 +- .../spr_tartaros_complex.yy | 8 +- .../spr_tartaros_faceplate.yy | 14 +- .../spr_tartaros_gorget.yy | 26 +- .../spr_tartaros_head_variants.yy | 26 +- .../spr_tartaros_left_arm.yy | 8 +- .../spr_tartaros_left_leg.yy | 32 +- .../spr_tartaros_left_trim.yy | 38 +- .../spr_tartaros_right_arm.yy | 8 +- .../spr_tartaros_right_leg.yy | 32 +- .../spr_tartaros_right_trim.yy | 38 +- .../spr_tartaros_wep_fix.yy | 50 +- .../spr_tech_area_pad/spr_tech_area_pad.yy | 8 +- sprites/spr_tech_belt/spr_tech_belt.yy | 8 +- .../spr_tech_face_plate.yy | 8 +- .../spr_techmarine_chest.yy | 8 +- .../spr_techmarine_complex.yy | 8 +- .../spr_techmarine_core.yy | 62 +- .../spr_techmarine_head.yy | 8 +- .../spr_techmarine_left_leg.yy | 8 +- .../spr_techmarine_left_trim.yy | 8 +- .../spr_techmarine_right_leg.yy | 8 +- .../spr_techmarine_right_trim.yy | 8 +- .../spr_technology_icon.yy | 8 +- sprites/spr_techpriest/spr_techpriest.yy | 8 +- sprites/spr_teeth/spr_teeth.yy | 14 +- .../spr_term_left_fur_hanging.yy | 26 +- .../spr_term_right_fur_hanging.yy | 26 +- .../spr_termi_wep_fix/spr_termi_wep_fix.yy | 50 +- .../spr_terminator2_colors.yy | 74 +-- .../spr_terminator3_colors.yy | 62 +- .../spr_terminator_arms.yy | 38 +- .../spr_terminator_chap.yy | 74 +-- .../spr_terminator_colors.yy | 62 +- .../spr_terminator_complex_arm_hidden_left.yy | 8 +- ...spr_terminator_complex_arm_hidden_right.yy | 8 +- .../spr_terminator_complex_arms_upper_left.yy | 8 +- ...spr_terminator_complex_arms_upper_right.yy | 8 +- .../spr_terminator_hands.yy | 74 +-- .../spr_terminator_laurel.yy | 8 +- .../spr_terminator_metal_tabbard.yy | 8 +- sprites/spr_tooltip1/spr_tooltip1.yy | 14 +- sprites/spr_torpedo/spr_torpedo.yy | 8 +- .../spr_torpedo_board/spr_torpedo_board.yy | 8 +- sprites/spr_ui_but_1/spr_ui_but_1.yy | 152 ++--- sprites/spr_ui_but_2/spr_ui_but_2.yy | 152 ++--- sprites/spr_ui_but_3/spr_ui_but_3.yy | 152 ++--- sprites/spr_ui_but_4/spr_ui_but_4.yy | 152 ++--- sprites/spr_ui_hov_1/spr_ui_hov_1.yy | 8 +- sprites/spr_ui_hov_2/spr_ui_hov_2.yy | 8 +- sprites/spr_ui_hov_3/spr_ui_hov_3.yy | 8 +- sprites/spr_ui_hov_4/spr_ui_hov_4.yy | 8 +- .../spr_ultra_backpack/spr_ultra_backpack.yy | 8 +- sprites/spr_ultra_belt/spr_ultra_belt.yy | 8 +- .../spr_ultra_honor_guard.yy | 20 +- .../spr_ultra_honor_guard2.yy | 20 +- .../spr_ultra_right_shoulder_hanging.yy | 8 +- .../spr_ultra_tassels/spr_ultra_tassels.yy | 8 +- sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy | 14 +- sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy | 14 +- sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy | 14 +- sprites/spr_view_small/spr_view_small.yy | 14 +- .../spr_warp_level_icon.yy | 26 +- sprites/spr_warp_storm/spr_warp_storm.yy | 344 ++++------ sprites/spr_weapon_assca/spr_weapon_assca.yy | 14 +- .../spr_weapon_autocannon.yy | 8 +- .../spr_weapon_autocannon2.yy | 8 +- sprites/spr_weapon_blank/spr_weapon_blank.yy | 8 +- .../spr_weapon_boarding.yy | 26 +- .../spr_weapon_bolter/spr_weapon_bolter.yy | 16 +- .../spr_weapon_boltpis/spr_weapon_boltpis.yy | 8 +- .../spr_weapon_boltstorm_gauntlet.yy | 14 +- .../spr_weapon_boltstorm_gauntlet_small.yy | 14 +- .../spr_weapon_chainfist.yy | 14 +- .../spr_weapon_chainfist_small.yy | 14 +- sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy | 8 +- .../spr_weapon_chsword/spr_weapon_chsword.yy | 8 +- .../spr_weapon_colors/spr_weapon_colors.yy | 20 +- .../spr_weapon_comflamer.yy | 8 +- .../spr_weapon_comgrav/spr_weapon_comgrav.yy | 8 +- .../spr_weapon_commelta.yy | 8 +- .../spr_weapon_complas/spr_weapon_complas.yy | 8 +- .../spr_weapon_crozarc/spr_weapon_crozarc.yy | 14 +- .../spr_weapon_eldsword.yy | 14 +- sprites/spr_weapon_evisc/spr_weapon_evisc.yy | 14 +- .../spr_weapon_flamer/spr_weapon_flamer.yy | 8 +- .../spr_weapon_frcaxe/spr_weapon_frcaxe.yy | 8 +- .../spr_weapon_frcstaff.yy | 8 +- .../spr_weapon_grav_cannon.yy | 8 +- .../spr_weapon_grav_gun.yy | 16 +- .../spr_weapon_grav_pistol.yy | 16 +- .../spr_weapon_hand_flamer.yy | 16 +- sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy | 8 +- .../spr_weapon_hflamer/spr_weapon_hflamer.yy | 8 +- .../spr_weapon_hflamer_term.yy | 14 +- .../spr_weapon_hthhammer.yy | 14 +- .../spr_weapon_inferno/spr_weapon_inferno.yy | 8 +- .../spr_weapon_infernus_hbolt.yy | 16 +- sprites/spr_weapon_knife/spr_weapon_knife.yy | 8 +- sprites/spr_weapon_lasca/spr_weapon_lasca.yy | 8 +- .../spr_weapon_lightning1.yy | 14 +- .../spr_weapon_lightning2.yy | 14 +- .../spr_weapon_mace_of_absolution.yy | 8 +- sprites/spr_weapon_melta/spr_weapon_melta.yy | 8 +- .../spr_weapon_missile/spr_weapon_missile.yy | 8 +- .../spr_weapon_mmelta/spr_weapon_mmelta.yy | 14 +- sprites/spr_weapon_plasc/spr_weapon_plasc.yy | 14 +- sprites/spr_weapon_plasg/spr_weapon_plasg.yy | 8 +- .../spr_weapon_plasma_cannon_term.yy | 14 +- sprites/spr_weapon_plasp/spr_weapon_plasp.yy | 8 +- .../spr_weapon_powaxe/spr_weapon_powaxe.yy | 8 +- .../spr_weapon_powfist/spr_weapon_powfist.yy | 14 +- .../spr_weapon_powfist2.yy | 38 +- .../spr_weapon_powfist4.yy | 14 +- .../spr_weapon_powfist_old.yy | 26 +- .../spr_weapon_powmace/spr_weapon_powmace.yy | 8 +- .../spr_weapon_powmaul/spr_weapon_powmaul.yy | 8 +- .../spr_weapon_powspear.yy | 8 +- .../spr_weapon_powspear2.yy | 26 +- .../spr_weapon_powspear3.yy | 8 +- .../spr_weapon_powswo/spr_weapon_powswo.yy | 8 +- .../spr_weapon_relbla/spr_weapon_relbla.yy | 26 +- .../spr_weapon_relic_blade.yy | 14 +- .../spr_weapon_sbolter/spr_weapon_sbolter.yy | 8 +- .../spr_weapon_skill_icon.yy | 8 +- .../spr_weapon_sniper/spr_weapon_sniper.yy | 8 +- .../spr_weapon_stalker/spr_weapon_stalker.yy | 8 +- .../spr_weapon_standard.yy | 26 +- .../spr_weapon_standard2.yy | 14 +- sprites/spr_weapon_storm/spr_weapon_storm.yy | 14 +- .../spr_weapon_storm2/spr_weapon_storm2.yy | 14 +- .../spr_weapon_storm_tall.yy | 14 +- .../spr_weapon_storm_tall_2.yy | 14 +- .../spr_weapon_sword_oriental.yy | 8 +- .../spr_weapon_sword_turk.yy | 8 +- .../spr_weapon_thhammer.yy | 14 +- .../spr_weapon_xenophase_blade_var1.yy | 8 +- .../spr_weapoon_powso_flamberge.yy | 8 +- sprites/spr_welcome_bg/spr_welcome_bg.yy | 8 +- sprites/spr_wings/spr_wings.yy | 8 +- sprites/spr_wisdom_icon/spr_wisdom_icon.yy | 8 +- sprites/spr_wolf_tail/spr_wolf_tail.yy | 20 +- .../spr_ws_mk3__pualdron_veteran.yy | 8 +- .../spr_ws_mk4_monovisor.yy | 8 +- sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy | 14 +- sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy | 14 +- sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy | 14 +- .../spr_ws_mk7_scar_of_the_ancients.yy | 8 +- sprites/sprite134/sprite134.yy | 80 +-- sprites/sprite156/sprite156.yy | 8 +- sprites/sprite158/sprite158.yy | 8 +- sprites/sprite160/sprite160.yy | 8 +- sprites/sprite205/sprite205.yy | 374 ++++------- sprites/sprite221/sprite221.yy | 8 +- sprites/sprite230/sprite230.yy | 8 +- sprites/sprite235/sprite235.yy | 8 +- sprites/sprite245/sprite245.yy | 8 +- sprites/sprite266/sprite266.yy | 14 +- sprites/sprite267/sprite267.yy | 74 +-- sprites/sprite269/sprite269.yy | 104 +-- 757 files changed, 6513 insertions(+), 12328 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 908b46c89b..36f7528be9 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -2,7 +2,7 @@ "$GMProject":"v1", "%Name":"ChapterMaster", "AudioGroups":[ - {"$GMAudioGroup":"","%Name":"audiogroup_default","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, + {"$GMAudioGroup":"v1","%Name":"audiogroup_default","exportDir":"","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, ], "configs":{ "children":[], diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 858eb0c4f3..ce6c7209a8 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -1,7 +1,8 @@ { - "$GMMainOptions":"v3", + "$GMMainOptions":"v4", "%Name":"Main", "name":"Main", + "option_allow_instance_change":true, "option_audio_error_behaviour":false, "option_author":"", "option_collision_compatibility":false, diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index 92ae9c298c..2b49fa3ac3 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -1,5 +1,5 @@ { - "$GMOperaGXOptions":"", + "$GMOperaGXOptions":"v1", "%Name":"operagx", "name":"operagx", "option_operagx_display_cursor":true, @@ -23,6 +23,7 @@ "option_operagx_team_id":"473feff6-8a4c-48fb-8940-4d123455fe5a", "option_operagx_team_name":"ZAB1019 studio", "option_operagx_texture_page":"2048x2048", + "option_operagx_transparent_background":false, "option_operagx_version":"1.0.0.6", "resourceType":"GMOperaGXOptions", "resourceVersion":"2.0", diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 43d4d73b1a..04da053fb3 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -24,6 +24,8 @@ function fps_to_secs(val){ } function ShipStruct() constructor{ + crew_exp = 0; + machine_spirit_exp = 0; features = []; turrets = []; weapons = []; diff --git a/sounds/snd_battle/snd_battle.yy b/sounds/snd_battle/snd_battle.yy index 6cfc476f98..8eca95eaf4 100644 --- a/sounds/snd_battle/snd_battle.yy +++ b/sounds/snd_battle/snd_battle.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_battle", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":164.70705, + "exportDir":"", "name":"snd_battle", "parent":{ "name":"Themes", diff --git a/sounds/snd_blood/snd_blood.yy b/sounds/snd_blood/snd_blood.yy index 2e9cd4a2a3..d588cf2b7c 100644 --- a/sounds/snd_blood/snd_blood.yy +++ b/sounds/snd_blood/snd_blood.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_blood", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":120.95194, + "exportDir":"", "name":"snd_blood", "parent":{ "name":"Themes", diff --git a/sounds/snd_buzz/snd_buzz.yy b/sounds/snd_buzz/snd_buzz.yy index e251b3745e..efb71e7707 100644 --- a/sounds/snd_buzz/snd_buzz.yy +++ b/sounds/snd_buzz/snd_buzz.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_buzz", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":1.547641, + "exportDir":"", "name":"snd_buzz", "parent":{ "name":"Sounds", diff --git a/sounds/snd_click/snd_click.yy b/sounds/snd_click/snd_click.yy index 21a69821ab..8893b9b6b8 100644 --- a/sounds/snd_click/snd_click.yy +++ b/sounds/snd_click/snd_click.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_click", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.336406, + "exportDir":"", "name":"snd_click", "parent":{ "name":"Sounds", diff --git a/sounds/snd_click_small/snd_click_small.yy b/sounds/snd_click_small/snd_click_small.yy index 7351fe51ff..c57ac785b4 100644 --- a/sounds/snd_click_small/snd_click_small.yy +++ b/sounds/snd_click_small/snd_click_small.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_click_small", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.187857, + "exportDir":"", "name":"snd_click_small", "parent":{ "name":"Sounds", diff --git a/sounds/snd_defeat/snd_defeat.yy b/sounds/snd_defeat/snd_defeat.yy index 8bd3304dda..0f6a233732 100644 --- a/sounds/snd_defeat/snd_defeat.yy +++ b/sounds/snd_defeat/snd_defeat.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_defeat", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":267.6556, + "exportDir":"", "name":"snd_defeat", "parent":{ "name":"Themes", diff --git a/sounds/snd_diboz/snd_diboz.yy b/sounds/snd_diboz/snd_diboz.yy index 9cb28ab2b0..515025db07 100644 --- a/sounds/snd_diboz/snd_diboz.yy +++ b/sounds/snd_diboz/snd_diboz.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_diboz", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":214.39194, + "exportDir":"", "name":"snd_diboz", "parent":{ "name":"Themes", diff --git a/sounds/snd_end_turn/snd_end_turn.yy b/sounds/snd_end_turn/snd_end_turn.yy index 6b1d427712..ff1a8de04e 100644 --- a/sounds/snd_end_turn/snd_end_turn.yy +++ b/sounds/snd_end_turn/snd_end_turn.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_end_turn", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.331667, + "exportDir":"", "name":"snd_end_turn", "parent":{ "name":"Sounds", diff --git a/sounds/snd_error/snd_error.yy b/sounds/snd_error/snd_error.yy index 9ad262469b..08324bf515 100644 --- a/sounds/snd_error/snd_error.yy +++ b/sounds/snd_error/snd_error.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_error", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.274388, + "exportDir":"", "name":"snd_error", "parent":{ "name":"Sounds", diff --git a/sounds/snd_identify/snd_identify.yy b/sounds/snd_identify/snd_identify.yy index f656974441..6a25de74d9 100644 --- a/sounds/snd_identify/snd_identify.yy +++ b/sounds/snd_identify/snd_identify.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_identify", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.773, + "exportDir":"", "name":"snd_identify", "parent":{ "name":"Sounds", diff --git a/sounds/snd_legal/snd_legal.yy b/sounds/snd_legal/snd_legal.yy index bc41571086..f45f02da1e 100644 --- a/sounds/snd_legal/snd_legal.yy +++ b/sounds/snd_legal/snd_legal.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_legal", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":30.280918, + "exportDir":"", "name":"snd_legal", "parent":{ "name":"Themes", diff --git a/sounds/snd_postbattle/snd_postbattle.yy b/sounds/snd_postbattle/snd_postbattle.yy index 05a0f422be..ccb0bc0387 100644 --- a/sounds/snd_postbattle/snd_postbattle.yy +++ b/sounds/snd_postbattle/snd_postbattle.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_postbattle", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":279.72418, + "exportDir":"", "name":"snd_postbattle", "parent":{ "name":"Themes", diff --git a/sounds/snd_prologue/snd_prologue.yy b/sounds/snd_prologue/snd_prologue.yy index ed99240f73..c3b900765f 100644 --- a/sounds/snd_prologue/snd_prologue.yy +++ b/sounds/snd_prologue/snd_prologue.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_prologue", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":146.21767, + "exportDir":"", "name":"snd_prologue", "parent":{ "name":"Themes", diff --git a/sounds/snd_redownload/snd_redownload.yy b/sounds/snd_redownload/snd_redownload.yy index 0d9e683d88..2b31e9491a 100644 --- a/sounds/snd_redownload/snd_redownload.yy +++ b/sounds/snd_redownload/snd_redownload.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_redownload", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":1.816156, + "exportDir":"", "name":"snd_redownload", "parent":{ "name":"Sounds", diff --git a/sounds/snd_royal/snd_royal.yy b/sounds/snd_royal/snd_royal.yy index 4c809dba1b..58fce7d63c 100644 --- a/sounds/snd_royal/snd_royal.yy +++ b/sounds/snd_royal/snd_royal.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_royal", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":179.23112, + "exportDir":"", "name":"snd_royal", "parent":{ "name":"Themes", diff --git a/sounds/snd_stc/snd_stc.yy b/sounds/snd_stc/snd_stc.yy index a8e09fa42d..8e9cff2715 100644 --- a/sounds/snd_stc/snd_stc.yy +++ b/sounds/snd_stc/snd_stc.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_stc", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":0, "conversionMode":0, "duration":0.597109, + "exportDir":"", "name":"snd_stc", "parent":{ "name":"Sounds", diff --git a/sounds/snd_vode/snd_vode.yy b/sounds/snd_vode/snd_vode.yy index 90c4d541d5..bc6194d9c3 100644 --- a/sounds/snd_vode/snd_vode.yy +++ b/sounds/snd_vode/snd_vode.yy @@ -1,5 +1,5 @@ { - "$GMSound":"", + "$GMSound":"v1", "%Name":"snd_vode", "audioGroupId":{ "name":"audiogroup_default", @@ -10,6 +10,7 @@ "compression":3, "conversionMode":0, "duration":118.42445, + "exportDir":"", "name":"snd_vode", "parent":{ "name":"Themes", diff --git a/sprites/Sprite544/Sprite544.yy b/sprites/Sprite544/Sprite544.yy index 1dfd976825..fa0d6fe4c6 100644 --- a/sprites/Sprite544/Sprite544.yy +++ b/sprites/Sprite544/Sprite544.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"Sprite544", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1132b02e-7adf-47d6-ae57-ba65d8120062","name":"1132b02e-7adf-47d6-ae57-ba65d8120062","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1132b02e-7adf-47d6-ae57-ba65d8120062","name":"1132b02e-7adf-47d6-ae57-ba65d8120062","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1132b02e-7adf-47d6-ae57-ba65d8120062","path":"sprites/Sprite544/Sprite544.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdc6d240-127c-4364-9fb6-649444dd8487","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1132b02e-7adf-47d6-ae57-ba65d8120062","path":"sprites/Sprite544/Sprite544.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdc6d240-127c-4364-9fb6-649444dd8487","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/bg_space/bg_space.yy b/sprites/bg_space/bg_space.yy index 2168185ce0..9364828d81 100644 --- a/sprites/bg_space/bg_space.yy +++ b/sprites/bg_space/bg_space.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"bg_space", "bboxMode":0, "bbox_bottom":63, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4d748e19-d979-4303-9ae4-0a004dd8159f","name":"4d748e19-d979-4303-9ae4-0a004dd8159f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d748e19-d979-4303-9ae4-0a004dd8159f","name":"4d748e19-d979-4303-9ae4-0a004dd8159f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d748e19-d979-4303-9ae4-0a004dd8159f","path":"sprites/bg_space/bg_space.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5101cb29-0a09-40a1-b6ce-7afb57f5e6d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d748e19-d979-4303-9ae4-0a004dd8159f","path":"sprites/bg_space/bg_space.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5101cb29-0a09-40a1-b6ce-7afb57f5e6d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/dsgsdgsdg/dsgsdgsdg.yy b/sprites/dsgsdgsdg/dsgsdgsdg.yy index f676732510..d6dc8acbcd 100644 --- a/sprites/dsgsdgsdg/dsgsdgsdg.yy +++ b/sprites/dsgsdgsdg/dsgsdgsdg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"dsgsdgsdg", "bboxMode":0, "bbox_bottom":27, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8755bf76-0300-447b-98df-32603fd72412","name":"8755bf76-0300-447b-98df-32603fd72412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"804967a3-84c6-4c2d-876f-3f43cced0531","name":"804967a3-84c6-4c2d-876f-3f43cced0531","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23437e1a-64f8-4905-81b8-6ad985ec375b","name":"23437e1a-64f8-4905-81b8-6ad985ec375b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5270eb03-a28b-4811-8da4-46aba283ac46","name":"5270eb03-a28b-4811-8da4-46aba283ac46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8755bf76-0300-447b-98df-32603fd72412","name":"8755bf76-0300-447b-98df-32603fd72412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"804967a3-84c6-4c2d-876f-3f43cced0531","name":"804967a3-84c6-4c2d-876f-3f43cced0531","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23437e1a-64f8-4905-81b8-6ad985ec375b","name":"23437e1a-64f8-4905-81b8-6ad985ec375b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5270eb03-a28b-4811-8da4-46aba283ac46","name":"5270eb03-a28b-4811-8da4-46aba283ac46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8755bf76-0300-447b-98df-32603fd72412","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89e5d789-43f1-40b3-b484-6f0542b25f84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"157d9292-fc11-4643-9069-88002e31eeaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"783a44c2-1a13-40e7-92f1-6f83cf964635","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abff51bf-3172-4302-ab1c-e897bafe9dfa","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d01c3f5-d7c1-4183-98b0-440ee78f7efa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9356c993-17af-4903-9f3c-8cc96973e737","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be93f187-dff1-468e-be1e-a4c5ffb5f166","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"804967a3-84c6-4c2d-876f-3f43cced0531","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98d5250e-9736-40ca-8d41-7211dc4caad0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"641d28f8-d111-4a5f-9e8b-47aa6998d58c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23437e1a-64f8-4905-81b8-6ad985ec375b","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a765f95f-efbd-448b-9b39-38e7f5a6ed5e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5270eb03-a28b-4811-8da4-46aba283ac46","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb36a05f-c433-4722-843c-e8458f605c5f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24c3781b-1224-4c93-8cc1-3a5b08e199b5","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8755bf76-0300-447b-98df-32603fd72412","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89e5d789-43f1-40b3-b484-6f0542b25f84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"157d9292-fc11-4643-9069-88002e31eeaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"783a44c2-1a13-40e7-92f1-6f83cf964635","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abff51bf-3172-4302-ab1c-e897bafe9dfa","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d01c3f5-d7c1-4183-98b0-440ee78f7efa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9356c993-17af-4903-9f3c-8cc96973e737","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be93f187-dff1-468e-be1e-a4c5ffb5f166","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"804967a3-84c6-4c2d-876f-3f43cced0531","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98d5250e-9736-40ca-8d41-7211dc4caad0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"641d28f8-d111-4a5f-9e8b-47aa6998d58c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23437e1a-64f8-4905-81b8-6ad985ec375b","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a765f95f-efbd-448b-9b39-38e7f5a6ed5e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5270eb03-a28b-4811-8da4-46aba283ac46","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb36a05f-c433-4722-843c-e8458f605c5f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24c3781b-1224-4c93-8cc1-3a5b08e199b5","IsCreationKey":false,"Key":11.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/mk7_chest_variants/mk7_chest_variants.yy b/sprites/mk7_chest_variants/mk7_chest_variants.yy index 2467f1d624..d690dc273a 100644 --- a/sprites/mk7_chest_variants/mk7_chest_variants.yy +++ b/sprites/mk7_chest_variants/mk7_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"mk7_chest_variants", "bboxMode":0, "bbox_bottom":89, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f9f20b0-beb6-439c-bd82-d2569b74ba6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"deecab9f-9a51-4147-8f41-8240312df64e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f9f20b0-beb6-439c-bd82-d2569b74ba6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"deecab9f-9a51-4147-8f41-8240312df64e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_advisors/spr_advisors.yy b/sprites/spr_advisors/spr_advisors.yy index d11287eb2e..936cbc2346 100644 --- a/sprites/spr_advisors/spr_advisors.yy +++ b/sprites/spr_advisors/spr_advisors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_advisors", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy b/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy index d857a103e9..e5ad375a7d 100644 --- a/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy +++ b/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_apoth_area_pad", "bboxMode":0, "bbox_bottom":156, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9c1e74d7-d741-437f-8db4-140b9955efc9","name":"9c1e74d7-d741-437f-8db4-140b9955efc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9c1e74d7-d741-437f-8db4-140b9955efc9","name":"9c1e74d7-d741-437f-8db4-140b9955efc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c1e74d7-d741-437f-8db4-140b9955efc9","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"77dd214e-9be8-4d2a-a93c-21af64c5dd5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c1e74d7-d741-437f-8db4-140b9955efc9","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"77dd214e-9be8-4d2a-a93c-21af64c5dd5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_apothecary_lights/spr_apothecary_lights.yy b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy index 50310c7048..f8b03691d8 100644 --- a/sprites/spr_apothecary_lights/spr_apothecary_lights.yy +++ b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_apothecary_lights", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_apothecary_lights/spr_apothecary_lights.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b54351d-f020-400d-99c5-b24a753b7623","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_apothecary_lights/spr_apothecary_lights.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b54351d-f020-400d-99c5-b24a753b7623","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_aquila_colors/spr_aquila_colors.yy b/sprites/spr_aquila_colors/spr_aquila_colors.yy index 40c3214850..43f1d4643e 100644 --- a/sprites/spr_aquila_colors/spr_aquila_colors.yy +++ b/sprites/spr_aquila_colors/spr_aquila_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_aquila_colors", "bboxMode":0, "bbox_bottom":221, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"196b945c-ac20-4bf9-9811-743bb063884e","name":"196b945c-ac20-4bf9-9811-743bb063884e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5843a196-8071-4e10-b21d-45456dffc379","name":"5843a196-8071-4e10-b21d-45456dffc379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c0ec601-323c-4e06-be22-41749ffcb84e","name":"3c0ec601-323c-4e06-be22-41749ffcb84e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee592b7e-0742-407c-97d7-4123a8c1992c","name":"ee592b7e-0742-407c-97d7-4123a8c1992c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b10e630c-c99d-4c23-9e0a-46769320b643","name":"b10e630c-c99d-4c23-9e0a-46769320b643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e437bbdf-1979-4fb7-b411-468a21361f65","name":"e437bbdf-1979-4fb7-b411-468a21361f65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1df320b-7e47-42b6-b105-390436d863a4","name":"c1df320b-7e47-42b6-b105-390436d863a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d49d2d69-0fa6-4af5-815f-0e0657860737","name":"d49d2d69-0fa6-4af5-815f-0e0657860737","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e2028e31-ad62-493d-abaa-5f1fcde51501","name":"e2028e31-ad62-493d-abaa-5f1fcde51501","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"196b945c-ac20-4bf9-9811-743bb063884e","name":"196b945c-ac20-4bf9-9811-743bb063884e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5843a196-8071-4e10-b21d-45456dffc379","name":"5843a196-8071-4e10-b21d-45456dffc379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c0ec601-323c-4e06-be22-41749ffcb84e","name":"3c0ec601-323c-4e06-be22-41749ffcb84e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee592b7e-0742-407c-97d7-4123a8c1992c","name":"ee592b7e-0742-407c-97d7-4123a8c1992c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b10e630c-c99d-4c23-9e0a-46769320b643","name":"b10e630c-c99d-4c23-9e0a-46769320b643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e437bbdf-1979-4fb7-b411-468a21361f65","name":"e437bbdf-1979-4fb7-b411-468a21361f65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1df320b-7e47-42b6-b105-390436d863a4","name":"c1df320b-7e47-42b6-b105-390436d863a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d49d2d69-0fa6-4af5-815f-0e0657860737","name":"d49d2d69-0fa6-4af5-815f-0e0657860737","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e2028e31-ad62-493d-abaa-5f1fcde51501","name":"e2028e31-ad62-493d-abaa-5f1fcde51501","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"196b945c-ac20-4bf9-9811-743bb063884e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d92f84e-7fda-4042-8bf3-8d75c183ffbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5843a196-8071-4e10-b21d-45456dffc379","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1b408a5-f735-431f-a3ae-1ebeca8bd24c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28aca0d5-a8be-4d70-941a-590e091741fc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b19d1431-4f05-48ff-bb03-2d023179144a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c0ec601-323c-4e06-be22-41749ffcb84e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb6ac728-e049-4b87-bd77-7eccb8c94350","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4744f839-6997-4671-a498-e0bbbc236cb5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee592b7e-0742-407c-97d7-4123a8c1992c","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b155f6a-092b-4ec9-8a65-5df1ede3ec1a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b10e630c-c99d-4c23-9e0a-46769320b643","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd592ee2-c0db-4e55-9055-b1548d08c069","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e437bbdf-1979-4fb7-b411-468a21361f65","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"921cff8f-fc1c-4753-94b1-813e101db02b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1df320b-7e47-42b6-b105-390436d863a4","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"435242ef-9cd1-4978-b4bc-f15d7ee199bf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac399a32-b604-46e2-b847-b6c4f2e4746a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d49d2d69-0fa6-4af5-815f-0e0657860737","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84a891a9-823a-4488-bb53-6370068347c2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c81bb583-4b9b-4251-8b63-2fc42968eece","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2028e31-ad62-493d-abaa-5f1fcde51501","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b926782-d210-4324-b763-d9565e01db99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"196b945c-ac20-4bf9-9811-743bb063884e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d92f84e-7fda-4042-8bf3-8d75c183ffbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5843a196-8071-4e10-b21d-45456dffc379","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1b408a5-f735-431f-a3ae-1ebeca8bd24c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28aca0d5-a8be-4d70-941a-590e091741fc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b19d1431-4f05-48ff-bb03-2d023179144a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c0ec601-323c-4e06-be22-41749ffcb84e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb6ac728-e049-4b87-bd77-7eccb8c94350","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4744f839-6997-4671-a498-e0bbbc236cb5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee592b7e-0742-407c-97d7-4123a8c1992c","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b155f6a-092b-4ec9-8a65-5df1ede3ec1a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b10e630c-c99d-4c23-9e0a-46769320b643","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd592ee2-c0db-4e55-9055-b1548d08c069","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e437bbdf-1979-4fb7-b411-468a21361f65","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"921cff8f-fc1c-4753-94b1-813e101db02b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1df320b-7e47-42b6-b105-390436d863a4","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"435242ef-9cd1-4978-b4bc-f15d7ee199bf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac399a32-b604-46e2-b847-b6c4f2e4746a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d49d2d69-0fa6-4af5-815f-0e0657860737","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84a891a9-823a-4488-bb53-6370068347c2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c81bb583-4b9b-4251-8b63-2fc42968eece","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2028e31-ad62-493d-abaa-5f1fcde51501","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b926782-d210-4324-b763-d9565e01db99","IsCreationKey":false,"Key":13.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_arrow/spr_arrow.yy b/sprites/spr_arrow/spr_arrow.yy index 727007b913..a15eb37b4d 100644 --- a/sprites/spr_arrow/spr_arrow.yy +++ b/sprites/spr_arrow/spr_arrow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_arrow", "bboxMode":0, "bbox_bottom":31, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb5d2731-7edf-4f03-9af3-967453712162","name":"fb5d2731-7edf-4f03-9af3-967453712162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb5d2731-7edf-4f03-9af3-967453712162","name":"fb5d2731-7edf-4f03-9af3-967453712162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb5d2731-7edf-4f03-9af3-967453712162","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89adf783-a574-4edb-8f59-3b08e65bf585","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce331085-eb5b-4228-ac95-f2bffc05336d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f868074-84fa-4cec-a7ca-8bd2319cf19b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"60911368-393b-4d37-8ff6-989e4ccf4777","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb5d2731-7edf-4f03-9af3-967453712162","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89adf783-a574-4edb-8f59-3b08e65bf585","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce331085-eb5b-4228-ac95-f2bffc05336d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f868074-84fa-4cec-a7ca-8bd2319cf19b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"60911368-393b-4d37-8ff6-989e4ccf4777","IsCreationKey":false,"Key":3.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":{ diff --git a/sprites/spr_artifact_button/spr_artifact_button.yy b/sprites/spr_artifact_button/spr_artifact_button.yy index cc016abea8..7c5d1a9b72 100644 --- a/sprites/spr_artifact_button/spr_artifact_button.yy +++ b/sprites/spr_artifact_button/spr_artifact_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artifact_button", "bboxMode":0, "bbox_bottom":10, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"82845b71-468a-440c-a932-2862a3476e6d","name":"82845b71-468a-440c-a932-2862a3476e6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea2e419c-789f-401c-876c-549d09cdb741","name":"ea2e419c-789f-401c-876c-549d09cdb741","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e04a69ea-e9e9-4796-a353-52f152064318","name":"e04a69ea-e9e9-4796-a353-52f152064318","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82845b71-468a-440c-a932-2862a3476e6d","name":"82845b71-468a-440c-a932-2862a3476e6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea2e419c-789f-401c-876c-549d09cdb741","name":"ea2e419c-789f-401c-876c-549d09cdb741","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e04a69ea-e9e9-4796-a353-52f152064318","name":"e04a69ea-e9e9-4796-a353-52f152064318","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82845b71-468a-440c-a932-2862a3476e6d","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f957935-db04-43c1-b32e-c2ad43c45291","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6c3b3b9-aa74-4818-96f8-d3867efdf436","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea2e419c-789f-401c-876c-549d09cdb741","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88a3f009-0cc5-49f5-a65f-925ae42ce303","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3a3140f-a181-4e8e-84e7-37b88bc3d04d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04a69ea-e9e9-4796-a353-52f152064318","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef8f81e9-6668-41d7-98ce-946bba9cbbca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e90413e9-6265-427b-aba4-a327302748db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7297585-09fe-4043-bdf5-614258359ff1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e13e2bdf-85b0-4465-96a0-364f599779ae","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82845b71-468a-440c-a932-2862a3476e6d","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f957935-db04-43c1-b32e-c2ad43c45291","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6c3b3b9-aa74-4818-96f8-d3867efdf436","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea2e419c-789f-401c-876c-549d09cdb741","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88a3f009-0cc5-49f5-a65f-925ae42ce303","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3a3140f-a181-4e8e-84e7-37b88bc3d04d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04a69ea-e9e9-4796-a353-52f152064318","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef8f81e9-6668-41d7-98ce-946bba9cbbca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e90413e9-6265-427b-aba4-a327302748db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7297585-09fe-4043-bdf5-614258359ff1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e13e2bdf-85b0-4465-96a0-364f599779ae","IsCreationKey":false,"Key":7.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":{ diff --git a/sprites/spr_artificer_armour/spr_artificer_armour.yy b/sprites/spr_artificer_armour/spr_artificer_armour.yy index 4aa32c6701..15fd57474a 100644 --- a/sprites/spr_artificer_armour/spr_artificer_armour.yy +++ b/sprites/spr_artificer_armour/spr_artificer_armour.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_armour", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","path":"sprites/spr_artificer_armour/spr_artificer_armour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7cf7d4b-a007-4322-8222-ef43754d18e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","path":"sprites/spr_artificer_armour/spr_artificer_armour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7cf7d4b-a007-4322-8222-ef43754d18e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_chest/spr_artificer_chest.yy b/sprites/spr_artificer_chest/spr_artificer_chest.yy index a9e4c3eb8c..75ca80b41e 100644 --- a/sprites/spr_artificer_chest/spr_artificer_chest.yy +++ b/sprites/spr_artificer_chest/spr_artificer_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_chest", "bboxMode":0, "bbox_bottom":90, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"695c24c1-c493-4c97-a688-991bf8fc18c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb007e86-4f39-43ed-b95a-b530d3d169db","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"695c24c1-c493-4c97-a688-991bf8fc18c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb007e86-4f39-43ed-b95a-b530d3d169db","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_artificer_colors/spr_artificer_colors.yy b/sprites/spr_artificer_colors/spr_artificer_colors.yy index 012b24f3cf..bf2fb89584 100644 --- a/sprites/spr_artificer_colors/spr_artificer_colors.yy +++ b/sprites/spr_artificer_colors/spr_artificer_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_colors", "bboxMode":0, "bbox_bottom":259, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"85427dac-93fd-4529-a60d-9d0419649728","name":"85427dac-93fd-4529-a60d-9d0419649728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"748e63c4-61df-4c2a-86a2-1e54b4923668","name":"748e63c4-61df-4c2a-86a2-1e54b4923668","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"81976d8e-48bf-4ed7-8142-69c598967cfc","name":"81976d8e-48bf-4ed7-8142-69c598967cfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"85427dac-93fd-4529-a60d-9d0419649728","name":"85427dac-93fd-4529-a60d-9d0419649728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"748e63c4-61df-4c2a-86a2-1e54b4923668","name":"748e63c4-61df-4c2a-86a2-1e54b4923668","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81976d8e-48bf-4ed7-8142-69c598967cfc","name":"81976d8e-48bf-4ed7-8142-69c598967cfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,45 +82,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85427dac-93fd-4529-a60d-9d0419649728","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7295045-cbef-46f8-a2b8-5509abd297c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"748e63c4-61df-4c2a-86a2-1e54b4923668","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2539586c-2517-4228-9636-40fa2795a01f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a3fc28c-8dfc-4a79-8eb3-a1f49a3d96d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a6de5f1-2455-49b5-9a97-ee7f015f58fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab9517bd-47b3-49eb-895f-885db3de7ff0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db47a5c3-c0ac-4a80-a05e-7f99ee96c715","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"760fe7ce-e9b0-49c5-8efb-55e99091e83f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81976d8e-48bf-4ed7-8142-69c598967cfc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d041acf-d941-47e6-bc2a-247f75db3689","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79f29b73-bcdf-4160-b840-a89a8ca6b9f5","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74e7f222-2d83-441b-945a-9a0a5e44f75b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c9c8bf3e-c92a-49b2-82d5-b1910bd4e60a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cb83b1e8-da10-42a8-994d-d5b288dd7e7e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73dc5802-b53a-49ed-922d-ffcd859fbaa4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"85427dac-93fd-4529-a60d-9d0419649728","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7295045-cbef-46f8-a2b8-5509abd297c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"748e63c4-61df-4c2a-86a2-1e54b4923668","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2539586c-2517-4228-9636-40fa2795a01f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a3fc28c-8dfc-4a79-8eb3-a1f49a3d96d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a6de5f1-2455-49b5-9a97-ee7f015f58fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab9517bd-47b3-49eb-895f-885db3de7ff0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db47a5c3-c0ac-4a80-a05e-7f99ee96c715","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"760fe7ce-e9b0-49c5-8efb-55e99091e83f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81976d8e-48bf-4ed7-8142-69c598967cfc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d041acf-d941-47e6-bc2a-247f75db3689","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79f29b73-bcdf-4160-b840-a89a8ca6b9f5","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74e7f222-2d83-441b-945a-9a0a5e44f75b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c9c8bf3e-c92a-49b2-82d5-b1910bd4e60a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cb83b1e8-da10-42a8-994d-d5b288dd7e7e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73dc5802-b53a-49ed-922d-ffcd859fbaa4","IsCreationKey":false,"Key":12.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_artificer_colors2/spr_artificer_colors2.yy b/sprites/spr_artificer_colors2/spr_artificer_colors2.yy index 0a57964c29..2969d78809 100644 --- a/sprites/spr_artificer_colors2/spr_artificer_colors2.yy +++ b/sprites/spr_artificer_colors2/spr_artificer_colors2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_colors2", "bboxMode":0, "bbox_bottom":259, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"465b561c-397b-4542-b767-1c1e930f4829","name":"465b561c-397b-4542-b767-1c1e930f4829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"648ca404-0692-44f8-a7ce-917554b0956c","name":"648ca404-0692-44f8-a7ce-917554b0956c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"179c6171-f521-4d22-bdaa-c536459871f4","name":"179c6171-f521-4d22-bdaa-c536459871f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9902c9e6-50d6-48d9-a914-0d284fada227","name":"9902c9e6-50d6-48d9-a914-0d284fada227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6a4027a4-3435-4229-85ac-88d88b368d6f","name":"6a4027a4-3435-4229-85ac-88d88b368d6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d0b469e1-5258-4d90-baeb-98e61280e177","name":"d0b469e1-5258-4d90-baeb-98e61280e177","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"465b561c-397b-4542-b767-1c1e930f4829","name":"465b561c-397b-4542-b767-1c1e930f4829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"648ca404-0692-44f8-a7ce-917554b0956c","name":"648ca404-0692-44f8-a7ce-917554b0956c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"179c6171-f521-4d22-bdaa-c536459871f4","name":"179c6171-f521-4d22-bdaa-c536459871f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9902c9e6-50d6-48d9-a914-0d284fada227","name":"9902c9e6-50d6-48d9-a914-0d284fada227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a4027a4-3435-4229-85ac-88d88b368d6f","name":"6a4027a4-3435-4229-85ac-88d88b368d6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0b469e1-5258-4d90-baeb-98e61280e177","name":"d0b469e1-5258-4d90-baeb-98e61280e177","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"465b561c-397b-4542-b767-1c1e930f4829","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"418acf20-555a-45a9-845e-a25d2b24bbd8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"648ca404-0692-44f8-a7ce-917554b0956c","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c64f280-2ec1-484a-8036-1068377ef27f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"179c6171-f521-4d22-bdaa-c536459871f4","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9bbf352-7a0f-4cc6-9a88-eabc4ff535f4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9902c9e6-50d6-48d9-a914-0d284fada227","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c8d96e2-d035-46d8-a4d5-0203302101a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd722d5d-1172-4598-b0da-138a518d0047","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49048c8d-6e33-4837-a2d1-1d77d49a7762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b671afd-3196-4716-9b7a-0690b7ac935a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aab3d30-2aab-4728-94b8-c74b1f0b3be3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a4027a4-3435-4229-85ac-88d88b368d6f","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"610d0051-7c39-41a4-a26a-f6a8c2e211ff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0b469e1-5258-4d90-baeb-98e61280e177","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75c7a62a-13d6-40ab-98a0-4bc64be07b71","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca290fe5-3c30-4380-bbdf-283c97fd9c02","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff4263c0-1f15-4d8d-a3ba-3058bda9198e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"787b89f0-2491-4d7f-8612-1ca4d9bb8d29","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"465b561c-397b-4542-b767-1c1e930f4829","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"418acf20-555a-45a9-845e-a25d2b24bbd8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"648ca404-0692-44f8-a7ce-917554b0956c","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c64f280-2ec1-484a-8036-1068377ef27f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"179c6171-f521-4d22-bdaa-c536459871f4","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9bbf352-7a0f-4cc6-9a88-eabc4ff535f4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9902c9e6-50d6-48d9-a914-0d284fada227","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c8d96e2-d035-46d8-a4d5-0203302101a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd722d5d-1172-4598-b0da-138a518d0047","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49048c8d-6e33-4837-a2d1-1d77d49a7762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b671afd-3196-4716-9b7a-0690b7ac935a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aab3d30-2aab-4728-94b8-c74b1f0b3be3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a4027a4-3435-4229-85ac-88d88b368d6f","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"610d0051-7c39-41a4-a26a-f6a8c2e211ff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0b469e1-5258-4d90-baeb-98e61280e177","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75c7a62a-13d6-40ab-98a0-4bc64be07b71","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca290fe5-3c30-4380-bbdf-283c97fd9c02","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff4263c0-1f15-4d8d-a3ba-3058bda9198e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"787b89f0-2491-4d7f-8612-1ca4d9bb8d29","IsCreationKey":false,"Key":12.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_artificer_left_leg/spr_artificer_left_leg.yy b/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy index e995554587..be59453338 100644 --- a/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy +++ b/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_left_leg", "bboxMode":0, "bbox_bottom":219, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e67f81b-7a32-423e-a9c1-8dbb4c623cdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de31f64a-c770-4c2c-8a6e-c95869e6e2ad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a8897713-942a-4b66-b8df-16e16d0b47f1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e67f81b-7a32-423e-a9c1-8dbb4c623cdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de31f64a-c770-4c2c-8a6e-c95869e6e2ad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a8897713-942a-4b66-b8df-16e16d0b47f1","IsCreationKey":false,"Key":2.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_artificer_left_pad/spr_artificer_left_pad.yy b/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy index 687cf1c5b1..909640bbac 100644 --- a/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy +++ b/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_left_pad", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e614f69-695e-4467-975d-63cc4537dd4e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e614f69-695e-4467-975d-63cc4537dd4e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy b/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy index 2b3575fb27..6312841e78 100644 --- a/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy +++ b/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_left_trim", "bboxMode":0, "bbox_bottom":80, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93d3e203-1853-43a1-81a7-e0bed288b71e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93d3e203-1853-43a1-81a7-e0bed288b71e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_mouth/spr_artificer_mouth.yy b/sprites/spr_artificer_mouth/spr_artificer_mouth.yy index 221262a13e..39ec654dea 100644 --- a/sprites/spr_artificer_mouth/spr_artificer_mouth.yy +++ b/sprites/spr_artificer_mouth/spr_artificer_mouth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_mouth", "bboxMode":0, "bbox_bottom":42, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"645cbee8-c921-4d89-9cd1-7e859021bce5","name":"645cbee8-c921-4d89-9cd1-7e859021bce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a29e8d58-a798-4e3d-9915-8364431faf43","name":"a29e8d58-a798-4e3d-9915-8364431faf43","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"645cbee8-c921-4d89-9cd1-7e859021bce5","name":"645cbee8-c921-4d89-9cd1-7e859021bce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a29e8d58-a798-4e3d-9915-8364431faf43","name":"a29e8d58-a798-4e3d-9915-8364431faf43","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"645cbee8-c921-4d89-9cd1-7e859021bce5","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c3e5a235-58e3-4689-bd3c-820bf57833f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a29e8d58-a798-4e3d-9915-8364431faf43","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c5ab1e7b-d255-41bc-b0a4-e686c2fe235c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"645cbee8-c921-4d89-9cd1-7e859021bce5","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c3e5a235-58e3-4689-bd3c-820bf57833f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a29e8d58-a798-4e3d-9915-8364431faf43","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c5ab1e7b-d255-41bc-b0a4-e686c2fe235c","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_artificer_right_leg/spr_artificer_right_leg.yy b/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy index b7bd20b87f..84749e3865 100644 --- a/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy +++ b/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_right_leg", "bboxMode":0, "bbox_bottom":219, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"971af348-e201-4d93-8133-17abb7dc7f61","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef9ef794-b513-4f2c-af7c-384d9108b2de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f77fe365-151f-4f76-aaa3-1324e7402ba7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"971af348-e201-4d93-8133-17abb7dc7f61","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef9ef794-b513-4f2c-af7c-384d9108b2de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f77fe365-151f-4f76-aaa3-1324e7402ba7","IsCreationKey":false,"Key":2.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_artificer_thorax/spr_artificer_thorax.yy b/sprites/spr_artificer_thorax/spr_artificer_thorax.yy index 60ae20ab59..7d0c374e60 100644 --- a/sprites/spr_artificer_thorax/spr_artificer_thorax.yy +++ b/sprites/spr_artificer_thorax/spr_artificer_thorax.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_thorax", "bboxMode":0, "bbox_bottom":187, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3e1a5ab-78e2-4acc-b609-c4d89a4edb47","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6000eb1-261a-407f-8d01-43f3a113dae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3e1a5ab-78e2-4acc-b609-c4d89a4edb47","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6000eb1-261a-407f-8d01-43f3a113dae5","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_assault_ram/spr_assault_ram.yy b/sprites/spr_assault_ram/spr_assault_ram.yy index 5961be80bd..d39d0c0e4f 100644 --- a/sprites/spr_assault_ram/spr_assault_ram.yy +++ b/sprites/spr_assault_ram/spr_assault_ram.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_assault_ram", "bboxMode":0, "bbox_bottom":19, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d34fb461-e740-4b3d-8790-5d8bc721165b","name":"d34fb461-e740-4b3d-8790-5d8bc721165b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d34fb461-e740-4b3d-8790-5d8bc721165b","name":"d34fb461-e740-4b3d-8790-5d8bc721165b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34fb461-e740-4b3d-8790-5d8bc721165b","path":"sprites/spr_assault_ram/spr_assault_ram.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a4e024b-73cf-4acd-a21d-1f37789ba2f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34fb461-e740-4b3d-8790-5d8bc721165b","path":"sprites/spr_assault_ram/spr_assault_ram.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a4e024b-73cf-4acd-a21d-1f37789ba2f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_attacked/spr_attacked.yy b/sprites/spr_attacked/spr_attacked.yy index 763a8431fa..02b64a6be0 100644 --- a/sprites/spr_attacked/spr_attacked.yy +++ b/sprites/spr_attacked/spr_attacked.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_attacked", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_azreal/spr_azreal.yy b/sprites/spr_azreal/spr_azreal.yy index 03eca4d09e..151ffe8278 100644 --- a/sprites/spr_azreal/spr_azreal.yy +++ b/sprites/spr_azreal/spr_azreal.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_azreal", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","path":"sprites/spr_azreal/spr_azreal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6c71c3f-69e6-4c4d-9a42-9cff9ba784da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","path":"sprites/spr_azreal/spr_azreal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6c71c3f-69e6-4c4d-9a42-9cff9ba784da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy b/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy index 504eed4f25..d82294c854 100644 --- a/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy +++ b/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ba_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a167912-84a6-4e1c-9daa-41e4b7d1aa32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cb102e8-fb3e-443e-ba38-700d8f8fc742","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a167912-84a6-4e1c-9daa-41e4b7d1aa32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cb102e8-fb3e-443e-ba38-700d8f8fc742","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_ba_mk6_helm/spr_ba_mk6_helm.yy b/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy index adb831719e..c623e7d0af 100644 --- a/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy +++ b/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ba_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"363aa087-5772-41b1-9084-0db7a73b44e2","name":"363aa087-5772-41b1-9084-0db7a73b44e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"363aa087-5772-41b1-9084-0db7a73b44e2","name":"363aa087-5772-41b1-9084-0db7a73b44e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d52b85e0-19df-4047-8486-1c0bd1726b78","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"363aa087-5772-41b1-9084-0db7a73b44e2","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c45d87c6-51bb-4ae7-b263-53dc3ef0475a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d52b85e0-19df-4047-8486-1c0bd1726b78","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"363aa087-5772-41b1-9084-0db7a73b44e2","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c45d87c6-51bb-4ae7-b263-53dc3ef0475a","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_ba_mk7_helm/spr_ba_mk7_helm.yy b/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy index 1172ef4f63..5577b1c306 100644 --- a/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy +++ b/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ba_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1efc778a-1151-49d9-9505-d60929b94eb6","name":"1efc778a-1151-49d9-9505-d60929b94eb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1efc778a-1151-49d9-9505-d60929b94eb6","name":"1efc778a-1151-49d9-9505-d60929b94eb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13c117b6-5761-431e-8458-7954910203fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1efc778a-1151-49d9-9505-d60929b94eb6","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d751d70-9f65-4be1-9d47-be440a07a2dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13c117b6-5761-431e-8458-7954910203fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1efc778a-1151-49d9-9505-d60929b94eb6","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d751d70-9f65-4be1-9d47-be440a07a2dc","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_backpack_fastening/spr_backpack_fastening.yy b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy index f1402144de..39e0c962cb 100644 --- a/sprites/spr_backpack_fastening/spr_backpack_fastening.yy +++ b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_backpack_fastening", "bboxMode":0, "bbox_bottom":89, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","path":"sprites/spr_backpack_fastening/spr_backpack_fastening.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13043471-e077-4f56-9ff2-cd603f68f0f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","path":"sprites/spr_backpack_fastening/spr_backpack_fastening.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13043471-e077-4f56-9ff2-cd603f68f0f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy b/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy index 2db9be8abf..85a5eac270 100644 --- a/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy +++ b/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ballistic_skill_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","path":"sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"154608a6-0aee-4e03-9bae-f9a473358190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","path":"sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"154608a6-0aee-4e03-9bae-f9a473358190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bar/spr_bar.yy b/sprites/spr_bar/spr_bar.yy index 4bb389bfca..e59bb29c9e 100644 --- a/sprites/spr_bar/spr_bar.yy +++ b/sprites/spr_bar/spr_bar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bar", "bboxMode":0, "bbox_bottom":8, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3302719a-4210-42be-8e5e-4c4c74dc2684","name":"3302719a-4210-42be-8e5e-4c4c74dc2684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"97cf455e-c535-4150-bd71-17600daaa1f2","name":"97cf455e-c535-4150-bd71-17600daaa1f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"54e6c28f-437e-4703-a403-18ac521b732b","name":"54e6c28f-437e-4703-a403-18ac521b732b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"22be5222-6191-4d42-917d-3d11768353fa","name":"22be5222-6191-4d42-917d-3d11768353fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01d90c30-8886-416a-ba21-919ecb4c6aca","name":"01d90c30-8886-416a-ba21-919ecb4c6aca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be26eb8f-03aa-4445-804d-252d0aa43715","name":"be26eb8f-03aa-4445-804d-252d0aa43715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3302719a-4210-42be-8e5e-4c4c74dc2684","name":"3302719a-4210-42be-8e5e-4c4c74dc2684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97cf455e-c535-4150-bd71-17600daaa1f2","name":"97cf455e-c535-4150-bd71-17600daaa1f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"54e6c28f-437e-4703-a403-18ac521b732b","name":"54e6c28f-437e-4703-a403-18ac521b732b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22be5222-6191-4d42-917d-3d11768353fa","name":"22be5222-6191-4d42-917d-3d11768353fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01d90c30-8886-416a-ba21-919ecb4c6aca","name":"01d90c30-8886-416a-ba21-919ecb4c6aca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be26eb8f-03aa-4445-804d-252d0aa43715","name":"be26eb8f-03aa-4445-804d-252d0aa43715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7c88e2a-d9af-48cc-b9b7-ebaeed3cc7e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3302719a-4210-42be-8e5e-4c4c74dc2684","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a427b94e-125b-46fa-ac68-4c3c7b54f6e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97cf455e-c535-4150-bd71-17600daaa1f2","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48a9c317-f79d-4e3d-a5b9-ffef444d5440","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15f5e9cc-3527-4d88-a022-6309400497b9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"54e6c28f-437e-4703-a403-18ac521b732b","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c672d436-07aa-46c2-8835-2ff6ed88e590","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81d8575c-958a-468a-8d75-4326025485c2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd9ad9df-9dcd-4fa2-8635-d057fb59ca05","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22be5222-6191-4d42-917d-3d11768353fa","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97d5005b-dc82-4234-a57e-83fcf89a8367","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01d90c30-8886-416a-ba21-919ecb4c6aca","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de31e3cd-7862-4bc7-a908-b61aa13ff288","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be26eb8f-03aa-4445-804d-252d0aa43715","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f353cd00-f561-4ef0-be2e-492afdb075c7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afbe37a3-9160-4c8d-b66d-1b8072efb354","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7c88e2a-d9af-48cc-b9b7-ebaeed3cc7e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3302719a-4210-42be-8e5e-4c4c74dc2684","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a427b94e-125b-46fa-ac68-4c3c7b54f6e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97cf455e-c535-4150-bd71-17600daaa1f2","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48a9c317-f79d-4e3d-a5b9-ffef444d5440","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15f5e9cc-3527-4d88-a022-6309400497b9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"54e6c28f-437e-4703-a403-18ac521b732b","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c672d436-07aa-46c2-8835-2ff6ed88e590","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81d8575c-958a-468a-8d75-4326025485c2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd9ad9df-9dcd-4fa2-8635-d057fb59ca05","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22be5222-6191-4d42-917d-3d11768353fa","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97d5005b-dc82-4234-a57e-83fcf89a8367","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01d90c30-8886-416a-ba21-919ecb4c6aca","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de31e3cd-7862-4bc7-a908-b61aa13ff288","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be26eb8f-03aa-4445-804d-252d0aa43715","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f353cd00-f561-4ef0-be2e-492afdb075c7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afbe37a3-9160-4c8d-b66d-1b8072efb354","IsCreationKey":false,"Key":10.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_bare_eyes/spr_bare_eyes.yy b/sprites/spr_bare_eyes/spr_bare_eyes.yy index de92df7564..3856f73830 100644 --- a/sprites/spr_bare_eyes/spr_bare_eyes.yy +++ b/sprites/spr_bare_eyes/spr_bare_eyes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_eyes", "bboxMode":0, "bbox_bottom":30, @@ -12,33 +12,33 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b23399d2-885b-4e52-9425-1430efdac15c","name":"b23399d2-885b-4e52-9425-1430efdac15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5984ae02-2aa0-4125-bbff-7087e26c4885","name":"5984ae02-2aa0-4125-bbff-7087e26c4885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ef928e4-ca53-4022-8cd3-6632c830d299","name":"3ef928e4-ca53-4022-8cd3-6632c830d299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"106250b4-2149-4340-a00c-40eaf198e58d","name":"106250b4-2149-4340-a00c-40eaf198e58d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87416d86-eb61-4546-b546-ecc00c22e2af","name":"87416d86-eb61-4546-b546-ecc00c22e2af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c603b973-5145-4114-bbd7-9f6aa44a7894","name":"c603b973-5145-4114-bbd7-9f6aa44a7894","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"32010768-5b4e-46ed-b4fe-183911e34ccf","name":"32010768-5b4e-46ed-b4fe-183911e34ccf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40df5e82-3b35-4d36-821a-686df40a235b","name":"40df5e82-3b35-4d36-821a-686df40a235b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e52b856-813d-428a-80fb-8910534444c6","name":"8e52b856-813d-428a-80fb-8910534444c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b23399d2-885b-4e52-9425-1430efdac15c","name":"b23399d2-885b-4e52-9425-1430efdac15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5984ae02-2aa0-4125-bbff-7087e26c4885","name":"5984ae02-2aa0-4125-bbff-7087e26c4885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ef928e4-ca53-4022-8cd3-6632c830d299","name":"3ef928e4-ca53-4022-8cd3-6632c830d299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"106250b4-2149-4340-a00c-40eaf198e58d","name":"106250b4-2149-4340-a00c-40eaf198e58d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87416d86-eb61-4546-b546-ecc00c22e2af","name":"87416d86-eb61-4546-b546-ecc00c22e2af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c603b973-5145-4114-bbd7-9f6aa44a7894","name":"c603b973-5145-4114-bbd7-9f6aa44a7894","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"32010768-5b4e-46ed-b4fe-183911e34ccf","name":"32010768-5b4e-46ed-b4fe-183911e34ccf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40df5e82-3b35-4d36-821a-686df40a235b","name":"40df5e82-3b35-4d36-821a-686df40a235b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e52b856-813d-428a-80fb-8910534444c6","name":"8e52b856-813d-428a-80fb-8910534444c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -96,87 +96,33 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c81bcea-d38b-442d-a69f-be896cbb50b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b23399d2-885b-4e52-9425-1430efdac15c","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd06f395-6ed4-4701-8544-4f74f92c6f19","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"765c16b2-97cd-4595-bd87-26f7048c4b2f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f4ae759-db5b-467c-9269-cb8e01585675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed01b266-bc05-43af-98da-1959625f8a9f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f03545df-39ea-4c2b-abc7-b4df402f493e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9971f75-eca3-4942-9521-4c3e86f95439","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65966837-8206-40a6-9c84-64b7940b744b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b95c184e-c58c-4348-966d-1ddad172e997","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5984ae02-2aa0-4125-bbff-7087e26c4885","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c190832-c4c3-4fc8-9750-3016efb90aa8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf8ba618-66cf-4127-b25f-455c2366907c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef928e4-ca53-4022-8cd3-6632c830d299","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"12c14c85-7c7d-413e-93d8-80f14d25fd62","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"106250b4-2149-4340-a00c-40eaf198e58d","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5dc898a8-aa4f-461e-8d45-843dcace698a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24c05389-c167-4188-b220-45c8a2d20891","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87416d86-eb61-4546-b546-ecc00c22e2af","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11cc4c2d-a5d1-41d2-8c9c-3ba048bce167","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2e7ea3e-8cb8-4025-b70b-14fbc68045f4","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e21b2e24-e072-4f5c-901c-a76303bde380","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6db00525-6cce-4697-a8c2-975f3072022f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d398ad08-143f-433b-8ed0-41f5bc74fdfe","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c603b973-5145-4114-bbd7-9f6aa44a7894","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b9f16053-1ed5-45af-963f-6d1cbcb6e9ef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32010768-5b4e-46ed-b4fe-183911e34ccf","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7f36fbf-2d00-4e38-8b01-02e8e0015f09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40df5e82-3b35-4d36-821a-686df40a235b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ff424d5-8526-4f58-9b4e-362fb6efd862","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa22bee3-2d88-43e8-a1b9-eb43d51d2eff","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0abdb200-5367-42cc-b7b7-371e9a129713","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cee5a3c-5451-4f63-8b98-47284939f629","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7d535f0-de41-4255-bb5c-e04616064be7","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e52b856-813d-428a-80fb-8910534444c6","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8158fd96-ddc4-41bb-845b-34f6b6d3e30d","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c81bcea-d38b-442d-a69f-be896cbb50b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b23399d2-885b-4e52-9425-1430efdac15c","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd06f395-6ed4-4701-8544-4f74f92c6f19","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"765c16b2-97cd-4595-bd87-26f7048c4b2f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f4ae759-db5b-467c-9269-cb8e01585675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed01b266-bc05-43af-98da-1959625f8a9f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f03545df-39ea-4c2b-abc7-b4df402f493e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9971f75-eca3-4942-9521-4c3e86f95439","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65966837-8206-40a6-9c84-64b7940b744b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b95c184e-c58c-4348-966d-1ddad172e997","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5984ae02-2aa0-4125-bbff-7087e26c4885","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c190832-c4c3-4fc8-9750-3016efb90aa8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf8ba618-66cf-4127-b25f-455c2366907c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef928e4-ca53-4022-8cd3-6632c830d299","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"12c14c85-7c7d-413e-93d8-80f14d25fd62","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"106250b4-2149-4340-a00c-40eaf198e58d","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5dc898a8-aa4f-461e-8d45-843dcace698a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24c05389-c167-4188-b220-45c8a2d20891","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87416d86-eb61-4546-b546-ecc00c22e2af","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11cc4c2d-a5d1-41d2-8c9c-3ba048bce167","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2e7ea3e-8cb8-4025-b70b-14fbc68045f4","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e21b2e24-e072-4f5c-901c-a76303bde380","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6db00525-6cce-4697-a8c2-975f3072022f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d398ad08-143f-433b-8ed0-41f5bc74fdfe","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c603b973-5145-4114-bbd7-9f6aa44a7894","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9f16053-1ed5-45af-963f-6d1cbcb6e9ef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32010768-5b4e-46ed-b4fe-183911e34ccf","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7f36fbf-2d00-4e38-8b01-02e8e0015f09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40df5e82-3b35-4d36-821a-686df40a235b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ff424d5-8526-4f58-9b4e-362fb6efd862","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa22bee3-2d88-43e8-a1b9-eb43d51d2eff","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0abdb200-5367-42cc-b7b7-371e9a129713","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cee5a3c-5451-4f63-8b98-47284939f629","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7d535f0-de41-4255-bb5c-e04616064be7","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e52b856-813d-428a-80fb-8910534444c6","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8158fd96-ddc4-41bb-845b-34f6b6d3e30d","IsCreationKey":false,"Key":26.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_bare_head_facial_hair/spr_bare_head_facial_hair.yy b/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy index c75d5a5864..f141f72808 100644 --- a/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy +++ b/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_head_facial_hair", "bboxMode":0, "bbox_bottom":105, @@ -12,59 +12,59 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59c1ef31-735a-41e9-8751-c0917393ceba","name":"59c1ef31-735a-41e9-8751-c0917393ceba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fe47c7c6-f0cc-4337-b749-5641c896e825","name":"fe47c7c6-f0cc-4337-b749-5641c896e825","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4265cc35-d65c-4c91-b427-d0267766b28b","name":"4265cc35-d65c-4c91-b427-d0267766b28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d631d5c-7e26-4075-bec1-bf519e78533f","name":"1d631d5c-7e26-4075-bec1-bf519e78533f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd34e62d-4a19-4366-ab5c-063069352d39","name":"fd34e62d-4a19-4366-ab5c-063069352d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84be56f9-976e-4bdf-b684-160b72c63473","name":"84be56f9-976e-4bdf-b684-160b72c63473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50efae71-3499-4dc0-b4aa-37dec1af841b","name":"50efae71-3499-4dc0-b4aa-37dec1af841b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"119401c9-2466-48e8-b092-e7bec7b54345","name":"119401c9-2466-48e8-b092-e7bec7b54345","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"453ab56d-103e-412a-9a04-455992c9348b","name":"453ab56d-103e-412a-9a04-455992c9348b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52d6be61-5261-4311-a0c1-07e935c25df6","name":"52d6be61-5261-4311-a0c1-07e935c25df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33f45c33-d49f-42e5-bc56-232649f96c22","name":"33f45c33-d49f-42e5-bc56-232649f96c22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a229b65-bd47-405a-ae89-b0782bc61f79","name":"9a229b65-bd47-405a-ae89-b0782bc61f79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87cd986b-a055-4223-9044-fcf525bb0602","name":"87cd986b-a055-4223-9044-fcf525bb0602","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37f5b913-0b99-4f38-9252-88800edb3655","name":"37f5b913-0b99-4f38-9252-88800edb3655","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73d9098d-abca-4da7-b713-85f9fdde4c08","name":"73d9098d-abca-4da7-b713-85f9fdde4c08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"026245f0-7593-46b8-a3c4-eece1626f779","name":"026245f0-7593-46b8-a3c4-eece1626f779","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ca665ee-1c72-40a2-a808-42fcca32e642","name":"6ca665ee-1c72-40a2-a808-42fcca32e642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de7d6148-126b-4524-8b72-bfe5da178758","name":"de7d6148-126b-4524-8b72-bfe5da178758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cb94ed63-672f-4c13-adfc-827c1574c939","name":"cb94ed63-672f-4c13-adfc-827c1574c939","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d214730-8933-4eba-a5ad-da582ae142f9","name":"7d214730-8933-4eba-a5ad-da582ae142f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59c1ef31-735a-41e9-8751-c0917393ceba","name":"59c1ef31-735a-41e9-8751-c0917393ceba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe47c7c6-f0cc-4337-b749-5641c896e825","name":"fe47c7c6-f0cc-4337-b749-5641c896e825","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4265cc35-d65c-4c91-b427-d0267766b28b","name":"4265cc35-d65c-4c91-b427-d0267766b28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d631d5c-7e26-4075-bec1-bf519e78533f","name":"1d631d5c-7e26-4075-bec1-bf519e78533f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd34e62d-4a19-4366-ab5c-063069352d39","name":"fd34e62d-4a19-4366-ab5c-063069352d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84be56f9-976e-4bdf-b684-160b72c63473","name":"84be56f9-976e-4bdf-b684-160b72c63473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50efae71-3499-4dc0-b4aa-37dec1af841b","name":"50efae71-3499-4dc0-b4aa-37dec1af841b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"119401c9-2466-48e8-b092-e7bec7b54345","name":"119401c9-2466-48e8-b092-e7bec7b54345","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"453ab56d-103e-412a-9a04-455992c9348b","name":"453ab56d-103e-412a-9a04-455992c9348b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d6be61-5261-4311-a0c1-07e935c25df6","name":"52d6be61-5261-4311-a0c1-07e935c25df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33f45c33-d49f-42e5-bc56-232649f96c22","name":"33f45c33-d49f-42e5-bc56-232649f96c22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a229b65-bd47-405a-ae89-b0782bc61f79","name":"9a229b65-bd47-405a-ae89-b0782bc61f79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87cd986b-a055-4223-9044-fcf525bb0602","name":"87cd986b-a055-4223-9044-fcf525bb0602","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37f5b913-0b99-4f38-9252-88800edb3655","name":"37f5b913-0b99-4f38-9252-88800edb3655","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73d9098d-abca-4da7-b713-85f9fdde4c08","name":"73d9098d-abca-4da7-b713-85f9fdde4c08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"026245f0-7593-46b8-a3c4-eece1626f779","name":"026245f0-7593-46b8-a3c4-eece1626f779","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ca665ee-1c72-40a2-a808-42fcca32e642","name":"6ca665ee-1c72-40a2-a808-42fcca32e642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de7d6148-126b-4524-8b72-bfe5da178758","name":"de7d6148-126b-4524-8b72-bfe5da178758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cb94ed63-672f-4c13-adfc-827c1574c939","name":"cb94ed63-672f-4c13-adfc-827c1574c939","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d214730-8933-4eba-a5ad-da582ae142f9","name":"7d214730-8933-4eba-a5ad-da582ae142f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -122,165 +122,59 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9e51da4-06de-4b0f-92d4-077865cabe5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c1ef31-735a-41e9-8751-c0917393ceba","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf388989-1ec2-4a21-830d-07b0905766be","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe47c7c6-f0cc-4337-b749-5641c896e825","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"641d15bb-071d-4744-b25e-d1f56af61040","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4265cc35-d65c-4c91-b427-d0267766b28b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"700ade0a-a863-403d-afe5-c9eef47e66ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05fca8e1-2c17-4b6f-922a-2c36b32b228e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d631d5c-7e26-4075-bec1-bf519e78533f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d143f15a-7aaa-4a24-903f-cceda28a0e85","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08e5c378-5300-49db-a001-3b0cef540331","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd34e62d-4a19-4366-ab5c-063069352d39","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe404bdd-7af8-48a5-989e-e8d59bb707d6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ccf2321-f229-4fea-99d8-6ade77f9c840","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84be56f9-976e-4bdf-b684-160b72c63473","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92265152-e73f-44cc-8d31-a4fbe12c16e4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b4cec6f-f300-4c95-9fac-ba0fab36e37e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50efae71-3499-4dc0-b4aa-37dec1af841b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ed3b162-394c-441e-8bbd-2700ad92168a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02668362-7c95-400e-b1ec-dfec011a3fd0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"285f3c33-4fc3-4afb-ba39-cf685a883954","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"119401c9-2466-48e8-b092-e7bec7b54345","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad987105-bdde-4846-ae7e-6f0aa2e3cd4b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7acca3ce-8a1e-45a4-993d-bd2972a5677b","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5763102d-e9f8-4746-8d16-e8dd6e4459d7","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40547070-6c65-41d9-be86-8f60b05389f7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d78d2e7f-cd05-452c-a017-9df68175bf2f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d6f7e9b-92fd-47be-bb05-5744f87afdc7","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f152782c-8280-4280-8bbe-9dc1ec5b501f","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"453ab56d-103e-412a-9a04-455992c9348b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f83625d-4429-4933-b1c7-b645ff2f0935","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a2ac66c-c54b-431e-8bf8-0e9e9e57d113","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d6be61-5261-4311-a0c1-07e935c25df6","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b5d3e828-d5c1-4b40-b8c4-01dea53cdbdd","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b42a971c-8eb3-465d-9554-77d966f8883e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33f45c33-d49f-42e5-bc56-232649f96c22","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c1ab60b-7140-47a9-b9f3-489e03bd587f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"279c4898-51eb-4445-8427-f3fd36c0d771","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34843b68-25e9-4618-87fb-27befa7d8950","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a229b65-bd47-405a-ae89-b0782bc61f79","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cdefec0-28e0-4132-aa41-dbf875fd0ee3","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"03dc0c18-282e-4127-9776-a50b0b9d63b7","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7cf473b-0620-4a60-a611-97c142cc3921","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c862511f-777e-4228-b5d9-ad63167f469d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87cd986b-a055-4223-9044-fcf525bb0602","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c30dee50-e036-4082-bf98-678411575281","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37f5b913-0b99-4f38-9252-88800edb3655","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5248466-f8de-4b09-b63f-c54e557a0bf6","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1322a47f-b05f-484b-903f-6f53fa5df61e","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d9098d-abca-4da7-b713-85f9fdde4c08","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a23f7d20-edad-4aaf-8284-aa2179360d89","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"026245f0-7593-46b8-a3c4-eece1626f779","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"568d7249-b9e4-4592-b88c-d64728c0fdf3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd40d942-2f16-4672-98e1-4333d460eae1","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"064dc774-30b8-4ae4-927b-64a7cd392163","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43374b2a-1d56-40b8-88f6-0d2337a7e332","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dbe8a5cd-9a8e-4dbc-8849-aca2be9b6d6f","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ca665ee-1c72-40a2-a808-42fcca32e642","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"736fb870-e235-4855-ba59-bdef16c1c6c6","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d86f54fc-a41e-4c60-abaa-8f374bdade4d","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87060c2c-392d-4ae5-bbf0-f76c9f362ff5","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"504ef4f9-372d-4b40-bd45-8cc00259adfd","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af335c6d-90cb-41d4-84a1-a5e6b1434eb4","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7d6148-126b-4524-8b72-bfe5da178758","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d20052d-7d8d-41d1-9caa-06505d709cf0","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb94ed63-672f-4c13-adfc-827c1574c939","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aadd3b16-c7fc-4fe8-a4d0-13d4d5797092","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"461ee071-0dbe-44e4-a384-0554a46f3d37","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cde633d7-5cdb-49de-87e1-827180deaf68","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d92e8f53-7441-405b-a5cb-9f11f7b42020","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d214730-8933-4eba-a5ad-da582ae142f9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe38f50e-9a9c-415b-8de8-9607847a49e5","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe39eedd-8bec-44b3-9a4d-3349c0c598d8","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9e51da4-06de-4b0f-92d4-077865cabe5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c1ef31-735a-41e9-8751-c0917393ceba","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf388989-1ec2-4a21-830d-07b0905766be","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe47c7c6-f0cc-4337-b749-5641c896e825","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"641d15bb-071d-4744-b25e-d1f56af61040","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4265cc35-d65c-4c91-b427-d0267766b28b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"700ade0a-a863-403d-afe5-c9eef47e66ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05fca8e1-2c17-4b6f-922a-2c36b32b228e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d631d5c-7e26-4075-bec1-bf519e78533f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d143f15a-7aaa-4a24-903f-cceda28a0e85","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08e5c378-5300-49db-a001-3b0cef540331","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd34e62d-4a19-4366-ab5c-063069352d39","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe404bdd-7af8-48a5-989e-e8d59bb707d6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ccf2321-f229-4fea-99d8-6ade77f9c840","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84be56f9-976e-4bdf-b684-160b72c63473","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92265152-e73f-44cc-8d31-a4fbe12c16e4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b4cec6f-f300-4c95-9fac-ba0fab36e37e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50efae71-3499-4dc0-b4aa-37dec1af841b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ed3b162-394c-441e-8bbd-2700ad92168a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02668362-7c95-400e-b1ec-dfec011a3fd0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"285f3c33-4fc3-4afb-ba39-cf685a883954","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"119401c9-2466-48e8-b092-e7bec7b54345","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad987105-bdde-4846-ae7e-6f0aa2e3cd4b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7acca3ce-8a1e-45a4-993d-bd2972a5677b","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5763102d-e9f8-4746-8d16-e8dd6e4459d7","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40547070-6c65-41d9-be86-8f60b05389f7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d78d2e7f-cd05-452c-a017-9df68175bf2f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d6f7e9b-92fd-47be-bb05-5744f87afdc7","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f152782c-8280-4280-8bbe-9dc1ec5b501f","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"453ab56d-103e-412a-9a04-455992c9348b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f83625d-4429-4933-b1c7-b645ff2f0935","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a2ac66c-c54b-431e-8bf8-0e9e9e57d113","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d6be61-5261-4311-a0c1-07e935c25df6","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b5d3e828-d5c1-4b40-b8c4-01dea53cdbdd","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b42a971c-8eb3-465d-9554-77d966f8883e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33f45c33-d49f-42e5-bc56-232649f96c22","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c1ab60b-7140-47a9-b9f3-489e03bd587f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"279c4898-51eb-4445-8427-f3fd36c0d771","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34843b68-25e9-4618-87fb-27befa7d8950","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a229b65-bd47-405a-ae89-b0782bc61f79","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cdefec0-28e0-4132-aa41-dbf875fd0ee3","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03dc0c18-282e-4127-9776-a50b0b9d63b7","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7cf473b-0620-4a60-a611-97c142cc3921","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c862511f-777e-4228-b5d9-ad63167f469d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87cd986b-a055-4223-9044-fcf525bb0602","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c30dee50-e036-4082-bf98-678411575281","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37f5b913-0b99-4f38-9252-88800edb3655","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5248466-f8de-4b09-b63f-c54e557a0bf6","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1322a47f-b05f-484b-903f-6f53fa5df61e","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d9098d-abca-4da7-b713-85f9fdde4c08","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a23f7d20-edad-4aaf-8284-aa2179360d89","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"026245f0-7593-46b8-a3c4-eece1626f779","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"568d7249-b9e4-4592-b88c-d64728c0fdf3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd40d942-2f16-4672-98e1-4333d460eae1","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"064dc774-30b8-4ae4-927b-64a7cd392163","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43374b2a-1d56-40b8-88f6-0d2337a7e332","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dbe8a5cd-9a8e-4dbc-8849-aca2be9b6d6f","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ca665ee-1c72-40a2-a808-42fcca32e642","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"736fb870-e235-4855-ba59-bdef16c1c6c6","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d86f54fc-a41e-4c60-abaa-8f374bdade4d","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87060c2c-392d-4ae5-bbf0-f76c9f362ff5","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"504ef4f9-372d-4b40-bd45-8cc00259adfd","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af335c6d-90cb-41d4-84a1-a5e6b1434eb4","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7d6148-126b-4524-8b72-bfe5da178758","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d20052d-7d8d-41d1-9caa-06505d709cf0","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb94ed63-672f-4c13-adfc-827c1574c939","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aadd3b16-c7fc-4fe8-a4d0-13d4d5797092","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"461ee071-0dbe-44e4-a384-0554a46f3d37","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cde633d7-5cdb-49de-87e1-827180deaf68","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d92e8f53-7441-405b-a5cb-9f11f7b42020","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d214730-8933-4eba-a5ad-da582ae142f9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe38f50e-9a9c-415b-8de8-9607847a49e5","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe39eedd-8bec-44b3-9a4d-3349c0c598d8","IsCreationKey":false,"Key":52.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_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy b/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy index e7e79610be..aa5ebfebc5 100644 --- a/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy +++ b/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_head_facial_hair_colourable", "bboxMode":0, "bbox_bottom":63, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789a65e4-c488-4ee9-a598-5ead885fa298","name":"789a65e4-c488-4ee9-a598-5ead885fa298","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26323f47-b73b-4297-ba10-09aae76121a2","name":"26323f47-b73b-4297-ba10-09aae76121a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25f3c04a-21a5-4eed-ae96-bac303387033","name":"25f3c04a-21a5-4eed-ae96-bac303387033","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a952d6ec-8732-4b76-aad5-568ff548a743","name":"a952d6ec-8732-4b76-aad5-568ff548a743","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c16add8-7098-4881-88ed-ebb334520439","name":"7c16add8-7098-4881-88ed-ebb334520439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789a65e4-c488-4ee9-a598-5ead885fa298","name":"789a65e4-c488-4ee9-a598-5ead885fa298","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26323f47-b73b-4297-ba10-09aae76121a2","name":"26323f47-b73b-4297-ba10-09aae76121a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25f3c04a-21a5-4eed-ae96-bac303387033","name":"25f3c04a-21a5-4eed-ae96-bac303387033","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a952d6ec-8732-4b76-aad5-568ff548a743","name":"a952d6ec-8732-4b76-aad5-568ff548a743","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c16add8-7098-4881-88ed-ebb334520439","name":"7c16add8-7098-4881-88ed-ebb334520439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04123629-2eb4-4cd7-839e-f1c2322f04e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a65e4-c488-4ee9-a598-5ead885fa298","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa37aa36-f8ed-47fc-95c7-cf5d6633ad2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25893de7-0896-49a2-98eb-655453e3aa96","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26323f47-b73b-4297-ba10-09aae76121a2","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0de8cd1b-564a-4c59-9af5-431760147f8b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f3c04a-21a5-4eed-ae96-bac303387033","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"322ea2fd-c6d4-4eaf-9844-0d68a14ea771","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a952d6ec-8732-4b76-aad5-568ff548a743","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0196999-ef32-46a6-9de5-97e517754e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c16add8-7098-4881-88ed-ebb334520439","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f822b6ac-ef23-4c11-ab68-15caed055570","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9808dc33-8917-4ac1-b19b-2d671fd026ab","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4bcadfc-516b-48e6-9b5f-ff5824903353","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"32cfe44f-5526-44af-9e2e-5f7f9d73d419","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04123629-2eb4-4cd7-839e-f1c2322f04e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a65e4-c488-4ee9-a598-5ead885fa298","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa37aa36-f8ed-47fc-95c7-cf5d6633ad2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25893de7-0896-49a2-98eb-655453e3aa96","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26323f47-b73b-4297-ba10-09aae76121a2","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0de8cd1b-564a-4c59-9af5-431760147f8b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f3c04a-21a5-4eed-ae96-bac303387033","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"322ea2fd-c6d4-4eaf-9844-0d68a14ea771","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a952d6ec-8732-4b76-aad5-568ff548a743","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0196999-ef32-46a6-9de5-97e517754e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c16add8-7098-4881-88ed-ebb334520439","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f822b6ac-ef23-4c11-ab68-15caed055570","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9808dc33-8917-4ac1-b19b-2d671fd026ab","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4bcadfc-516b-48e6-9b5f-ff5824903353","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"32cfe44f-5526-44af-9e2e-5f7f9d73d419","IsCreationKey":false,"Key":9.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_bare_heads/spr_bare_heads.yy b/sprites/spr_bare_heads/spr_bare_heads.yy index 92212b645c..db6fdf7e38 100644 --- a/sprites/spr_bare_heads/spr_bare_heads.yy +++ b/sprites/spr_bare_heads/spr_bare_heads.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_heads", "bboxMode":0, "bbox_bottom":44, @@ -12,51 +12,51 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1413a945-9705-40c0-8532-72c7463a559a","name":"1413a945-9705-40c0-8532-72c7463a559a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d204018f-27e8-4e54-b5e7-d50899ede96c","name":"d204018f-27e8-4e54-b5e7-d50899ede96c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44032114-1f2f-47cd-a4a6-1421600214cd","name":"44032114-1f2f-47cd-a4a6-1421600214cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da05b69a-1448-41be-90c3-5cfbba0a8721","name":"da05b69a-1448-41be-90c3-5cfbba0a8721","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6f81ed7-7136-4422-835e-a2c3546f1548","name":"b6f81ed7-7136-4422-835e-a2c3546f1548","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"842d94d2-94ff-4452-951a-eea2822aea1b","name":"842d94d2-94ff-4452-951a-eea2822aea1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"136b448f-cab9-4502-ab49-211dae6baa0b","name":"136b448f-cab9-4502-ab49-211dae6baa0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2407b5d3-1513-4a94-9fa9-12f20669831f","name":"2407b5d3-1513-4a94-9fa9-12f20669831f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"743472f3-6863-4abe-bf55-bbeff76aaf00","name":"743472f3-6863-4abe-bf55-bbeff76aaf00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e607018-2fee-4472-af53-adf27c701121","name":"8e607018-2fee-4472-af53-adf27c701121","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ffc63594-ebb2-47ba-8083-be578882d2b4","name":"ffc63594-ebb2-47ba-8083-be578882d2b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e705a700-72b0-45e8-abc0-902b0b6b5480","name":"e705a700-72b0-45e8-abc0-902b0b6b5480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"412496f6-a833-4a5b-a839-cdf54c804bd9","name":"412496f6-a833-4a5b-a839-cdf54c804bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"34af844a-9bf2-4670-92b2-5b8742d19f45","name":"34af844a-9bf2-4670-92b2-5b8742d19f45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f250301d-3a8b-45be-a367-c659a8172e53","name":"f250301d-3a8b-45be-a367-c659a8172e53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1413a945-9705-40c0-8532-72c7463a559a","name":"1413a945-9705-40c0-8532-72c7463a559a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d204018f-27e8-4e54-b5e7-d50899ede96c","name":"d204018f-27e8-4e54-b5e7-d50899ede96c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44032114-1f2f-47cd-a4a6-1421600214cd","name":"44032114-1f2f-47cd-a4a6-1421600214cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da05b69a-1448-41be-90c3-5cfbba0a8721","name":"da05b69a-1448-41be-90c3-5cfbba0a8721","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6f81ed7-7136-4422-835e-a2c3546f1548","name":"b6f81ed7-7136-4422-835e-a2c3546f1548","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"842d94d2-94ff-4452-951a-eea2822aea1b","name":"842d94d2-94ff-4452-951a-eea2822aea1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"136b448f-cab9-4502-ab49-211dae6baa0b","name":"136b448f-cab9-4502-ab49-211dae6baa0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2407b5d3-1513-4a94-9fa9-12f20669831f","name":"2407b5d3-1513-4a94-9fa9-12f20669831f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"743472f3-6863-4abe-bf55-bbeff76aaf00","name":"743472f3-6863-4abe-bf55-bbeff76aaf00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e607018-2fee-4472-af53-adf27c701121","name":"8e607018-2fee-4472-af53-adf27c701121","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ffc63594-ebb2-47ba-8083-be578882d2b4","name":"ffc63594-ebb2-47ba-8083-be578882d2b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e705a700-72b0-45e8-abc0-902b0b6b5480","name":"e705a700-72b0-45e8-abc0-902b0b6b5480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"412496f6-a833-4a5b-a839-cdf54c804bd9","name":"412496f6-a833-4a5b-a839-cdf54c804bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"34af844a-9bf2-4670-92b2-5b8742d19f45","name":"34af844a-9bf2-4670-92b2-5b8742d19f45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f250301d-3a8b-45be-a367-c659a8172e53","name":"f250301d-3a8b-45be-a367-c659a8172e53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -114,141 +114,51 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1413a945-9705-40c0-8532-72c7463a559a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7f6b8d0-aa60-4dee-85bd-ae56f29450b4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74fb959e-3e19-48c0-b3a6-bd546e1a8e75","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d204018f-27e8-4e54-b5e7-d50899ede96c","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73952404-cb8b-464a-a7aa-3aa9b9c4587d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f261bef-12bf-4b37-a300-434041e3b5d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca614523-7c89-4120-abe1-58169c8f4267","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44032114-1f2f-47cd-a4a6-1421600214cd","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1be6cd38-e67c-4068-814e-8bc76c469ef6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08fed482-516f-4bc4-8e62-df1f5ddd2378","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bd26df5-8feb-4ab1-92a1-c82b9a377ddc","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da05b69a-1448-41be-90c3-5cfbba0a8721","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b674b5aa-b71a-4987-991f-ad9fed6243bd","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"484adcfc-055b-4bd2-8a69-7f6ef1845733","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89e92372-ddc8-41c5-ba42-a8f62dcc9fc6","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34a79fa8-8079-48f2-97c2-cf5597257626","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6f81ed7-7136-4422-835e-a2c3546f1548","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a6ad9ef-c588-41b9-96f4-dea51b324aef","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"842d94d2-94ff-4452-951a-eea2822aea1b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"179fdf05-ab39-44b0-9d53-3601823644d4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"136b448f-cab9-4502-ab49-211dae6baa0b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4040dc72-745d-4e35-a7c5-f65e7aab043c","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b87e4893-54e4-4e14-b3de-7cbc4ad4573d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cca6dcf-ec65-406d-843c-6e1ae18bb3c0","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33695af1-3f1f-4235-aaad-4394a9c7faef","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2407b5d3-1513-4a94-9fa9-12f20669831f","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afbc04d4-7e38-410d-ba02-ce4314cd47ce","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"743472f3-6863-4abe-bf55-bbeff76aaf00","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"723f7c79-4e5f-46df-9c78-5a799c698654","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a9d1567-0b32-43d8-8f0a-310c6728a8a6","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"859ae0fb-8969-4e1a-8d91-823ea7f0702a","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e607018-2fee-4472-af53-adf27c701121","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"20532cfd-03ba-4a9d-a019-6ced8cf9b990","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ffc63594-ebb2-47ba-8083-be578882d2b4","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4ecb63b-a763-486b-8037-2ff47f6b2caa","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90a1faf0-f01f-4e58-ba2e-202426528474","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7d032d3-ee82-4e9d-a158-09122b739dd5","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05424da7-a46c-451d-b736-9880cc9bd9b8","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"221a454d-8e8c-440a-b4dd-bf887912c319","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e705a700-72b0-45e8-abc0-902b0b6b5480","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"256e01ac-92a5-4b00-b924-f737ba60a369","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb40438e-c2f8-4710-a5c7-6b5baba67f2d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfd1e5f3-169b-43c3-8fa1-39b1b2a0f46b","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b06c89f-a1e5-4676-84a3-e775f1fbe9ea","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"423f94d0-193c-4ce2-9ab4-81d6e5dd7eaf","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"412496f6-a833-4a5b-a839-cdf54c804bd9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb8d528c-67fa-4f2d-8ce6-a5666d349c91","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"34af844a-9bf2-4670-92b2-5b8742d19f45","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01e51592-6bd6-474b-977d-824df4e2bf22","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a78d6371-2bc1-40ac-875b-c103a08506e5","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f250301d-3a8b-45be-a367-c659a8172e53","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb51533d-c39b-4638-9aa5-2edf96f2546c","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"695b5b5d-17d0-4d8f-bf1e-853a0daaea94","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d6300bb-f4d2-4f29-88f7-d55305e9750e","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad65432a-03b3-44aa-bb4d-66a7218859bb","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1413a945-9705-40c0-8532-72c7463a559a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7f6b8d0-aa60-4dee-85bd-ae56f29450b4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74fb959e-3e19-48c0-b3a6-bd546e1a8e75","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d204018f-27e8-4e54-b5e7-d50899ede96c","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73952404-cb8b-464a-a7aa-3aa9b9c4587d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f261bef-12bf-4b37-a300-434041e3b5d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca614523-7c89-4120-abe1-58169c8f4267","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44032114-1f2f-47cd-a4a6-1421600214cd","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1be6cd38-e67c-4068-814e-8bc76c469ef6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08fed482-516f-4bc4-8e62-df1f5ddd2378","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bd26df5-8feb-4ab1-92a1-c82b9a377ddc","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da05b69a-1448-41be-90c3-5cfbba0a8721","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b674b5aa-b71a-4987-991f-ad9fed6243bd","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"484adcfc-055b-4bd2-8a69-7f6ef1845733","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89e92372-ddc8-41c5-ba42-a8f62dcc9fc6","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34a79fa8-8079-48f2-97c2-cf5597257626","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6f81ed7-7136-4422-835e-a2c3546f1548","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a6ad9ef-c588-41b9-96f4-dea51b324aef","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"842d94d2-94ff-4452-951a-eea2822aea1b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"179fdf05-ab39-44b0-9d53-3601823644d4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"136b448f-cab9-4502-ab49-211dae6baa0b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4040dc72-745d-4e35-a7c5-f65e7aab043c","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b87e4893-54e4-4e14-b3de-7cbc4ad4573d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cca6dcf-ec65-406d-843c-6e1ae18bb3c0","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33695af1-3f1f-4235-aaad-4394a9c7faef","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2407b5d3-1513-4a94-9fa9-12f20669831f","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afbc04d4-7e38-410d-ba02-ce4314cd47ce","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"743472f3-6863-4abe-bf55-bbeff76aaf00","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"723f7c79-4e5f-46df-9c78-5a799c698654","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a9d1567-0b32-43d8-8f0a-310c6728a8a6","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"859ae0fb-8969-4e1a-8d91-823ea7f0702a","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e607018-2fee-4472-af53-adf27c701121","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"20532cfd-03ba-4a9d-a019-6ced8cf9b990","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ffc63594-ebb2-47ba-8083-be578882d2b4","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4ecb63b-a763-486b-8037-2ff47f6b2caa","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90a1faf0-f01f-4e58-ba2e-202426528474","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7d032d3-ee82-4e9d-a158-09122b739dd5","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05424da7-a46c-451d-b736-9880cc9bd9b8","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"221a454d-8e8c-440a-b4dd-bf887912c319","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e705a700-72b0-45e8-abc0-902b0b6b5480","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"256e01ac-92a5-4b00-b924-f737ba60a369","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb40438e-c2f8-4710-a5c7-6b5baba67f2d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfd1e5f3-169b-43c3-8fa1-39b1b2a0f46b","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b06c89f-a1e5-4676-84a3-e775f1fbe9ea","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"423f94d0-193c-4ce2-9ab4-81d6e5dd7eaf","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"412496f6-a833-4a5b-a839-cdf54c804bd9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb8d528c-67fa-4f2d-8ce6-a5666d349c91","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"34af844a-9bf2-4670-92b2-5b8742d19f45","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01e51592-6bd6-474b-977d-824df4e2bf22","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a78d6371-2bc1-40ac-875b-c103a08506e5","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f250301d-3a8b-45be-a367-c659a8172e53","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb51533d-c39b-4638-9aa5-2edf96f2546c","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"695b5b5d-17d0-4d8f-bf1e-853a0daaea94","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d6300bb-f4d2-4f29-88f7-d55305e9750e","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad65432a-03b3-44aa-bb4d-66a7218859bb","IsCreationKey":false,"Key":44.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_bare_heads_colourable/spr_bare_heads_colourable.yy b/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy index 705df661cf..0d2e1be36c 100644 --- a/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy +++ b/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_heads_colourable", "bboxMode":0, "bbox_bottom":206, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,24 +75,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f158a15-d382-450f-824b-5ca1b02ddec7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f158a15-d382-450f-824b-5ca1b02ddec7","IsCreationKey":false,"Key":5.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_bare_neck_colourable/spr_bare_neck_colourable.yy b/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy index 7470485f59..54b0d33b20 100644 --- a/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy +++ b/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_neck_colourable", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bare_necks/spr_bare_necks.yy b/sprites/spr_bare_necks/spr_bare_necks.yy index 999c353881..881a3ec792 100644 --- a/sprites/spr_bare_necks/spr_bare_necks.yy +++ b/sprites/spr_bare_necks/spr_bare_necks.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_necks", "bboxMode":0, "bbox_bottom":44, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"10e61cb9-19c1-4412-9af9-4c6b32200233","name":"10e61cb9-19c1-4412-9af9-4c6b32200233","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c81351d7-a31f-453c-94a1-ae7599f9959c","name":"c81351d7-a31f-453c-94a1-ae7599f9959c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18722739-19a0-49d8-90fb-349ab76d829b","name":"18722739-19a0-49d8-90fb-349ab76d829b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"217090ee-986a-4bde-9f6d-67271a13c19f","name":"217090ee-986a-4bde-9f6d-67271a13c19f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15035d1a-aee3-47c2-9966-61275a3c69d8","name":"15035d1a-aee3-47c2-9966-61275a3c69d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"10e61cb9-19c1-4412-9af9-4c6b32200233","name":"10e61cb9-19c1-4412-9af9-4c6b32200233","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c81351d7-a31f-453c-94a1-ae7599f9959c","name":"c81351d7-a31f-453c-94a1-ae7599f9959c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18722739-19a0-49d8-90fb-349ab76d829b","name":"18722739-19a0-49d8-90fb-349ab76d829b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"217090ee-986a-4bde-9f6d-67271a13c19f","name":"217090ee-986a-4bde-9f6d-67271a13c19f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15035d1a-aee3-47c2-9966-61275a3c69d8","name":"15035d1a-aee3-47c2-9966-61275a3c69d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"10e61cb9-19c1-4412-9af9-4c6b32200233","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b60ae687-354e-4c5c-834c-7287e0f3a24d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c81351d7-a31f-453c-94a1-ae7599f9959c","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"17bc3897-bae6-4611-9e55-2407195f25ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b54d4c04-eeba-4a3f-8eeb-11669bfb8b46","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18722739-19a0-49d8-90fb-349ab76d829b","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8166ac73-ec7c-4031-b95e-3a4e7b0fd6e3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6981172-9a50-4d39-89ec-ca61a7e575ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"217090ee-986a-4bde-9f6d-67271a13c19f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07c385d7-248c-483f-88a3-f8e67aabb43a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15035d1a-aee3-47c2-9966-61275a3c69d8","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"752217ee-cefe-46c7-8d2e-887e1bd6d850","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"10e61cb9-19c1-4412-9af9-4c6b32200233","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b60ae687-354e-4c5c-834c-7287e0f3a24d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c81351d7-a31f-453c-94a1-ae7599f9959c","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"17bc3897-bae6-4611-9e55-2407195f25ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b54d4c04-eeba-4a3f-8eeb-11669bfb8b46","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18722739-19a0-49d8-90fb-349ab76d829b","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8166ac73-ec7c-4031-b95e-3a4e7b0fd6e3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6981172-9a50-4d39-89ec-ca61a7e575ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"217090ee-986a-4bde-9f6d-67271a13c19f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07c385d7-248c-483f-88a3-f8e67aabb43a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15035d1a-aee3-47c2-9966-61275a3c69d8","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"752217ee-cefe-46c7-8d2e-887e1bd6d850","IsCreationKey":false,"Key":7.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_battle_block/spr_battle_block.yy b/sprites/spr_battle_block/spr_battle_block.yy index a48aa3d60d..a4b8f147fb 100644 --- a/sprites/spr_battle_block/spr_battle_block.yy +++ b/sprites/spr_battle_block/spr_battle_block.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_battle_block", "bboxMode":0, "bbox_bottom":9, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"faefc140-3c2a-4012-bbff-44f978c3c07e","name":"faefc140-3c2a-4012-bbff-44f978c3c07e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"faefc140-3c2a-4012-bbff-44f978c3c07e","name":"faefc140-3c2a-4012-bbff-44f978c3c07e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33ca9eef-ac9a-488d-af7d-8e082ec7bf1b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"faefc140-3c2a-4012-bbff-44f978c3c07e","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a7a7785-395a-41b1-ab12-a686d6b0bd9c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33ca9eef-ac9a-488d-af7d-8e082ec7bf1b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"faefc140-3c2a-4012-bbff-44f978c3c07e","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a7a7785-395a-41b1-ab12-a686d6b0bd9c","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_battle_block2/spr_battle_block2.yy b/sprites/spr_battle_block2/spr_battle_block2.yy index 837ffe6cac..97c49b63d1 100644 --- a/sprites/spr_battle_block2/spr_battle_block2.yy +++ b/sprites/spr_battle_block2/spr_battle_block2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_battle_block2", "bboxMode":0, "bbox_bottom":9, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c31e164-e605-49ac-aa68-77d99485eb89","name":"5c31e164-e605-49ac-aa68-77d99485eb89","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c31e164-e605-49ac-aa68-77d99485eb89","name":"5c31e164-e605-49ac-aa68-77d99485eb89","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c31e164-e605-49ac-aa68-77d99485eb89","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72908395-beb8-49ac-a394-f574a467b190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c31e164-e605-49ac-aa68-77d99485eb89","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72908395-beb8-49ac-a394-f574a467b190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_beakie_colors/spr_beakie_colors.yy b/sprites/spr_beakie_colors/spr_beakie_colors.yy index 444f3a1260..91665e1a48 100644 --- a/sprites/spr_beakie_colors/spr_beakie_colors.yy +++ b/sprites/spr_beakie_colors/spr_beakie_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_beakie_colors", "bboxMode":0, "bbox_bottom":222, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43de8c67-ec68-4742-9ab1-0a85f1441487","name":"43de8c67-ec68-4742-9ab1-0a85f1441487","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0985c171-a295-4621-a616-d603ed590110","name":"0985c171-a295-4621-a616-d603ed590110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50e8a95a-2b31-419d-8021-35eb7015de98","name":"50e8a95a-2b31-419d-8021-35eb7015de98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a89e1b5-01cf-4665-a005-932e861784e6","name":"1a89e1b5-01cf-4665-a005-932e861784e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce203156-ae0e-4ead-91b9-728e91d5d262","name":"ce203156-ae0e-4ead-91b9-728e91d5d262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7e135c3-4c81-4b7d-a819-423c7200c598","name":"a7e135c3-4c81-4b7d-a819-423c7200c598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43de8c67-ec68-4742-9ab1-0a85f1441487","name":"43de8c67-ec68-4742-9ab1-0a85f1441487","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0985c171-a295-4621-a616-d603ed590110","name":"0985c171-a295-4621-a616-d603ed590110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50e8a95a-2b31-419d-8021-35eb7015de98","name":"50e8a95a-2b31-419d-8021-35eb7015de98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a89e1b5-01cf-4665-a005-932e861784e6","name":"1a89e1b5-01cf-4665-a005-932e861784e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce203156-ae0e-4ead-91b9-728e91d5d262","name":"ce203156-ae0e-4ead-91b9-728e91d5d262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7e135c3-4c81-4b7d-a819-423c7200c598","name":"a7e135c3-4c81-4b7d-a819-423c7200c598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"42a24f5f-59b0-4238-87c4-74423a626f08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43de8c67-ec68-4742-9ab1-0a85f1441487","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09b63fe3-5ad2-4c11-9e06-aca436bd5c31","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0985c171-a295-4621-a616-d603ed590110","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"369c16d4-95d2-44dc-8656-2f5eef632f50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e8a95a-2b31-419d-8021-35eb7015de98","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec20f9e4-cfed-4dff-9e3a-79aa1717a8e2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16538e15-b065-4274-bd4b-1a1cf8b3e275","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a89e1b5-01cf-4665-a005-932e861784e6","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c3835093-5675-4489-b5dd-a6504749e7b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af6197f9-dab9-40b3-bbe5-7278167a301f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"caf28f26-50fe-4772-9a62-311acb7db68f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce203156-ae0e-4ead-91b9-728e91d5d262","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9da9649-d7c7-4cfc-8f0e-efbaaa577fc8","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e135c3-4c81-4b7d-a819-423c7200c598","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af6479d9-20ed-41d7-890d-7629734863ed","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"675de54e-cf05-4de3-9eed-8770315e6bc9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21fac7cd-71b6-46cb-9853-e22bf5cdd7f1","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f14edaaa-a8a9-472f-9eae-725540b9923d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cff6cd61-580b-4057-8302-b364bf2a3387","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"42a24f5f-59b0-4238-87c4-74423a626f08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43de8c67-ec68-4742-9ab1-0a85f1441487","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09b63fe3-5ad2-4c11-9e06-aca436bd5c31","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0985c171-a295-4621-a616-d603ed590110","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"369c16d4-95d2-44dc-8656-2f5eef632f50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e8a95a-2b31-419d-8021-35eb7015de98","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec20f9e4-cfed-4dff-9e3a-79aa1717a8e2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16538e15-b065-4274-bd4b-1a1cf8b3e275","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a89e1b5-01cf-4665-a005-932e861784e6","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c3835093-5675-4489-b5dd-a6504749e7b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af6197f9-dab9-40b3-bbe5-7278167a301f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"caf28f26-50fe-4772-9a62-311acb7db68f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce203156-ae0e-4ead-91b9-728e91d5d262","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9da9649-d7c7-4cfc-8f0e-efbaaa577fc8","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e135c3-4c81-4b7d-a819-423c7200c598","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af6479d9-20ed-41d7-890d-7629734863ed","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"675de54e-cf05-4de3-9eed-8770315e6bc9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21fac7cd-71b6-46cb-9853-e22bf5cdd7f1","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f14edaaa-a8a9-472f-9eae-725540b9923d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cff6cd61-580b-4057-8302-b364bf2a3387","IsCreationKey":false,"Key":13.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_binders_robes/spr_binders_robes.yy b/sprites/spr_binders_robes/spr_binders_robes.yy index 2d4691cd82..6ba17f71bf 100644 --- a/sprites/spr_binders_robes/spr_binders_robes.yy +++ b/sprites/spr_binders_robes/spr_binders_robes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_binders_robes", "bboxMode":0, "bbox_bottom":227, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98625b1b-c315-421f-942a-61723f81b005","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"215363f4-8f45-4eca-ae3c-019fa514b47f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daf40e8e-0ab7-400e-bd4c-e52e8f404d3d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"98625b1b-c315-421f-942a-61723f81b005","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"215363f4-8f45-4eca-ae3c-019fa514b47f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daf40e8e-0ab7-400e-bd4c-e52e8f404d3d","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_bio_fighter/spr_bio_fighter.yy b/sprites/spr_bio_fighter/spr_bio_fighter.yy index b90f4af45b..048078906a 100644 --- a/sprites/spr_bio_fighter/spr_bio_fighter.yy +++ b/sprites/spr_bio_fighter/spr_bio_fighter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bio_fighter", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f007a16a-62b9-4292-8ca8-4710f976a9b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f007a16a-62b9-4292-8ca8-4710f976a9b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy b/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy index baa11aa58d..c7141e238c 100644 --- a/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy +++ b/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_eye_2", "bboxMode":0, "bbox_bottom":34, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"51e35673-dadd-418d-9abc-e9615a475fbc","name":"51e35673-dadd-418d-9abc-e9615a475fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51e35673-dadd-418d-9abc-e9615a475fbc","name":"51e35673-dadd-418d-9abc-e9615a475fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ae9abc3-6ed5-48ee-a250-e22f7819bc3d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bb6848f-08b4-4c6c-8690-c266abe32bfe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b99fe40-f32c-46ac-8d18-1e2ce6e66e1a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e35673-dadd-418d-9abc-e9615a475fbc","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9dca493b-9343-4366-b291-b370bbb8d3f2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ae9abc3-6ed5-48ee-a250-e22f7819bc3d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bb6848f-08b4-4c6c-8690-c266abe32bfe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b99fe40-f32c-46ac-8d18-1e2ce6e66e1a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e35673-dadd-418d-9abc-e9615a475fbc","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9dca493b-9343-4366-b291-b370bbb8d3f2","IsCreationKey":false,"Key":3.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_bionic_left_arm/spr_bionic_left_arm.yy b/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy index f5e7894542..fab01acf82 100644 --- a/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy +++ b/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5976c9a5-8277-4050-b34d-34f2d872e4da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cbf2a21-7ada-41e5-903e-cd67592bac46","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5976c9a5-8277-4050-b34d-34f2d872e4da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cbf2a21-7ada-41e5-903e-cd67592bac46","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_bionic_left_eyes/spr_bionic_left_eyes.yy b/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy index 60861c0587..a80f650345 100644 --- a/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy +++ b/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_left_eyes", "bboxMode":0, "bbox_bottom":39, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b28cdb8f-d22c-4a36-ae78-60b9bfaa06d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e755fe34-01b8-43ee-9b7b-6853fc630075","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d55ecb9-522e-4979-9234-e8bcd8048c58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b28cdb8f-d22c-4a36-ae78-60b9bfaa06d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e755fe34-01b8-43ee-9b7b-6853fc630075","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d55ecb9-522e-4979-9234-e8bcd8048c58","IsCreationKey":false,"Key":2.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_bionic_leg_left/spr_bionic_leg_left.yy b/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy index 7ea789e6aa..115597837a 100644 --- a/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy +++ b/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_leg_left", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ebd16397-c391-4646-97de-e5dab06667d2","name":"ebd16397-c391-4646-97de-e5dab06667d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebd16397-c391-4646-97de-e5dab06667d2","name":"ebd16397-c391-4646-97de-e5dab06667d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d79241c0-c856-44b5-b854-c037f49cf072","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"903563e8-77b8-4ba8-a310-59f152994e37","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd16397-c391-4646-97de-e5dab06667d2","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d0f98b2-cc58-4c1a-8cc3-096abb41e602","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d79241c0-c856-44b5-b854-c037f49cf072","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"903563e8-77b8-4ba8-a310-59f152994e37","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd16397-c391-4646-97de-e5dab06667d2","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d0f98b2-cc58-4c1a-8cc3-096abb41e602","IsCreationKey":false,"Key":2.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_bionic_leg_right/spr_bionic_leg_right.yy b/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy index bcc7ff1275..a44fdf52ab 100644 --- a/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy +++ b/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_leg_right", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ad3a1f0-7df5-4ad7-b3ca-26ba15d59820","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83fe762c-855d-4486-97e8-4c7acfd8438b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce7840e9-414a-4d55-adfe-7c61246bd61b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ad3a1f0-7df5-4ad7-b3ca-26ba15d59820","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83fe762c-855d-4486-97e8-4c7acfd8438b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce7840e9-414a-4d55-adfe-7c61246bd61b","IsCreationKey":false,"Key":2.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_bionic_right_arm/spr_bionic_right_arm.yy b/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy index 567bb7cbee..53f0635d51 100644 --- a/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy +++ b/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f40b0403-9c6e-4050-94b1-3fdb07c4949b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84ded38f-b057-4586-aeaf-f434c1ad998f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f40b0403-9c6e-4050-94b1-3fdb07c4949b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84ded38f-b057-4586-aeaf-f434c1ad998f","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_bionic_right_eyes/spr_bionic_right_eyes.yy b/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy index c7cfcf7cae..8741cfd6ea 100644 --- a/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy +++ b/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_right_eyes", "bboxMode":0, "bbox_bottom":39, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63faba23-bea0-4293-b76a-0c67b3efa44c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9cf283c-8a9c-4047-9850-5cc548a2862a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f39a3fed-6e36-4af6-82d2-1ab2c62e00f7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63faba23-bea0-4293-b76a-0c67b3efa44c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9cf283c-8a9c-4047-9850-5cc548a2862a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f39a3fed-6e36-4af6-82d2-1ab2c62e00f7","IsCreationKey":false,"Key":2.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_bionics_arm/spr_bionics_arm.yy b/sprites/spr_bionics_arm/spr_bionics_arm.yy index 45ab7db89b..f064197d79 100644 --- a/sprites/spr_bionics_arm/spr_bionics_arm.yy +++ b/sprites/spr_bionics_arm/spr_bionics_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fa16835-de7d-4daf-bd0e-a27f3a6472fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca31ccd2-4d61-4c0a-9fd5-104aa9778ae0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7fa16835-de7d-4daf-bd0e-a27f3a6472fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca31ccd2-4d61-4c0a-9fd5-104aa9778ae0","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_bionics_arm_2/spr_bionics_arm_2.yy b/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy index 39d5ac74d9..4102df37d1 100644 --- a/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy +++ b/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_arm_2", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"147f2087-0542-4803-98c7-8a60024455c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6dd4a812-1889-4907-8903-6fd2b0b91f00","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"147f2087-0542-4803-98c7-8a60024455c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6dd4a812-1889-4907-8903-6fd2b0b91f00","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_bionics_eye/spr_bionics_eye.yy b/sprites/spr_bionics_eye/spr_bionics_eye.yy index 43396fbe4f..d890e57aeb 100644 --- a/sprites/spr_bionics_eye/spr_bionics_eye.yy +++ b/sprites/spr_bionics_eye/spr_bionics_eye.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_eye", "bboxMode":0, "bbox_bottom":39, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4118479-ad65-4797-9dc7-4bd95085c46f","name":"c4118479-ad65-4797-9dc7-4bd95085c46f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4118479-ad65-4797-9dc7-4bd95085c46f","name":"c4118479-ad65-4797-9dc7-4bd95085c46f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4118479-ad65-4797-9dc7-4bd95085c46f","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4595b332-c57a-4482-a884-d1a6ad5806bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8ba3139-eb69-4a04-9836-dc377c2636e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4118479-ad65-4797-9dc7-4bd95085c46f","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4595b332-c57a-4482-a884-d1a6ad5806bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8ba3139-eb69-4a04-9836-dc377c2636e9","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_bionics_hand/spr_bionics_hand.yy b/sprites/spr_bionics_hand/spr_bionics_hand.yy index 3ec05afc04..3899c5be2b 100644 --- a/sprites/spr_bionics_hand/spr_bionics_hand.yy +++ b/sprites/spr_bionics_hand/spr_bionics_hand.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_hand", "bboxMode":0, "bbox_bottom":125, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"524c80bc-1e15-469e-9b11-4bd1d380f832","name":"524c80bc-1e15-469e-9b11-4bd1d380f832","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3251dc9b-140d-4210-81f0-08269c9ee883","name":"3251dc9b-140d-4210-81f0-08269c9ee883","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"524c80bc-1e15-469e-9b11-4bd1d380f832","name":"524c80bc-1e15-469e-9b11-4bd1d380f832","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3251dc9b-140d-4210-81f0-08269c9ee883","name":"3251dc9b-140d-4210-81f0-08269c9ee883","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b5fb66c1-2f70-48d8-900b-b6b549811246","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"524c80bc-1e15-469e-9b11-4bd1d380f832","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f3ca57d-c1de-4060-aeb4-275750b6a67a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3251dc9b-140d-4210-81f0-08269c9ee883","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cdb2fb2c-def4-4dd8-8e26-1e9bf1cbe534","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a492e7-f52c-494d-b84c-492208d0a6de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b5fb66c1-2f70-48d8-900b-b6b549811246","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"524c80bc-1e15-469e-9b11-4bd1d380f832","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f3ca57d-c1de-4060-aeb4-275750b6a67a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3251dc9b-140d-4210-81f0-08269c9ee883","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cdb2fb2c-def4-4dd8-8e26-1e9bf1cbe534","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a492e7-f52c-494d-b84c-492208d0a6de","IsCreationKey":false,"Key":3.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_bionics_leg/spr_bionics_leg.yy b/sprites/spr_bionics_leg/spr_bionics_leg.yy index 4a186a9614..ec9566884b 100644 --- a/sprites/spr_bionics_leg/spr_bionics_leg.yy +++ b/sprites/spr_bionics_leg/spr_bionics_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_leg", "bboxMode":0, "bbox_bottom":220, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ab1a0e3-0e69-498b-b0c2-7a6f01a212cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7625488-b76b-470f-849d-aea986f91ce5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76192087-4067-4351-a0e7-5c820764bff6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c28eae0-67f3-4379-847c-4fdaf6168b58","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ab1a0e3-0e69-498b-b0c2-7a6f01a212cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7625488-b76b-470f-849d-aea986f91ce5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76192087-4067-4351-a0e7-5c820764bff6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c28eae0-67f3-4379-847c-4fdaf6168b58","IsCreationKey":false,"Key":3.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_bionics_leg_2/spr_bionics_leg_2.yy b/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy index 93b21d99cc..e7c3294ac6 100644 --- a/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy +++ b/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_leg_2", "bboxMode":0, "bbox_bottom":212, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"60344010-666c-4587-8df7-3a7b00650211","name":"60344010-666c-4587-8df7-3a7b00650211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3eda6fcd-5322-48bd-a288-7a10c092106d","name":"3eda6fcd-5322-48bd-a288-7a10c092106d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c017214-77b0-4045-82a3-7f4f38b750dc","name":"2c017214-77b0-4045-82a3-7f4f38b750dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60344010-666c-4587-8df7-3a7b00650211","name":"60344010-666c-4587-8df7-3a7b00650211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3eda6fcd-5322-48bd-a288-7a10c092106d","name":"3eda6fcd-5322-48bd-a288-7a10c092106d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c017214-77b0-4045-82a3-7f4f38b750dc","name":"2c017214-77b0-4045-82a3-7f4f38b750dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60344010-666c-4587-8df7-3a7b00650211","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f7862ff-d90c-486b-a1ea-580889f2e702","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eda6fcd-5322-48bd-a288-7a10c092106d","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59645d06-f0ba-4d6a-bd64-c870a41a5ed9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c017214-77b0-4045-82a3-7f4f38b750dc","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f67e883-b80f-45b5-88f9-efa0ba50734c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df5f15df-c503-4f47-a424-f2230c7190bf","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60344010-666c-4587-8df7-3a7b00650211","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f7862ff-d90c-486b-a1ea-580889f2e702","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eda6fcd-5322-48bd-a288-7a10c092106d","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59645d06-f0ba-4d6a-bd64-c870a41a5ed9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c017214-77b0-4045-82a3-7f4f38b750dc","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f67e883-b80f-45b5-88f9-efa0ba50734c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df5f15df-c503-4f47-a424-f2230c7190bf","IsCreationKey":false,"Key":3.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_bionics_leg_3/spr_bionics_leg_3.yy b/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy index 72549cc9cb..94b80688fa 100644 --- a/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy +++ b/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_leg_3", "bboxMode":0, "bbox_bottom":220, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d997f30c-b766-4e52-864e-db00fa825f91","name":"d997f30c-b766-4e52-864e-db00fa825f91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d997f30c-b766-4e52-864e-db00fa825f91","name":"d997f30c-b766-4e52-864e-db00fa825f91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7b887ab-6c36-4a5a-9cc4-6fdc73de936d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b074909-58d0-49b2-8d3b-3d8acb2ef00d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6711864-48f4-4b55-8517-81694b5cb9c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d997f30c-b766-4e52-864e-db00fa825f91","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74663002-2056-4f5e-bb5d-27715081c24d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7b887ab-6c36-4a5a-9cc4-6fdc73de936d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b074909-58d0-49b2-8d3b-3d8acb2ef00d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6711864-48f4-4b55-8517-81694b5cb9c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d997f30c-b766-4e52-864e-db00fa825f91","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74663002-2056-4f5e-bb5d-27715081c24d","IsCreationKey":false,"Key":3.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_blog/spr_blog.yy b/sprites/spr_blog/spr_blog.yy index 78ac8d53f3..3551bd7584 100644 --- a/sprites/spr_blog/spr_blog.yy +++ b/sprites/spr_blog/spr_blog.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_blog", "bboxMode":0, "bbox_bottom":30, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"535cb6f7-000e-4721-b110-366ed91586fd","name":"535cb6f7-000e-4721-b110-366ed91586fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"535cb6f7-000e-4721-b110-366ed91586fd","name":"535cb6f7-000e-4721-b110-366ed91586fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40cf980a-c533-4a0f-8ff5-f24cfcfb77ad","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"535cb6f7-000e-4721-b110-366ed91586fd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c75c05d9-2ab6-451f-b4ba-17a06bacd03c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fecfc36-bb6d-4b7d-9923-5b749b1d36c4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82c9e0e1-20b5-4047-9966-b43b76e593f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"355f3481-2d74-4cce-932d-dc10af3c877b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"108fb78c-f692-4d04-9238-2f4fa17f5a1e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40cf980a-c533-4a0f-8ff5-f24cfcfb77ad","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"535cb6f7-000e-4721-b110-366ed91586fd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c75c05d9-2ab6-451f-b4ba-17a06bacd03c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fecfc36-bb6d-4b7d-9923-5b749b1d36c4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82c9e0e1-20b5-4047-9966-b43b76e593f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"355f3481-2d74-4cce-932d-dc10af3c877b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"108fb78c-f692-4d04-9238-2f4fa17f5a1e","IsCreationKey":false,"Key":5.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_bolt/spr_bolt.yy b/sprites/spr_bolt/spr_bolt.yy index e6fc210f27..ce1992edda 100644 --- a/sprites/spr_bolt/spr_bolt.yy +++ b/sprites/spr_bolt/spr_bolt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bolt", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","path":"sprites/spr_bolt/spr_bolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea9cdec0-668a-4734-bc7f-753703846553","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","path":"sprites/spr_bolt/spr_bolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea9cdec0-668a-4734-bc7f-753703846553","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy b/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy index 87480ad35a..73db77ccf8 100644 --- a/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy +++ b/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bonding_studs_left", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy b/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy index 6b808a95a5..dc911f05c4 100644 --- a/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy +++ b/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bonding_studs_right", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44c9fff8-d58f-4c90-8b67-a07f3503bcbc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44c9fff8-d58f-4c90-8b67-a07f3503bcbc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_build_tiny/spr_build_tiny.yy b/sprites/spr_build_tiny/spr_build_tiny.yy index 4b0188c8b3..3e89d9e539 100644 --- a/sprites/spr_build_tiny/spr_build_tiny.yy +++ b/sprites/spr_build_tiny/spr_build_tiny.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_build_tiny", "bboxMode":0, "bbox_bottom":11, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_build_tiny/spr_build_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_build_tiny/spr_build_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_build_tiny2/spr_build_tiny2.yy b/sprites/spr_build_tiny2/spr_build_tiny2.yy index 970a51d785..0e47262850 100644 --- a/sprites/spr_build_tiny2/spr_build_tiny2.yy +++ b/sprites/spr_build_tiny2/spr_build_tiny2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_build_tiny2", "bboxMode":0, "bbox_bottom":8, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","path":"sprites/spr_build_tiny2/spr_build_tiny2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"410d66a0-8e76-417d-9ea2-f2fe32992cd3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","path":"sprites/spr_build_tiny2/spr_build_tiny2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"410d66a0-8e76-417d-9ea2-f2fe32992cd3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bullet/spr_bullet.yy b/sprites/spr_bullet/spr_bullet.yy index 1191ea3fbe..42497f9c7e 100644 --- a/sprites/spr_bullet/spr_bullet.yy +++ b/sprites/spr_bullet/spr_bullet.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bullet", "bboxMode":0, "bbox_bottom":2, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6de1eedf-abcf-424b-93fe-14592661e895","name":"6de1eedf-abcf-424b-93fe-14592661e895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6de1eedf-abcf-424b-93fe-14592661e895","name":"6de1eedf-abcf-424b-93fe-14592661e895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45638394-e5b8-4100-b8c3-1634e9bc5c81","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de1eedf-abcf-424b-93fe-14592661e895","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a649a5af-7279-4169-b998-8fb3c780fd6d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a20e31ba-472e-430d-9792-a2c545e10bbc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45638394-e5b8-4100-b8c3-1634e9bc5c81","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de1eedf-abcf-424b-93fe-14592661e895","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a649a5af-7279-4169-b998-8fb3c780fd6d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a20e31ba-472e-430d-9792-a2c545e10bbc","IsCreationKey":false,"Key":2.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":{ diff --git a/sprites/spr_cancel_small/spr_cancel_small.yy b/sprites/spr_cancel_small/spr_cancel_small.yy index 9dc9d44db6..9a8a06aa5f 100644 --- a/sprites/spr_cancel_small/spr_cancel_small.yy +++ b/sprites/spr_cancel_small/spr_cancel_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cancel_small", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"84a93b9a-ecde-4873-9a50-4138e49231ca","name":"84a93b9a-ecde-4873-9a50-4138e49231ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84a93b9a-ecde-4873-9a50-4138e49231ca","name":"84a93b9a-ecde-4873-9a50-4138e49231ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a93b9a-ecde-4873-9a50-4138e49231ca","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d1749b9-d177-422d-9166-d1a804565eff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a93b9a-ecde-4873-9a50-4138e49231ca","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d1749b9-d177-422d-9166-d1a804565eff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_cannon/spr_cannon.yy b/sprites/spr_cannon/spr_cannon.yy index 0310106cd0..bd808ff3a3 100644 --- a/sprites/spr_cannon/spr_cannon.yy +++ b/sprites/spr_cannon/spr_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cannon", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","path":"sprites/spr_cannon/spr_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4311aff-cbe8-42e9-ac4c-135ec61e9da0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","path":"sprites/spr_cannon/spr_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4311aff-cbe8-42e9-ac4c-135ec61e9da0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_carrion_breath/spr_carrion_breath.yy b/sprites/spr_carrion_breath/spr_carrion_breath.yy index b57ad3630a..cf693cf2aa 100644 --- a/sprites/spr_carrion_breath/spr_carrion_breath.yy +++ b/sprites/spr_carrion_breath/spr_carrion_breath.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_carrion_breath", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6750780f-1054-460d-8534-ef05f39652a5","name":"6750780f-1054-460d-8534-ef05f39652a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5d93c6e-321c-4b45-8c74-27062a51f937","name":"d5d93c6e-321c-4b45-8c74-27062a51f937","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edb5de84-7769-44fc-a7a2-b69ace679703","name":"edb5de84-7769-44fc-a7a2-b69ace679703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a480e5a9-b2d4-4187-bdba-78339048d27d","name":"a480e5a9-b2d4-4187-bdba-78339048d27d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6fbe2862-9270-452c-af95-3885be5369b3","name":"6fbe2862-9270-452c-af95-3885be5369b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6750780f-1054-460d-8534-ef05f39652a5","name":"6750780f-1054-460d-8534-ef05f39652a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5d93c6e-321c-4b45-8c74-27062a51f937","name":"d5d93c6e-321c-4b45-8c74-27062a51f937","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edb5de84-7769-44fc-a7a2-b69ace679703","name":"edb5de84-7769-44fc-a7a2-b69ace679703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480e5a9-b2d4-4187-bdba-78339048d27d","name":"a480e5a9-b2d4-4187-bdba-78339048d27d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6fbe2862-9270-452c-af95-3885be5369b3","name":"6fbe2862-9270-452c-af95-3885be5369b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6750780f-1054-460d-8534-ef05f39652a5","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97ea9318-53ef-49e0-89c5-c2ea9e886dc8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5d93c6e-321c-4b45-8c74-27062a51f937","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"345f2606-0535-4182-8706-2014078efd82","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb5de84-7769-44fc-a7a2-b69ace679703","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2906b15e-3441-47bc-9ead-01a0de054fa7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27171884-cf39-4f0f-9a51-96155167b8b3","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480e5a9-b2d4-4187-bdba-78339048d27d","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d57c8a1-baa7-4e00-95c0-6e4c17d377b3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fbe2862-9270-452c-af95-3885be5369b3","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d591bf65-f35d-48b5-b870-798b67ff028a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d29850b-8b6a-45c1-9a4b-7e31c63c4c9e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7486d265-51e5-4c9d-a0f7-51c056f4dec3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6750780f-1054-460d-8534-ef05f39652a5","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97ea9318-53ef-49e0-89c5-c2ea9e886dc8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5d93c6e-321c-4b45-8c74-27062a51f937","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"345f2606-0535-4182-8706-2014078efd82","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb5de84-7769-44fc-a7a2-b69ace679703","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2906b15e-3441-47bc-9ead-01a0de054fa7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27171884-cf39-4f0f-9a51-96155167b8b3","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480e5a9-b2d4-4187-bdba-78339048d27d","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d57c8a1-baa7-4e00-95c0-6e4c17d377b3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fbe2862-9270-452c-af95-3885be5369b3","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d591bf65-f35d-48b5-b870-798b67ff028a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d29850b-8b6a-45c1-9a4b-7e31c63c4c9e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7486d265-51e5-4c9d-a0f7-51c056f4dec3","IsCreationKey":false,"Key":7.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_chain_mail_tabbard/spr_chain_mail_tabbard.yy b/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy index d25b8f4ed6..3a0f8aa071 100644 --- a/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy +++ b/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chain_mail_tabbard", "bboxMode":0, "bbox_bottom":162, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chap_area_pad/spr_chap_area_pad.yy b/sprites/spr_chap_area_pad/spr_chap_area_pad.yy index 1025c38ac0..dd340a9e5d 100644 --- a/sprites/spr_chap_area_pad/spr_chap_area_pad.yy +++ b/sprites/spr_chap_area_pad/spr_chap_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chap_area_pad", "bboxMode":0, "bbox_bottom":157, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c38c46a-1684-4748-b935-42318fc441bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c38c46a-1684-4748-b935-42318fc441bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chap_trim_left/spr_chap_trim_left.yy b/sprites/spr_chap_trim_left/spr_chap_trim_left.yy index 9487c28502..f045189e15 100644 --- a/sprites/spr_chap_trim_left/spr_chap_trim_left.yy +++ b/sprites/spr_chap_trim_left/spr_chap_trim_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chap_trim_left", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_left/spr_chap_trim_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_left/spr_chap_trim_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chap_trim_right/spr_chap_trim_right.yy b/sprites/spr_chap_trim_right/spr_chap_trim_right.yy index a95be39464..a2452224a5 100644 --- a/sprites/spr_chap_trim_right/spr_chap_trim_right.yy +++ b/sprites/spr_chap_trim_right/spr_chap_trim_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chap_trim_right", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_right/spr_chap_trim_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_right/spr_chap_trim_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chaplain_helm/spr_chaplain_helm.yy b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy index 29cf66f657..de26cbbaff 100644 --- a/sprites/spr_chaplain_helm/spr_chaplain_helm.yy +++ b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_helm", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"570e9798-a363-4113-a62f-3329e557f4cf","name":"570e9798-a363-4113-a62f-3329e557f4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"570e9798-a363-4113-a62f-3329e557f4cf","name":"570e9798-a363-4113-a62f-3329e557f4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"570e9798-a363-4113-a62f-3329e557f4cf","path":"sprites/spr_chaplain_helm/spr_chaplain_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bddf969b-685c-491b-bfd5-97af3bc35d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"570e9798-a363-4113-a62f-3329e557f4cf","path":"sprites/spr_chaplain_helm/spr_chaplain_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bddf969b-685c-491b-bfd5-97af3bc35d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy b/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy index 67f9fdc13c..ed9d7c0e47 100644 --- a/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy +++ b/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_term_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"86934807-ea9a-4216-8308-41baa548c8fa","name":"86934807-ea9a-4216-8308-41baa548c8fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86934807-ea9a-4216-8308-41baa548c8fa","name":"86934807-ea9a-4216-8308-41baa548c8fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86934807-ea9a-4216-8308-41baa548c8fa","path":"sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11bace7a-9f35-49e0-8162-88bc61d6e2f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86934807-ea9a-4216-8308-41baa548c8fa","path":"sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11bace7a-9f35-49e0-8162-88bc61d6e2f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy b/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy index 75e57ec16f..04079072d6 100644 --- a/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy +++ b/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_wolf_helm", "bboxMode":0, "bbox_bottom":48, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75c80c2d-38d0-4554-92d8-e2e94a2ad19e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75c80c2d-38d0-4554-92d8-e2e94a2ad19e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy b/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy index 5b6e364e68..14404fe4b0 100644 --- a/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy +++ b/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_wolfterm_helm", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb7d7ec9-98d3-495d-9bdc-175c698dd371","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb7d7ec9-98d3-495d-9bdc-175c698dd371","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_charisma_icon/spr_charisma_icon.yy b/sprites/spr_charisma_icon/spr_charisma_icon.yy index c7b143ab1e..920914801a 100644 --- a/sprites/spr_charisma_icon/spr_charisma_icon.yy +++ b/sprites/spr_charisma_icon/spr_charisma_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_charisma_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4e272a50-68af-439b-86d3-167d72d6a28b","name":"4e272a50-68af-439b-86d3-167d72d6a28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e272a50-68af-439b-86d3-167d72d6a28b","name":"4e272a50-68af-439b-86d3-167d72d6a28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e272a50-68af-439b-86d3-167d72d6a28b","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"244ffbba-ba6f-4417-9adc-cb55077bbbf4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e272a50-68af-439b-86d3-167d72d6a28b","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"244ffbba-ba6f-4417-9adc-cb55077bbbf4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_checker_texture/spr_checker_texture.yy b/sprites/spr_checker_texture/spr_checker_texture.yy index 58da2000eb..e0d8251c4f 100644 --- a/sprites/spr_checker_texture/spr_checker_texture.yy +++ b/sprites/spr_checker_texture/spr_checker_texture.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_checker_texture", "bboxMode":0, "bbox_bottom":179, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cloak_cloth/spr_cloak_cloth.yy b/sprites/spr_cloak_cloth/spr_cloak_cloth.yy index abbfaf3025..fdff1a38c9 100644 --- a/sprites/spr_cloak_cloth/spr_cloak_cloth.yy +++ b/sprites/spr_cloak_cloth/spr_cloak_cloth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_cloth", "bboxMode":0, "bbox_bottom":212, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_cloth/spr_cloak_cloth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9facd769-5509-4fb6-8e77-cadc247917bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_cloth/spr_cloak_cloth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9facd769-5509-4fb6-8e77-cadc247917bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cloak_fur/spr_cloak_fur.yy b/sprites/spr_cloak_fur/spr_cloak_fur.yy index bfba41d1a2..79f1cd197d 100644 --- a/sprites/spr_cloak_fur/spr_cloak_fur.yy +++ b/sprites/spr_cloak_fur/spr_cloak_fur.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_fur", "bboxMode":0, "bbox_bottom":216, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_fur/spr_cloak_fur.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c0b8831-0ab4-46ac-944f-5c99c40dbe5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_fur/spr_cloak_fur.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c0b8831-0ab4-46ac-944f-5c99c40dbe5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cloak_image_0/spr_cloak_image_0.yy b/sprites/spr_cloak_image_0/spr_cloak_image_0.yy index 19ef9445b2..a7ae8826a7 100644 --- a/sprites/spr_cloak_image_0/spr_cloak_image_0.yy +++ b/sprites/spr_cloak_image_0/spr_cloak_image_0.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_image_0", "bboxMode":0, "bbox_bottom":213, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c72801d7-56dd-43d1-b640-7693f208ed61","name":"c72801d7-56dd-43d1-b640-7693f208ed61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c72801d7-56dd-43d1-b640-7693f208ed61","name":"c72801d7-56dd-43d1-b640-7693f208ed61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c72801d7-56dd-43d1-b640-7693f208ed61","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9e16542-ea41-470d-8d85-ec4af04648aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41456926-78d1-4b71-9ecf-24beb63ed9d6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d3cf5ee-ba23-4311-af2e-588e1972e447","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"897d121f-764b-4f0f-9d2a-5d8e558a373e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07b0b8b6-ea9e-4a9b-badf-51f3f9c76286","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c72801d7-56dd-43d1-b640-7693f208ed61","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9e16542-ea41-470d-8d85-ec4af04648aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41456926-78d1-4b71-9ecf-24beb63ed9d6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d3cf5ee-ba23-4311-af2e-588e1972e447","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"897d121f-764b-4f0f-9d2a-5d8e558a373e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07b0b8b6-ea9e-4a9b-badf-51f3f9c76286","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cloak_image_1/spr_cloak_image_1.yy b/sprites/spr_cloak_image_1/spr_cloak_image_1.yy index 3134e9982f..90a1f8eb24 100644 --- a/sprites/spr_cloak_image_1/spr_cloak_image_1.yy +++ b/sprites/spr_cloak_image_1/spr_cloak_image_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_image_1", "bboxMode":0, "bbox_bottom":194, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"86655c3b-40c5-4949-ad48-c902d6771b28","name":"86655c3b-40c5-4949-ad48-c902d6771b28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"383ca815-1d27-4a01-b20c-0c72c2beab37","name":"383ca815-1d27-4a01-b20c-0c72c2beab37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86655c3b-40c5-4949-ad48-c902d6771b28","name":"86655c3b-40c5-4949-ad48-c902d6771b28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"383ca815-1d27-4a01-b20c-0c72c2beab37","name":"383ca815-1d27-4a01-b20c-0c72c2beab37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86655c3b-40c5-4949-ad48-c902d6771b28","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53deed36-8fc2-4957-aa50-c5a14669fa21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05edf084-44f9-43af-8927-dc2cce5941a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"383ca815-1d27-4a01-b20c-0c72c2beab37","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fd4e74c-80c9-49f1-92ad-c6977e052f9b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86655c3b-40c5-4949-ad48-c902d6771b28","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53deed36-8fc2-4957-aa50-c5a14669fa21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05edf084-44f9-43af-8927-dc2cce5941a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"383ca815-1d27-4a01-b20c-0c72c2beab37","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fd4e74c-80c9-49f1-92ad-c6977e052f9b","IsCreationKey":false,"Key":2.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_cloak_scale/spr_cloak_scale.yy b/sprites/spr_cloak_scale/spr_cloak_scale.yy index bf8d28bc7a..9c6072e0fc 100644 --- a/sprites/spr_cloak_scale/spr_cloak_scale.yy +++ b/sprites/spr_cloak_scale/spr_cloak_scale.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_scale", "bboxMode":0, "bbox_bottom":212, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a25ab997-78d1-493d-8c42-60f772947082","name":"a25ab997-78d1-493d-8c42-60f772947082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a25ab997-78d1-493d-8c42-60f772947082","name":"a25ab997-78d1-493d-8c42-60f772947082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44d03fd0-264d-4713-9b5e-2a0894c5b4dd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a25ab997-78d1-493d-8c42-60f772947082","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"993b3549-1db6-49f3-ab15-bca44e2ab03a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44d03fd0-264d-4713-9b5e-2a0894c5b4dd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a25ab997-78d1-493d-8c42-60f772947082","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"993b3549-1db6-49f3-ab15-bca44e2ab03a","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_cloth_tabbard/spr_cloth_tabbard.yy b/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy index 7cb028bf21..9c2ac9ea49 100644 --- a/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy +++ b/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloth_tabbard", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","path":"sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6fbee2e3-91de-475d-8177-2f0f57e55b84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","path":"sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6fbee2e3-91de-475d-8177-2f0f57e55b84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_clothing_colors/spr_clothing_colors.yy b/sprites/spr_clothing_colors/spr_clothing_colors.yy index 0032082988..9ff70c13ef 100644 --- a/sprites/spr_clothing_colors/spr_clothing_colors.yy +++ b/sprites/spr_clothing_colors/spr_clothing_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_clothing_colors", "bboxMode":0, "bbox_bottom":224, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d158eb91-f130-4e16-af39-30aac05cb488","name":"d158eb91-f130-4e16-af39-30aac05cb488","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"342e62ff-f04a-428e-a2d9-8233602655b8","name":"342e62ff-f04a-428e-a2d9-8233602655b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28a52a45-1899-4218-b532-41887f1818c7","name":"28a52a45-1899-4218-b532-41887f1818c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"772e8755-978f-4592-8a42-f82683e16608","name":"772e8755-978f-4592-8a42-f82683e16608","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d158eb91-f130-4e16-af39-30aac05cb488","name":"d158eb91-f130-4e16-af39-30aac05cb488","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"342e62ff-f04a-428e-a2d9-8233602655b8","name":"342e62ff-f04a-428e-a2d9-8233602655b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28a52a45-1899-4218-b532-41887f1818c7","name":"28a52a45-1899-4218-b532-41887f1818c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"772e8755-978f-4592-8a42-f82683e16608","name":"772e8755-978f-4592-8a42-f82683e16608","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e07b4d3e-0669-4928-a562-47c40ba77db5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d158eb91-f130-4e16-af39-30aac05cb488","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bddf3682-9e00-425e-8774-4ea49b9c8ab3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"342e62ff-f04a-428e-a2d9-8233602655b8","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b0a6723-f6e6-4e94-959c-05577505a332","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"edf7c680-8f06-4e1f-afdc-983d063e1ac7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28a52a45-1899-4218-b532-41887f1818c7","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d828a12b-e196-4f3b-bbfa-4920c47c97cc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"772e8755-978f-4592-8a42-f82683e16608","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b46c4c7-8187-4341-b1df-384a0c33c2b5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e07b4d3e-0669-4928-a562-47c40ba77db5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d158eb91-f130-4e16-af39-30aac05cb488","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bddf3682-9e00-425e-8774-4ea49b9c8ab3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"342e62ff-f04a-428e-a2d9-8233602655b8","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b0a6723-f6e6-4e94-959c-05577505a332","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edf7c680-8f06-4e1f-afdc-983d063e1ac7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28a52a45-1899-4218-b532-41887f1818c7","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d828a12b-e196-4f3b-bbfa-4920c47c97cc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"772e8755-978f-4592-8a42-f82683e16608","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b46c4c7-8187-4341-b1df-384a0c33c2b5","IsCreationKey":false,"Key":5.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_cm_specialty/spr_cm_specialty.yy b/sprites/spr_cm_specialty/spr_cm_specialty.yy index e48463382e..364bf12cad 100644 --- a/sprites/spr_cm_specialty/spr_cm_specialty.yy +++ b/sprites/spr_cm_specialty/spr_cm_specialty.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cm_specialty", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_cog_pinion/spr_cog_pinion.yy b/sprites/spr_cog_pinion/spr_cog_pinion.yy index 28990eaf2d..f744442557 100644 --- a/sprites/spr_cog_pinion/spr_cog_pinion.yy +++ b/sprites/spr_cog_pinion/spr_cog_pinion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cog_pinion", "bboxMode":0, "bbox_bottom":60, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b66f1b8b-ed80-487e-a66d-21dcb51e53e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b66f1b8b-ed80-487e-a66d-21dcb51e53e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_company_title/spr_company_title.yy b/sprites/spr_company_title/spr_company_title.yy index b9f24f95c9..18e967eaff 100644 --- a/sprites/spr_company_title/spr_company_title.yy +++ b/sprites/spr_company_title/spr_company_title.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_company_title", "bboxMode":0, "bbox_bottom":3, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78cdfbff-e2ab-4284-a510-7bd46996352c","name":"78cdfbff-e2ab-4284-a510-7bd46996352c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb1570f7-dfce-415e-a264-421464e1321a","name":"bb1570f7-dfce-415e-a264-421464e1321a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78cdfbff-e2ab-4284-a510-7bd46996352c","name":"78cdfbff-e2ab-4284-a510-7bd46996352c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb1570f7-dfce-415e-a264-421464e1321a","name":"bb1570f7-dfce-415e-a264-421464e1321a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"348ed9fe-7199-4bdd-b0ae-c09c62700796","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78cdfbff-e2ab-4284-a510-7bd46996352c","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3de06e82-26f1-4b66-bcf9-3b1743d5a100","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80742708-10df-4876-99f2-c603ebc8b4f3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1570f7-dfce-415e-a264-421464e1321a","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dcfe9a46-7af9-443f-898b-0a1cadf8d2ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"344993fa-4ffe-4352-851f-29ca1116afaf","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"348ed9fe-7199-4bdd-b0ae-c09c62700796","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78cdfbff-e2ab-4284-a510-7bd46996352c","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3de06e82-26f1-4b66-bcf9-3b1743d5a100","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80742708-10df-4876-99f2-c603ebc8b4f3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1570f7-dfce-415e-a264-421464e1321a","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dcfe9a46-7af9-443f-898b-0a1cadf8d2ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","path":"sprites/spr_company_title/spr_company_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"344993fa-4ffe-4352-851f-29ca1116afaf","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_constitution_icon/spr_constitution_icon.yy b/sprites/spr_constitution_icon/spr_constitution_icon.yy index ee704700f7..a0c67818de 100644 --- a/sprites/spr_constitution_icon/spr_constitution_icon.yy +++ b/sprites/spr_constitution_icon/spr_constitution_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_constitution_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1193a06e-7496-4d5b-a172-a3b16075b9a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1193a06e-7496-4d5b-a172-a3b16075b9a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_craftworld/spr_craftworld.yy b/sprites/spr_craftworld/spr_craftworld.yy index 9b36786628..01c5f46600 100644 --- a/sprites/spr_craftworld/spr_craftworld.yy +++ b/sprites/spr_craftworld/spr_craftworld.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_craftworld", "bboxMode":0, "bbox_bottom":26, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","path":"sprites/spr_craftworld/spr_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9944b635-d444-4e75-8014-13b87418629f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","path":"sprites/spr_craftworld/spr_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9944b635-d444-4e75-8014-13b87418629f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_creation_arrow/spr_creation_arrow.yy b/sprites/spr_creation_arrow/spr_creation_arrow.yy index 28bdb853c6..0b73d14549 100644 --- a/sprites/spr_creation_arrow/spr_creation_arrow.yy +++ b/sprites/spr_creation_arrow/spr_creation_arrow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_arrow", "bboxMode":0, "bbox_bottom":63, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42c6f263-877a-4591-beb7-d81925f4e4ed","name":"42c6f263-877a-4591-beb7-d81925f4e4ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39637d47-757f-4595-84d8-5beaa78f7c74","name":"39637d47-757f-4595-84d8-5beaa78f7c74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42c6f263-877a-4591-beb7-d81925f4e4ed","name":"42c6f263-877a-4591-beb7-d81925f4e4ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39637d47-757f-4595-84d8-5beaa78f7c74","name":"39637d47-757f-4595-84d8-5beaa78f7c74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aff50e4e-5c01-4754-8871-c150741bb49a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23464b9c-d1f0-454d-84da-d8e4cd32faf6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c6f263-877a-4591-beb7-d81925f4e4ed","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58c19629-922a-40bf-a3f8-3d971641ebc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eaa6082-50a0-4252-9d17-3267ce434f68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39637d47-757f-4595-84d8-5beaa78f7c74","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0044680-b4da-481c-af80-7eeb1010fe14","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aff50e4e-5c01-4754-8871-c150741bb49a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23464b9c-d1f0-454d-84da-d8e4cd32faf6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c6f263-877a-4591-beb7-d81925f4e4ed","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58c19629-922a-40bf-a3f8-3d971641ebc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eaa6082-50a0-4252-9d17-3267ce434f68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39637d47-757f-4595-84d8-5beaa78f7c74","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0044680-b4da-481c-af80-7eeb1010fe14","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_creation_check/spr_creation_check.yy b/sprites/spr_creation_check/spr_creation_check.yy index afdd034a24..2440c8b801 100644 --- a/sprites/spr_creation_check/spr_creation_check.yy +++ b/sprites/spr_creation_check/spr_creation_check.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_check", "bboxMode":0, "bbox_bottom":27, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c23faa1-9d33-420c-abee-14a54a948dbf","name":"2c23faa1-9d33-420c-abee-14a54a948dbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"254f0303-cebd-476e-b05b-d23837a0eb42","name":"254f0303-cebd-476e-b05b-d23837a0eb42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c23faa1-9d33-420c-abee-14a54a948dbf","name":"2c23faa1-9d33-420c-abee-14a54a948dbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"254f0303-cebd-476e-b05b-d23837a0eb42","name":"254f0303-cebd-476e-b05b-d23837a0eb42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4e462ad-1f0a-4b83-a287-77a37a746b99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c23faa1-9d33-420c-abee-14a54a948dbf","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd6d5659-448d-46f4-9338-1ce1f10a8664","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c38f65bc-11d7-4bd6-ac49-4cc4ca363472","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"254f0303-cebd-476e-b05b-d23837a0eb42","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abe0f3dc-6d7f-4162-a9fa-febc8f647d0b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4e462ad-1f0a-4b83-a287-77a37a746b99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c23faa1-9d33-420c-abee-14a54a948dbf","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd6d5659-448d-46f4-9338-1ce1f10a8664","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c38f65bc-11d7-4bd6-ac49-4cc4ca363472","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"254f0303-cebd-476e-b05b-d23837a0eb42","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abe0f3dc-6d7f-4162-a9fa-febc8f647d0b","IsCreationKey":false,"Key":3.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_creation_existing/spr_creation_existing.yy b/sprites/spr_creation_existing/spr_creation_existing.yy index 4a609c8c64..46c72559b7 100644 --- a/sprites/spr_creation_existing/spr_creation_existing.yy +++ b/sprites/spr_creation_existing/spr_creation_existing.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_existing", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","path":"sprites/spr_creation_existing/spr_creation_existing.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27183917-bca7-4f08-bc34-9aabdb49048e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","path":"sprites/spr_creation_existing/spr_creation_existing.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27183917-bca7-4f08-bc34-9aabdb49048e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_creation_founding/spr_creation_founding.yy b/sprites/spr_creation_founding/spr_creation_founding.yy index fb8bb756dd..40e9498613 100644 --- a/sprites/spr_creation_founding/spr_creation_founding.yy +++ b/sprites/spr_creation_founding/spr_creation_founding.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_founding", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"469027c1-a05e-49c8-975f-f88b2b836a4c","name":"469027c1-a05e-49c8-975f-f88b2b836a4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"469027c1-a05e-49c8-975f-f88b2b836a4c","name":"469027c1-a05e-49c8-975f-f88b2b836a4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"469027c1-a05e-49c8-975f-f88b2b836a4c","path":"sprites/spr_creation_founding/spr_creation_founding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db39a3f1-b108-4f5d-888b-a2ffdeff59bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"469027c1-a05e-49c8-975f-f88b2b836a4c","path":"sprites/spr_creation_founding/spr_creation_founding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db39a3f1-b108-4f5d-888b-a2ffdeff59bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_creation_icon/spr_creation_icon.yy b/sprites/spr_creation_icon/spr_creation_icon.yy index 2596154da5..f7427da1c3 100644 --- a/sprites/spr_creation_icon/spr_creation_icon.yy +++ b/sprites/spr_creation_icon/spr_creation_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_icon", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","path":"sprites/spr_creation_icon/spr_creation_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e242762-9b45-4c27-89d9-881110ad528e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","path":"sprites/spr_creation_icon/spr_creation_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e242762-9b45-4c27-89d9-881110ad528e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_creation_nosplash/spr_creation_nosplash.yy b/sprites/spr_creation_nosplash/spr_creation_nosplash.yy index 353cc1a331..55025f904f 100644 --- a/sprites/spr_creation_nosplash/spr_creation_nosplash.yy +++ b/sprites/spr_creation_nosplash/spr_creation_nosplash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_nosplash", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_creation_other/spr_creation_other.yy b/sprites/spr_creation_other/spr_creation_other.yy index 20ca4c2e9b..209bbc7828 100644 --- a/sprites/spr_creation_other/spr_creation_other.yy +++ b/sprites/spr_creation_other/spr_creation_other.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_other", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_creation_slate/spr_creation_slate.yy b/sprites/spr_creation_slate/spr_creation_slate.yy index 3abb41bb38..1de0a3fe68 100644 --- a/sprites/spr_creation_slate/spr_creation_slate.yy +++ b/sprites/spr_creation_slate/spr_creation_slate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_slate", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_credits_bg/spr_credits_bg.yy b/sprites/spr_credits_bg/spr_credits_bg.yy index dcab269967..bc9f0baea7 100644 --- a/sprites/spr_credits_bg/spr_credits_bg.yy +++ b/sprites/spr_credits_bg/spr_credits_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_credits_bg", "bboxMode":0, "bbox_bottom":643, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61b3a396-5457-4d32-9cd2-2909f55558cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61b3a396-5457-4d32-9cd2-2909f55558cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_crusader/spr_crusader.yy b/sprites/spr_crusader/spr_crusader.yy index 889a668ca3..59fb6c58e9 100644 --- a/sprites/spr_crusader/spr_crusader.yy +++ b/sprites/spr_crusader/spr_crusader.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_crusader", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","path":"sprites/spr_crusader/spr_crusader.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f31e49a-6006-4538-8379-bb4041c1a227","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","path":"sprites/spr_crusader/spr_crusader.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f31e49a-6006-4538-8379-bb4041c1a227","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_crux_on_chain/spr_crux_on_chain.yy b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy index 66d4d2b3d8..04bd976d95 100644 --- a/sprites/spr_crux_on_chain/spr_crux_on_chain.yy +++ b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_crux_on_chain", "bboxMode":0, "bbox_bottom":35, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eca151ad-2626-4748-b179-608856db3925","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eca151ad-2626-4748-b179-608856db3925","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy b/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy index d7840ee2df..827bcebff8 100644 --- a/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy +++ b/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cthonian_tabbard", "bboxMode":0, "bbox_bottom":169, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cursor/spr_cursor.yy b/sprites/spr_cursor/spr_cursor.yy index ab459a78e6..5f3581a3ca 100644 --- a/sprites/spr_cursor/spr_cursor.yy +++ b/sprites/spr_cursor/spr_cursor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cursor", "bboxMode":0, "bbox_bottom":31, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"93ff084c-a13e-45b0-95ec-cc841cc02089","name":"93ff084c-a13e-45b0-95ec-cc841cc02089","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4c07a38-bb56-4dd9-8b02-741295614559","name":"d4c07a38-bb56-4dd9-8b02-741295614559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93ff084c-a13e-45b0-95ec-cc841cc02089","name":"93ff084c-a13e-45b0-95ec-cc841cc02089","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4c07a38-bb56-4dd9-8b02-741295614559","name":"d4c07a38-bb56-4dd9-8b02-741295614559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff084c-a13e-45b0-95ec-cc841cc02089","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15172d76-de0a-4ef8-9857-204bcfd3b55c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f57a812-e42e-40e1-a370-4a5fccb5c0e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4c07a38-bb56-4dd9-8b02-741295614559","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9f897f8-70c3-4c81-807d-2f8a3ee5f62b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64b047e5-e4ab-4543-a571-c654df47458a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df5149c8-7378-4ea3-b967-b84d714be29d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff084c-a13e-45b0-95ec-cc841cc02089","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15172d76-de0a-4ef8-9857-204bcfd3b55c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f57a812-e42e-40e1-a370-4a5fccb5c0e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4c07a38-bb56-4dd9-8b02-741295614559","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9f897f8-70c3-4c81-807d-2f8a3ee5f62b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64b047e5-e4ab-4543-a571-c654df47458a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","path":"sprites/spr_cursor/spr_cursor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df5149c8-7378-4ea3-b967-b84d714be29d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_da_backpack/spr_da_backpack.yy b/sprites/spr_da_backpack/spr_da_backpack.yy index c513b34731..603b2003dd 100644 --- a/sprites/spr_da_backpack/spr_da_backpack.yy +++ b/sprites/spr_da_backpack/spr_da_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_backpack", "bboxMode":0, "bbox_bottom":131, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"69575369-6061-47a6-b608-894dae3a1efd","name":"69575369-6061-47a6-b608-894dae3a1efd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69575369-6061-47a6-b608-894dae3a1efd","name":"69575369-6061-47a6-b608-894dae3a1efd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69575369-6061-47a6-b608-894dae3a1efd","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0c1f3a8-3480-46bb-990e-e40fbdd3727f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a68ed315-401e-4e7a-9d2a-bd3f16cb1f5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69575369-6061-47a6-b608-894dae3a1efd","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0c1f3a8-3480-46bb-990e-e40fbdd3727f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a68ed315-401e-4e7a-9d2a-bd3f16cb1f5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_chaplain/spr_da_chaplain.yy b/sprites/spr_da_chaplain/spr_da_chaplain.yy index 5986824bc5..2641ff734a 100644 --- a/sprites/spr_da_chaplain/spr_da_chaplain.yy +++ b/sprites/spr_da_chaplain/spr_da_chaplain.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_chaplain", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e272da8e-cbd6-4de2-b426-7882050bc848","name":"e272da8e-cbd6-4de2-b426-7882050bc848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e272da8e-cbd6-4de2-b426-7882050bc848","name":"e272da8e-cbd6-4de2-b426-7882050bc848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e272da8e-cbd6-4de2-b426-7882050bc848","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d37791a9-d620-476c-b2b9-21b4fe0725c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e272da8e-cbd6-4de2-b426-7882050bc848","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d37791a9-d620-476c-b2b9-21b4fe0725c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk3/spr_da_mk3.yy b/sprites/spr_da_mk3/spr_da_mk3.yy index 0b673521a2..5e6cdab340 100644 --- a/sprites/spr_da_mk3/spr_da_mk3.yy +++ b/sprites/spr_da_mk3/spr_da_mk3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk3", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","path":"sprites/spr_da_mk3/spr_da_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"258893f5-a03a-409e-a6d0-db68c35ccba3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","path":"sprites/spr_da_mk3/spr_da_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"258893f5-a03a-409e-a6d0-db68c35ccba3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk4/spr_da_mk4.yy b/sprites/spr_da_mk4/spr_da_mk4.yy index 80a5d4af12..efbbe4e690 100644 --- a/sprites/spr_da_mk4/spr_da_mk4.yy +++ b/sprites/spr_da_mk4/spr_da_mk4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk4", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_da_mk4/spr_da_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b603de2e-b512-4261-b663-ca5d8450e16a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_da_mk4/spr_da_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b603de2e-b512-4261-b663-ca5d8450e16a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk5/spr_da_mk5.yy b/sprites/spr_da_mk5/spr_da_mk5.yy index 0a3cb6ea7e..57f6ee9ef3 100644 --- a/sprites/spr_da_mk5/spr_da_mk5.yy +++ b/sprites/spr_da_mk5/spr_da_mk5.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk5", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_da_mk5/spr_da_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f4649d7-b028-4d37-90e3-df01c9857d86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_da_mk5/spr_da_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f4649d7-b028-4d37-90e3-df01c9857d86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy b/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy index 49d26993fc..b3e2143524 100644 --- a/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy +++ b/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk5_helm_crests", "bboxMode":0, "bbox_bottom":68, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","path":"sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3edacb19-eeca-4612-ae77-05723e4d3649","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","path":"sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3edacb19-eeca-4612-ae77-05723e4d3649","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk6/spr_da_mk6.yy b/sprites/spr_da_mk6/spr_da_mk6.yy index 1cb1b13137..2f56cd3e0c 100644 --- a/sprites/spr_da_mk6/spr_da_mk6.yy +++ b/sprites/spr_da_mk6/spr_da_mk6.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk6", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","path":"sprites/spr_da_mk6/spr_da_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"779c61ca-aaa6-4a5a-9127-3972d4dfdcc4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","path":"sprites/spr_da_mk6/spr_da_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"779c61ca-aaa6-4a5a-9127-3972d4dfdcc4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy b/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy index a82744707e..f87bef02a6 100644 --- a/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy +++ b/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk6_helm_crests", "bboxMode":0, "bbox_bottom":69, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","path":"sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33ab751e-df92-4816-adb3-fdc6e3711add","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","path":"sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33ab751e-df92-4816-adb3-fdc6e3711add","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk7/spr_da_mk7.yy b/sprites/spr_da_mk7/spr_da_mk7.yy index 6227af8ae1..08d7a6f381 100644 --- a/sprites/spr_da_mk7/spr_da_mk7.yy +++ b/sprites/spr_da_mk7/spr_da_mk7.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk7", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_mk7/spr_da_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_mk7/spr_da_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy b/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy index 2e10747a52..e4c36bbabb 100644 --- a/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy +++ b/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk7_helm_crests", "bboxMode":0, "bbox_bottom":68, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","path":"sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f7805ed-f659-46c4-a40b-416e685b204a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","path":"sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f7805ed-f659-46c4-a40b-416e685b204a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk8/spr_da_mk8.yy b/sprites/spr_da_mk8/spr_da_mk8.yy index 2f03a1bb17..426cd47da6 100644 --- a/sprites/spr_da_mk8/spr_da_mk8.yy +++ b/sprites/spr_da_mk8/spr_da_mk8.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk8", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e438d604-8c59-4821-832d-754219b528c5","name":"e438d604-8c59-4821-832d-754219b528c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e438d604-8c59-4821-832d-754219b528c5","name":"e438d604-8c59-4821-832d-754219b528c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e438d604-8c59-4821-832d-754219b528c5","path":"sprites/spr_da_mk8/spr_da_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"174c4894-2487-4c8d-b39a-a2eab3b34e5a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e438d604-8c59-4821-832d-754219b528c5","path":"sprites/spr_da_mk8/spr_da_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"174c4894-2487-4c8d-b39a-a2eab3b34e5a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_standard/spr_da_standard.yy b/sprites/spr_da_standard/spr_da_standard.yy index 770b8fc90f..ca42e17d23 100644 --- a/sprites/spr_da_standard/spr_da_standard.yy +++ b/sprites/spr_da_standard/spr_da_standard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_standard", "bboxMode":0, "bbox_bottom":271, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"47247ed9-3260-4acb-b4c1-288195f3c451","name":"47247ed9-3260-4acb-b4c1-288195f3c451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15710c01-0df5-4aec-b31b-d7d0ac595350","name":"15710c01-0df5-4aec-b31b-d7d0ac595350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"47247ed9-3260-4acb-b4c1-288195f3c451","name":"47247ed9-3260-4acb-b4c1-288195f3c451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15710c01-0df5-4aec-b31b-d7d0ac595350","name":"15710c01-0df5-4aec-b31b-d7d0ac595350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd91b4b6-5224-4a2b-8cb6-037c6f3868b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47247ed9-3260-4acb-b4c1-288195f3c451","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87309639-7313-4526-a3f9-b2946a96e39f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15710c01-0df5-4aec-b31b-d7d0ac595350","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"513f09b2-ebc0-4278-98c1-3e954efc6dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b5b123e-21a9-4aee-aae7-ea64260270e7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd91b4b6-5224-4a2b-8cb6-037c6f3868b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47247ed9-3260-4acb-b4c1-288195f3c451","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87309639-7313-4526-a3f9-b2946a96e39f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15710c01-0df5-4aec-b31b-d7d0ac595350","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"513f09b2-ebc0-4278-98c1-3e954efc6dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","path":"sprites/spr_da_standard/spr_da_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b5b123e-21a9-4aee-aae7-ea64260270e7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_term_honor/spr_da_term_honor.yy b/sprites/spr_da_term_honor/spr_da_term_honor.yy index e5fcc33aad..08b9e9a28c 100644 --- a/sprites/spr_da_term_honor/spr_da_term_honor.yy +++ b/sprites/spr_da_term_honor/spr_da_term_honor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_term_honor", "bboxMode":0, "bbox_bottom":259, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","path":"sprites/spr_da_term_honor/spr_da_term_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7e699cf-9a38-4551-a237-e45bd89b7588","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","path":"sprites/spr_da_term_honor/spr_da_term_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7e699cf-9a38-4551-a237-e45bd89b7588","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dante/spr_dante.yy b/sprites/spr_dante/spr_dante.yy index 3dce631a4f..b383a52e1d 100644 --- a/sprites/spr_dante/spr_dante.yy +++ b/sprites/spr_dante/spr_dante.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dante", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"754d992e-880a-48ed-a32f-479e3a508eb4","name":"754d992e-880a-48ed-a32f-479e3a508eb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"754d992e-880a-48ed-a32f-479e3a508eb4","name":"754d992e-880a-48ed-a32f-479e3a508eb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"18010e8a-678b-42a7-bfcf-f2e3d9ce1f5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"754d992e-880a-48ed-a32f-479e3a508eb4","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"735be12e-4a1f-4be0-8e8a-72d55dfb055a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"18010e8a-678b-42a7-bfcf-f2e3d9ce1f5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"754d992e-880a-48ed-a32f-479e3a508eb4","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"735be12e-4a1f-4be0-8e8a-72d55dfb055a","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_darkstar/spr_darkstar.yy b/sprites/spr_darkstar/spr_darkstar.yy index 87490de944..d368628be8 100644 --- a/sprites/spr_darkstar/spr_darkstar.yy +++ b/sprites/spr_darkstar/spr_darkstar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_darkstar", "bboxMode":0, "bbox_bottom":23, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","path":"sprites/spr_darkstar/spr_darkstar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8421169a-a485-4ec6-8eac-6922bce9d1c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","path":"sprites/spr_darkstar/spr_darkstar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8421169a-a485-4ec6-8eac-6922bce9d1c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_data_slate/spr_data_slate.yy b/sprites/spr_data_slate/spr_data_slate.yy index e256f5e5f7..88b0c699d7 100644 --- a/sprites/spr_data_slate/spr_data_slate.yy +++ b/sprites/spr_data_slate/spr_data_slate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_data_slate", "bboxMode":0, "bbox_bottom":859, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd12575d-6936-47ed-b150-8734d5c98140","name":"bd12575d-6936-47ed-b150-8734d5c98140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd12575d-6936-47ed-b150-8734d5c98140","name":"bd12575d-6936-47ed-b150-8734d5c98140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0535903-fd8e-4ce5-a8b1-44582bfc84b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12575d-6936-47ed-b150-8734d5c98140","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"777e253c-d627-4024-b69e-8a0be5b877cf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0535903-fd8e-4ce5-a8b1-44582bfc84b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12575d-6936-47ed-b150-8734d5c98140","path":"sprites/spr_data_slate/spr_data_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"777e253c-d627-4024-b69e-8a0be5b877cf","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_data_slate_back/spr_data_slate_back.yy b/sprites/spr_data_slate_back/spr_data_slate_back.yy index 6c66bb7c87..77b93c212a 100644 --- a/sprites/spr_data_slate_back/spr_data_slate_back.yy +++ b/sprites/spr_data_slate_back/spr_data_slate_back.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_data_slate_back", "bboxMode":0, "bbox_bottom":828, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","path":"sprites/spr_data_slate_back/spr_data_slate_back.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61ca2dde-8655-4e62-b665-c297b142ca5a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","path":"sprites/spr_data_slate_back/spr_data_slate_back.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61ca2dde-8655-4e62-b665-c297b142ca5a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_data_slate_border/spr_data_slate_border.yy b/sprites/spr_data_slate_border/spr_data_slate_border.yy index 4555e9ecfc..7c7257dbef 100644 --- a/sprites/spr_data_slate_border/spr_data_slate_border.yy +++ b/sprites/spr_data_slate_border/spr_data_slate_border.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_data_slate_border", "bboxMode":0, "bbox_bottom":377, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy b/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy index bfdb7ee8ac..8b5782b525 100644 --- a/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy +++ b/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_death_watch_pauldron", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","path":"sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c53b218d-2649-41ad-9510-ce18d3e5a066","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","path":"sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c53b218d-2649-41ad-9510-ce18d3e5a066","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_def_fortress/spr_def_fortress.yy b/sprites/spr_def_fortress/spr_def_fortress.yy index 48e7c7dcc6..b9b4f4e64c 100644 --- a/sprites/spr_def_fortress/spr_def_fortress.yy +++ b/sprites/spr_def_fortress/spr_def_fortress.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_fortress", "bboxMode":0, "bbox_bottom":197, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"23245670-12d5-4564-b1cd-3e211f4759ee","name":"23245670-12d5-4564-b1cd-3e211f4759ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23245670-12d5-4564-b1cd-3e211f4759ee","name":"23245670-12d5-4564-b1cd-3e211f4759ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23245670-12d5-4564-b1cd-3e211f4759ee","path":"sprites/spr_def_fortress/spr_def_fortress.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"539bfc66-9e13-47a9-bc6b-04eb863d414c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23245670-12d5-4564-b1cd-3e211f4759ee","path":"sprites/spr_def_fortress/spr_def_fortress.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"539bfc66-9e13-47a9-bc6b-04eb863d414c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_def_mine/spr_def_mine.yy b/sprites/spr_def_mine/spr_def_mine.yy index bad7b25aad..ba09c26879 100644 --- a/sprites/spr_def_mine/spr_def_mine.yy +++ b/sprites/spr_def_mine/spr_def_mine.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_mine", "bboxMode":0, "bbox_bottom":25, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","path":"sprites/spr_def_mine/spr_def_mine.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c159f5b5-8ad3-4668-b912-034b5e40ad50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","path":"sprites/spr_def_mine/spr_def_mine.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c159f5b5-8ad3-4668-b912-034b5e40ad50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_def_platform/spr_def_platform.yy b/sprites/spr_def_platform/spr_def_platform.yy index f8a78b268f..3c1c6dccbf 100644 --- a/sprites/spr_def_platform/spr_def_platform.yy +++ b/sprites/spr_def_platform/spr_def_platform.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_platform", "bboxMode":0, "bbox_bottom":91, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2dc1bad0-3e40-4590-9fd4-1d94ce34fdbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f275dea5-fa7f-42a5-9fec-73f2afc1fb5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2dc1bad0-3e40-4590-9fd4-1d94ce34fdbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f275dea5-fa7f-42a5-9fec-73f2afc1fb5f","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":{ diff --git a/sprites/spr_def_silo/spr_def_silo.yy b/sprites/spr_def_silo/spr_def_silo.yy index 2549042c60..bbafa79d6d 100644 --- a/sprites/spr_def_silo/spr_def_silo.yy +++ b/sprites/spr_def_silo/spr_def_silo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_silo", "bboxMode":0, "bbox_bottom":58, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de1096fe-c23d-43f0-9807-62742c84084b","name":"de1096fe-c23d-43f0-9807-62742c84084b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de1096fe-c23d-43f0-9807-62742c84084b","name":"de1096fe-c23d-43f0-9807-62742c84084b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4dfb3ef-0876-40fa-8404-b9ecc154bfea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de1096fe-c23d-43f0-9807-62742c84084b","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a32dcc3-df90-41f1-8031-e6461e6dcb78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4dfb3ef-0876-40fa-8404-b9ecc154bfea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de1096fe-c23d-43f0-9807-62742c84084b","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a32dcc3-df90-41f1-8031-e6461e6dcb78","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":{ diff --git a/sprites/spr_def_station/spr_def_station.yy b/sprites/spr_def_station/spr_def_station.yy index 073afc8d2e..fef3136c86 100644 --- a/sprites/spr_def_station/spr_def_station.yy +++ b/sprites/spr_def_station/spr_def_station.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_station", "bboxMode":0, "bbox_bottom":256, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1880d60f-1274-4df4-9de7-dc3d9065b580","name":"1880d60f-1274-4df4-9de7-dc3d9065b580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1880d60f-1274-4df4-9de7-dc3d9065b580","name":"1880d60f-1274-4df4-9de7-dc3d9065b580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1880d60f-1274-4df4-9de7-dc3d9065b580","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c925c395-3a2a-43b0-829c-8aa0a3297397","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c708788-308a-43bb-bfc6-993ff62d3837","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1880d60f-1274-4df4-9de7-dc3d9065b580","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c925c395-3a2a-43b0-829c-8aa0a3297397","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c708788-308a-43bb-bfc6-993ff62d3837","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":{ diff --git a/sprites/spr_defeat/spr_defeat.yy b/sprites/spr_defeat/spr_defeat.yy index 97bea62156..6f09eb5ff5 100644 --- a/sprites/spr_defeat/spr_defeat.yy +++ b/sprites/spr_defeat/spr_defeat.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_defeat", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy index 55db1cae2c..6f47f68594 100644 --- a/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy +++ b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dev_pack_complex", "bboxMode":0, "bbox_bottom":37, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36fcc4b6-c054-4c76-9a1c-67bc678fa11d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c77ca9f7-3220-4d01-a6cc-c19084c25a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36fcc4b6-c054-4c76-9a1c-67bc678fa11d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c77ca9f7-3220-4d01-a6cc-c19084c25a7c","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_dexterity_icon/spr_dexterity_icon.yy b/sprites/spr_dexterity_icon/spr_dexterity_icon.yy index 0fb4d36fd1..3ee45dacc8 100644 --- a/sprites/spr_dexterity_icon/spr_dexterity_icon.yy +++ b/sprites/spr_dexterity_icon/spr_dexterity_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dexterity_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","path":"sprites/spr_dexterity_icon/spr_dexterity_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da010a98-a2f9-458b-a116-8597036ab0da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","path":"sprites/spr_dexterity_icon/spr_dexterity_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da010a98-a2f9-458b-a116-8597036ab0da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_diplo_symbols/spr_diplo_symbols.yy b/sprites/spr_diplo_symbols/spr_diplo_symbols.yy index b0f2fc6326..784b881581 100644 --- a/sprites/spr_diplo_symbols/spr_diplo_symbols.yy +++ b/sprites/spr_diplo_symbols/spr_diplo_symbols.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplo_symbols", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fda16fa0-8879-4880-89c9-291a29fb0c52","name":"fda16fa0-8879-4880-89c9-291a29fb0c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fda16fa0-8879-4880-89c9-291a29fb0c52","name":"fda16fa0-8879-4880-89c9-291a29fb0c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fda16fa0-8879-4880-89c9-291a29fb0c52","path":"sprites/spr_diplo_symbols/spr_diplo_symbols.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72ff1aef-2dc9-47ed-9330-e4c9b0a19f25","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fda16fa0-8879-4880-89c9-291a29fb0c52","path":"sprites/spr_diplo_symbols/spr_diplo_symbols.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72ff1aef-2dc9-47ed-9330-e4c9b0a19f25","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_diplomacy/spr_diplomacy.yy b/sprites/spr_diplomacy/spr_diplomacy.yy index 139b3cd2d2..734d9b6b9a 100644 --- a/sprites/spr_diplomacy/spr_diplomacy.yy +++ b/sprites/spr_diplomacy/spr_diplomacy.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","path":"sprites/spr_diplomacy/spr_diplomacy.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4bef5314-fc44-4b55-a31e-ee6aa92644d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","path":"sprites/spr_diplomacy/spr_diplomacy.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bef5314-fc44-4b55-a31e-ee6aa92644d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy b/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy index 7f7e84d2f6..b312415227 100644 --- a/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy +++ b/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_dae", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy b/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy index 3c13c8f19f..1182b310ed 100644 --- a/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy +++ b/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_defeated", "bboxMode":0, "bbox_bottom":134, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"113de565-3347-4ba9-a429-944ab523401a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9c5ad43-458c-4b6e-b249-fe27b121fe77","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"113de565-3347-4ba9-a429-944ab523401a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9c5ad43-458c-4b6e-b249-fe27b121fe77","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":{ diff --git a/sprites/spr_diplomacy_med/spr_diplomacy_med.yy b/sprites/spr_diplomacy_med/spr_diplomacy_med.yy index fb684ed344..48178eb7ff 100644 --- a/sprites/spr_diplomacy_med/spr_diplomacy_med.yy +++ b/sprites/spr_diplomacy_med/spr_diplomacy_med.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_med", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_diplomacy_small/spr_diplomacy_small.yy b/sprites/spr_diplomacy_small/spr_diplomacy_small.yy index 8379c53be8..b40fe04f1c 100644 --- a/sprites/spr_diplomacy_small/spr_diplomacy_small.yy +++ b/sprites/spr_diplomacy_small/spr_diplomacy_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_small", "bboxMode":0, "bbox_bottom":91, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ff99cdcc-d64f-427c-a83b-275e40048c32","name":"ff99cdcc-d64f-427c-a83b-275e40048c32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b720ae6-a874-4f15-8f10-08bc8977565d","name":"9b720ae6-a874-4f15-8f10-08bc8977565d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8768affd-210f-4599-a66f-d92b2d96b1ed","name":"8768affd-210f-4599-a66f-d92b2d96b1ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1796e494-fbdb-4cba-a597-0c8321551ddb","name":"1796e494-fbdb-4cba-a597-0c8321551ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd45751d-0894-4683-80f5-d9de3c061267","name":"bd45751d-0894-4683-80f5-d9de3c061267","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"842debcc-6e09-4044-9702-e7854d66c082","name":"842debcc-6e09-4044-9702-e7854d66c082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a02b2199-d741-4f8d-94a3-8993f7243413","name":"a02b2199-d741-4f8d-94a3-8993f7243413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f60734f-d864-4d70-9671-9347730d4968","name":"4f60734f-d864-4d70-9671-9347730d4968","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41523fae-8d00-45f7-91c0-098ba44809ad","name":"41523fae-8d00-45f7-91c0-098ba44809ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"987e13a6-8503-4772-be19-fbd2e8c933e8","name":"987e13a6-8503-4772-be19-fbd2e8c933e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76b35d93-850c-46b2-a59c-7d0826fca4de","name":"76b35d93-850c-46b2-a59c-7d0826fca4de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26be20f7-13d1-40af-bf88-335cb829fbd7","name":"26be20f7-13d1-40af-bf88-335cb829fbd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff99cdcc-d64f-427c-a83b-275e40048c32","name":"ff99cdcc-d64f-427c-a83b-275e40048c32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b720ae6-a874-4f15-8f10-08bc8977565d","name":"9b720ae6-a874-4f15-8f10-08bc8977565d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8768affd-210f-4599-a66f-d92b2d96b1ed","name":"8768affd-210f-4599-a66f-d92b2d96b1ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1796e494-fbdb-4cba-a597-0c8321551ddb","name":"1796e494-fbdb-4cba-a597-0c8321551ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd45751d-0894-4683-80f5-d9de3c061267","name":"bd45751d-0894-4683-80f5-d9de3c061267","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"842debcc-6e09-4044-9702-e7854d66c082","name":"842debcc-6e09-4044-9702-e7854d66c082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a02b2199-d741-4f8d-94a3-8993f7243413","name":"a02b2199-d741-4f8d-94a3-8993f7243413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f60734f-d864-4d70-9671-9347730d4968","name":"4f60734f-d864-4d70-9671-9347730d4968","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41523fae-8d00-45f7-91c0-098ba44809ad","name":"41523fae-8d00-45f7-91c0-098ba44809ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"987e13a6-8503-4772-be19-fbd2e8c933e8","name":"987e13a6-8503-4772-be19-fbd2e8c933e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76b35d93-850c-46b2-a59c-7d0826fca4de","name":"76b35d93-850c-46b2-a59c-7d0826fca4de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26be20f7-13d1-40af-bf88-335cb829fbd7","name":"26be20f7-13d1-40af-bf88-335cb829fbd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f75b63e8-6408-4fd8-935a-8c241d9cfb86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7cc5333-a527-4a1e-a25c-57e43253aff8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"851c9c45-b2ad-4ef0-901b-715805824ec0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff99cdcc-d64f-427c-a83b-275e40048c32","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a086ae35-fed0-4713-9839-c9ce03938eda","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f31f467-f107-430c-a284-25206dfdb48a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30f57c31-14f4-4fd9-b084-1c10d1821403","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b720ae6-a874-4f15-8f10-08bc8977565d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad9451d1-a16d-40bf-8623-1ef350d24a82","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8768affd-210f-4599-a66f-d92b2d96b1ed","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba7ce834-e7b8-4877-9670-c10dc7a069cd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eaf67672-272f-4c9f-9802-6f9a8bb258a2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1796e494-fbdb-4cba-a597-0c8321551ddb","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a4d9aca-5bc7-4bf8-8e7d-761728455c6c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd45751d-0894-4683-80f5-d9de3c061267","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"762af360-72e5-4b4a-b319-5ef94e05b9d6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab1b985c-383c-45ed-a4e9-ff77b56bf092","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"842debcc-6e09-4044-9702-e7854d66c082","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ff5618f-d818-4bd1-a55e-2ab577d95325","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcd4bcf4-3cd9-4ad6-9deb-e13abd133c99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02b2199-d741-4f8d-94a3-8993f7243413","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54c0028c-5eb6-44ed-87ad-a7eaad4450fe","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bd5ab63-0977-4c73-a597-228dd904be45","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f60734f-d864-4d70-9671-9347730d4968","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b920a0ec-5d65-499d-ab2f-b1a3f239a393","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d77a80a-ae0f-43a7-a33f-673cd0c0185c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"094f851c-afcf-4a18-be9d-d0dea044cc1c","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce4bb606-a9f3-43e9-b8dc-61542e324508","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"515cfdb5-5fdb-4aa9-b8af-39aea30d2a6d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41523fae-8d00-45f7-91c0-098ba44809ad","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df5073fb-39ad-4afc-b52e-e63f17d720c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"987e13a6-8503-4772-be19-fbd2e8c933e8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c700c0d-b5c5-46fb-9b04-1372b4a696fd","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76b35d93-850c-46b2-a59c-7d0826fca4de","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec7285bb-1d51-4d01-b78b-41a351480650","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2283803-f7b3-40a4-bb08-84279bc535f0","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26be20f7-13d1-40af-bf88-335cb829fbd7","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37834455-fe8c-4f23-a23f-cdbbc6b747cd","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f75b63e8-6408-4fd8-935a-8c241d9cfb86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7cc5333-a527-4a1e-a25c-57e43253aff8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"851c9c45-b2ad-4ef0-901b-715805824ec0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff99cdcc-d64f-427c-a83b-275e40048c32","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a086ae35-fed0-4713-9839-c9ce03938eda","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f31f467-f107-430c-a284-25206dfdb48a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30f57c31-14f4-4fd9-b084-1c10d1821403","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b720ae6-a874-4f15-8f10-08bc8977565d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad9451d1-a16d-40bf-8623-1ef350d24a82","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8768affd-210f-4599-a66f-d92b2d96b1ed","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba7ce834-e7b8-4877-9670-c10dc7a069cd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eaf67672-272f-4c9f-9802-6f9a8bb258a2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1796e494-fbdb-4cba-a597-0c8321551ddb","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a4d9aca-5bc7-4bf8-8e7d-761728455c6c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd45751d-0894-4683-80f5-d9de3c061267","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"762af360-72e5-4b4a-b319-5ef94e05b9d6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab1b985c-383c-45ed-a4e9-ff77b56bf092","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"842debcc-6e09-4044-9702-e7854d66c082","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ff5618f-d818-4bd1-a55e-2ab577d95325","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcd4bcf4-3cd9-4ad6-9deb-e13abd133c99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02b2199-d741-4f8d-94a3-8993f7243413","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54c0028c-5eb6-44ed-87ad-a7eaad4450fe","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bd5ab63-0977-4c73-a597-228dd904be45","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f60734f-d864-4d70-9671-9347730d4968","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b920a0ec-5d65-499d-ab2f-b1a3f239a393","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d77a80a-ae0f-43a7-a33f-673cd0c0185c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"094f851c-afcf-4a18-be9d-d0dea044cc1c","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce4bb606-a9f3-43e9-b8dc-61542e324508","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"515cfdb5-5fdb-4aa9-b8af-39aea30d2a6d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41523fae-8d00-45f7-91c0-098ba44809ad","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df5073fb-39ad-4afc-b52e-e63f17d720c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"987e13a6-8503-4772-be19-fbd2e8c933e8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c700c0d-b5c5-46fb-9b04-1372b4a696fd","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76b35d93-850c-46b2-a59c-7d0826fca4de","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec7285bb-1d51-4d01-b78b-41a351480650","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2283803-f7b3-40a4-bb08-84279bc535f0","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26be20f7-13d1-40af-bf88-335cb829fbd7","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37834455-fe8c-4f23-a23f-cdbbc6b747cd","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_disposition/spr_disposition.yy b/sprites/spr_disposition/spr_disposition.yy index 4fa1e7d56a..3e46eedd86 100644 --- a/sprites/spr_disposition/spr_disposition.yy +++ b/sprites/spr_disposition/spr_disposition.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_disposition", "bboxMode":0, "bbox_bottom":8, @@ -12,28 +12,28 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98e30133-46fe-47e3-b840-29fad38e4046","name":"98e30133-46fe-47e3-b840-29fad38e4046","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23692a93-9284-430d-baf2-97ce30befd3c","name":"23692a93-9284-430d-baf2-97ce30befd3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6457a2b0-b232-42f6-b269-41b793c88c29","name":"6457a2b0-b232-42f6-b269-41b793c88c29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c456454b-266f-4845-92b3-fe78a77b5f11","name":"c456454b-266f-4845-92b3-fe78a77b5f11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6cec14b6-7d08-417c-9754-89bd1feef423","name":"6cec14b6-7d08-417c-9754-89bd1feef423","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2032628d-1554-485a-9851-79380ea8c0af","name":"2032628d-1554-485a-9851-79380ea8c0af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2bba48ba-b958-4d17-881b-f4119f16ff48","name":"2bba48ba-b958-4d17-881b-f4119f16ff48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57ddaffd-0411-40df-8a37-ce60e94719ce","name":"57ddaffd-0411-40df-8a37-ce60e94719ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ad1394d-0162-448a-a3de-4d57b18384f6","name":"3ad1394d-0162-448a-a3de-4d57b18384f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0bf7710b-469f-4222-8082-d46c95bcc888","name":"0bf7710b-469f-4222-8082-d46c95bcc888","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98e30133-46fe-47e3-b840-29fad38e4046","name":"98e30133-46fe-47e3-b840-29fad38e4046","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23692a93-9284-430d-baf2-97ce30befd3c","name":"23692a93-9284-430d-baf2-97ce30befd3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6457a2b0-b232-42f6-b269-41b793c88c29","name":"6457a2b0-b232-42f6-b269-41b793c88c29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c456454b-266f-4845-92b3-fe78a77b5f11","name":"c456454b-266f-4845-92b3-fe78a77b5f11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cec14b6-7d08-417c-9754-89bd1feef423","name":"6cec14b6-7d08-417c-9754-89bd1feef423","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2032628d-1554-485a-9851-79380ea8c0af","name":"2032628d-1554-485a-9851-79380ea8c0af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2bba48ba-b958-4d17-881b-f4119f16ff48","name":"2bba48ba-b958-4d17-881b-f4119f16ff48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57ddaffd-0411-40df-8a37-ce60e94719ce","name":"57ddaffd-0411-40df-8a37-ce60e94719ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ad1394d-0162-448a-a3de-4d57b18384f6","name":"3ad1394d-0162-448a-a3de-4d57b18384f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0bf7710b-469f-4222-8082-d46c95bcc888","name":"0bf7710b-469f-4222-8082-d46c95bcc888","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -89,72 +89,28 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e30133-46fe-47e3-b840-29fad38e4046","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"77fd7703-68b9-4b17-b87c-9a217e1f2d98","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"008ad391-f7d8-4511-8376-7de988cd4316","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b92a002-0fb0-4dce-9519-02f34929fa34","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23692a93-9284-430d-baf2-97ce30befd3c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9215cf60-abf3-42f5-86a6-669aecc3e5f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6457a2b0-b232-42f6-b269-41b793c88c29","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a1902d-ddaa-4465-b49d-564439690bbe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c85bf11-f619-47c7-ab3a-dbd3fa760bb0","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"119dc5f6-6819-4377-950e-e5663e9e9faf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b38a6d72-8cdc-4847-942a-6be7f90c4e45","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c456454b-266f-4845-92b3-fe78a77b5f11","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"52ff60ab-3cae-494a-9534-fdd3ed0c4c5e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07258c63-32b7-4f34-ae51-71bbc786a856","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c443e957-0cb5-4580-822f-ff6c8e32d32c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cec14b6-7d08-417c-9754-89bd1feef423","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f5058280-aa43-4444-803b-a7621d50ec00","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3221a8f6-7bba-4b56-aefc-826443490000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2032628d-1554-485a-9851-79380ea8c0af","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dba8ee29-3953-4f6a-85d7-e54c29a680ad","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bba48ba-b958-4d17-881b-f4119f16ff48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cbc6114f-fbdb-4422-b7c5-867f2c3906a1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ddaffd-0411-40df-8a37-ce60e94719ce","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd607404-6ab6-4e77-8746-644f2ec07f47","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a8f7fb3a-4f32-441d-9963-e1f6ac0deb18","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83bdd252-06da-4f80-b7c5-d87247746b99","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a658f724-5748-44e3-b708-ccfffd354e31","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90fc49f7-308d-49b1-8326-6f61b5b679b5","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad1394d-0162-448a-a3de-4d57b18384f6","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49487973-214c-4270-ab8e-f02320ce50c1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf7710b-469f-4222-8082-d46c95bcc888","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25be9ac4-d1a8-469c-8efa-71bf890408a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e30133-46fe-47e3-b840-29fad38e4046","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"77fd7703-68b9-4b17-b87c-9a217e1f2d98","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"008ad391-f7d8-4511-8376-7de988cd4316","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b92a002-0fb0-4dce-9519-02f34929fa34","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23692a93-9284-430d-baf2-97ce30befd3c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9215cf60-abf3-42f5-86a6-669aecc3e5f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6457a2b0-b232-42f6-b269-41b793c88c29","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a1902d-ddaa-4465-b49d-564439690bbe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c85bf11-f619-47c7-ab3a-dbd3fa760bb0","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"119dc5f6-6819-4377-950e-e5663e9e9faf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b38a6d72-8cdc-4847-942a-6be7f90c4e45","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c456454b-266f-4845-92b3-fe78a77b5f11","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"52ff60ab-3cae-494a-9534-fdd3ed0c4c5e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07258c63-32b7-4f34-ae51-71bbc786a856","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c443e957-0cb5-4580-822f-ff6c8e32d32c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cec14b6-7d08-417c-9754-89bd1feef423","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f5058280-aa43-4444-803b-a7621d50ec00","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3221a8f6-7bba-4b56-aefc-826443490000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2032628d-1554-485a-9851-79380ea8c0af","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dba8ee29-3953-4f6a-85d7-e54c29a680ad","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bba48ba-b958-4d17-881b-f4119f16ff48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cbc6114f-fbdb-4422-b7c5-867f2c3906a1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ddaffd-0411-40df-8a37-ce60e94719ce","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd607404-6ab6-4e77-8746-644f2ec07f47","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a8f7fb3a-4f32-441d-9963-e1f6ac0deb18","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83bdd252-06da-4f80-b7c5-d87247746b99","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a658f724-5748-44e3-b708-ccfffd354e31","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90fc49f7-308d-49b1-8326-6f61b5b679b5","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad1394d-0162-448a-a3de-4d57b18384f6","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49487973-214c-4270-ab8e-f02320ce50c1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf7710b-469f-4222-8082-d46c95bcc888","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25be9ac4-d1a8-469c-8efa-71bf890408a4","IsCreationKey":false,"Key":21.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":{ diff --git a/sprites/spr_disposition_small/spr_disposition_small.yy b/sprites/spr_disposition_small/spr_disposition_small.yy index a503dd38b4..ece05031eb 100644 --- a/sprites/spr_disposition_small/spr_disposition_small.yy +++ b/sprites/spr_disposition_small/spr_disposition_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_disposition_small", "bboxMode":0, "bbox_bottom":8, @@ -12,26 +12,26 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6afb8843-a801-4150-bc19-748f64616e10","name":"6afb8843-a801-4150-bc19-748f64616e10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e008a202-76e4-4962-a956-7a8b9821ad70","name":"e008a202-76e4-4962-a956-7a8b9821ad70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"088f95db-0409-472a-97f2-bc8310ee706f","name":"088f95db-0409-472a-97f2-bc8310ee706f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"202f3a87-4a57-4f10-a8cb-da641e276729","name":"202f3a87-4a57-4f10-a8cb-da641e276729","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d713f514-9693-4f7f-b0c0-f6019b536321","name":"d713f514-9693-4f7f-b0c0-f6019b536321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6afb8843-a801-4150-bc19-748f64616e10","name":"6afb8843-a801-4150-bc19-748f64616e10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e008a202-76e4-4962-a956-7a8b9821ad70","name":"e008a202-76e4-4962-a956-7a8b9821ad70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"088f95db-0409-472a-97f2-bc8310ee706f","name":"088f95db-0409-472a-97f2-bc8310ee706f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"202f3a87-4a57-4f10-a8cb-da641e276729","name":"202f3a87-4a57-4f10-a8cb-da641e276729","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d713f514-9693-4f7f-b0c0-f6019b536321","name":"d713f514-9693-4f7f-b0c0-f6019b536321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -87,66 +87,26 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8e307151-41a5-41b6-b862-4438a5c7e325","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df11f753-ac31-414a-be21-2408615ab6ef","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26d46a87-74b7-47e4-be7a-f40c00f59ded","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"034fe571-6a88-44e9-86e2-2f1fbabd8bae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d2099ab-553c-41bf-85f9-d53de7c07705","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98b1c16e-3a59-41f0-bff7-9dce3191cf08","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c761ef3d-888c-4e34-b1a7-ca0e49826e0d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf5050c4-b78b-4cc5-895c-11b56e379d37","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0871f803-6f6a-4da9-b743-2bc6371e9901","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb8843-a801-4150-bc19-748f64616e10","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3515c2e0-ed2e-4b09-9f8b-5ad40ee7b27e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e008a202-76e4-4962-a956-7a8b9821ad70","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c2701ed-b5ac-430c-8e0d-237d677ad22e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2679063-8d43-4cdb-aa80-e81608c9e268","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44ecbdf1-4beb-4b25-b137-5488f3afde8c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6627939-2067-44e2-a27e-b929a9c7df9f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef18068d-97ab-4f38-a98a-26e303a5fa09","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"088f95db-0409-472a-97f2-bc8310ee706f","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82aee3c2-3e31-4660-8fbb-bbe314340aa9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"202f3a87-4a57-4f10-a8cb-da641e276729","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3444a467-5735-4b89-b4f9-86a3bbbf2ce4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e77b6427-c350-4160-b06a-346aaf89d2fb","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f713e9d-6c7e-423d-be83-7e2036f7a12f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d713f514-9693-4f7f-b0c0-f6019b536321","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8e98a57-b0f0-4f37-ba00-4a66bb6db318","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8e307151-41a5-41b6-b862-4438a5c7e325","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df11f753-ac31-414a-be21-2408615ab6ef","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26d46a87-74b7-47e4-be7a-f40c00f59ded","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"034fe571-6a88-44e9-86e2-2f1fbabd8bae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d2099ab-553c-41bf-85f9-d53de7c07705","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98b1c16e-3a59-41f0-bff7-9dce3191cf08","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c761ef3d-888c-4e34-b1a7-ca0e49826e0d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf5050c4-b78b-4cc5-895c-11b56e379d37","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0871f803-6f6a-4da9-b743-2bc6371e9901","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb8843-a801-4150-bc19-748f64616e10","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3515c2e0-ed2e-4b09-9f8b-5ad40ee7b27e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e008a202-76e4-4962-a956-7a8b9821ad70","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c2701ed-b5ac-430c-8e0d-237d677ad22e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2679063-8d43-4cdb-aa80-e81608c9e268","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44ecbdf1-4beb-4b25-b137-5488f3afde8c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6627939-2067-44e2-a27e-b929a9c7df9f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef18068d-97ab-4f38-a98a-26e303a5fa09","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"088f95db-0409-472a-97f2-bc8310ee706f","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82aee3c2-3e31-4660-8fbb-bbe314340aa9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"202f3a87-4a57-4f10-a8cb-da641e276729","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3444a467-5735-4b89-b4f9-86a3bbbf2ce4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e77b6427-c350-4160-b06a-346aaf89d2fb","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f713e9d-6c7e-423d-be83-7e2036f7a12f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d713f514-9693-4f7f-b0c0-f6019b536321","path":"sprites/spr_disposition_small/spr_disposition_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8e98a57-b0f0-4f37-ba00-4a66bb6db318","IsCreationKey":false,"Key":19.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":{ 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 76a03f50df..075658e397 100644 --- a/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy +++ b/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_assault_cannon", "bboxMode":0, "bbox_bottom":147, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c84e228f-f302-4ca0-ac09-90b28770fca7","name":"c84e228f-f302-4ca0-ac09-90b28770fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd7d5c23-a6af-4857-8741-b07293907895","name":"dd7d5c23-a6af-4857-8741-b07293907895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, "gridY":0, @@ -72,18 +72,10 @@ "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":"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,}, ],"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/spr_dread_autocannon.yy b/sprites/spr_dread_autocannon/spr_dread_autocannon.yy index 898adf19c6..42e419b959 100644 --- a/sprites/spr_dread_autocannon/spr_dread_autocannon.yy +++ b/sprites/spr_dread_autocannon/spr_dread_autocannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_autocannon", "bboxMode":0, "bbox_bottom":135, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"430ba383-8c34-4c5c-a443-2005ddb354ff","name":"430ba383-8c34-4c5c-a443-2005ddb354ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6692383a-0d7e-4194-998f-fc3bf2067f77","name":"6692383a-0d7e-4194-998f-fc3bf2067f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2567bd58-d13d-4cd9-9979-937b4d54e288","name":"2567bd58-d13d-4cd9-9979-937b4d54e288","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, "gridY":0, @@ -71,18 +71,10 @@ "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":"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,}, ],"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/spr_dread_claw.yy b/sprites/spr_dread_claw/spr_dread_claw.yy index 400750c5c9..a959601858 100644 --- a/sprites/spr_dread_claw/spr_dread_claw.yy +++ b/sprites/spr_dread_claw/spr_dread_claw.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_claw", "bboxMode":0, "bbox_bottom":149, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edc36065-c8cc-48b7-b999-6a9a9665befa","name":"edc36065-c8cc-48b7-b999-6a9a9665befa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$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,}, + {"$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,}, ],"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_colors/spr_dread_colors.yy b/sprites/spr_dread_colors/spr_dread_colors.yy index 1e4dfe3d22..69345b196f 100644 --- a/sprites/spr_dread_colors/spr_dread_colors.yy +++ b/sprites/spr_dread_colors/spr_dread_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_colors", "bboxMode":0, "bbox_bottom":188, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"708b2730-d6a6-47d6-bff4-80924a61a262","name":"708b2730-d6a6-47d6-bff4-80924a61a262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"708b2730-d6a6-47d6-bff4-80924a61a262","name":"708b2730-d6a6-47d6-bff4-80924a61a262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f942abc3-6b58-4c8f-a9d3-1d0117658510","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"708b2730-d6a6-47d6-bff4-80924a61a262","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"633b449f-a51c-493a-80e5-354707b65443","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70848c74-dde7-4d5e-bc82-e5af29cb121d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf3cc946-ed66-4919-816d-eee08c339e11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d29c0bec-ce6b-4407-bdce-02cf253ac864","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e763d81-9898-48c2-aca9-36d0533365e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f942abc3-6b58-4c8f-a9d3-1d0117658510","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"708b2730-d6a6-47d6-bff4-80924a61a262","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"633b449f-a51c-493a-80e5-354707b65443","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70848c74-dde7-4d5e-bc82-e5af29cb121d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf3cc946-ed66-4919-816d-eee08c339e11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d29c0bec-ce6b-4407-bdce-02cf253ac864","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e763d81-9898-48c2-aca9-36d0533365e4","IsCreationKey":false,"Key":5.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/spr_dread_heavy_bolter.yy b/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy index a22073c890..3d28dbcc67 100644 --- a/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy +++ b/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_heavy_bolter", "bboxMode":0, "bbox_bottom":161, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, "gridY":0, @@ -71,18 +71,10 @@ "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":"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,}, ],"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/spr_dread_iron_clad.yy b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy index 1ee90b23ef..193f8faabf 100644 --- a/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy +++ b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_iron_clad", "bboxMode":0, "bbox_bottom":126, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"659ee02b-897e-4104-b145-c359f7650d83","name":"659ee02b-897e-4104-b145-c359f7650d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5bd9088-45e5-4695-a241-41e7835f44fd","name":"f5bd9088-45e5-4695-a241-41e7835f44fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, "gridY":0, @@ -72,18 +72,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$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,}, + {"$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,}, ],"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/spr_dread_lascannon.yy b/sprites/spr_dread_lascannon/spr_dread_lascannon.yy index fc10174dc1..f070a4d9a2 100644 --- a/sprites/spr_dread_lascannon/spr_dread_lascannon.yy +++ b/sprites/spr_dread_lascannon/spr_dread_lascannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_lascannon", "bboxMode":0, "bbox_bottom":147, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7a4dd223-f227-41f5-b68a-f206094e2789","name":"7a4dd223-f227-41f5-b68a-f206094e2789","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48994d0c-01f0-441c-9383-c0eafe9cae39","name":"48994d0c-01f0-441c-9383-c0eafe9cae39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"243e4946-be2b-4339-b336-5253d6514685","name":"243e4946-be2b-4339-b336-5253d6514685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, "gridY":0, @@ -72,18 +72,10 @@ "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":"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,}, ],"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/spr_dread_missile.yy b/sprites/spr_dread_missile/spr_dread_missile.yy index 95f234ff3a..c3560a211f 100644 --- a/sprites/spr_dread_missile/spr_dread_missile.yy +++ b/sprites/spr_dread_missile/spr_dread_missile.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_missile", "bboxMode":0, "bbox_bottom":128, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"737d52a6-df9c-4e48-8622-c0b852027c2f","name":"737d52a6-df9c-4e48-8622-c0b852027c2f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"098fd89a-d321-4251-b0f3-70132fea3997","name":"098fd89a-d321-4251-b0f3-70132fea3997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, "gridY":0, @@ -72,18 +72,10 @@ "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":"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,}, ],"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/spr_dread_plasma_cannon.yy b/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy index d66ffdb671..f77187eb07 100644 --- a/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy +++ b/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_plasma_cannon", "bboxMode":0, "bbox_bottom":147, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6b155309-549e-4057-b0c0-b879145278ee","name":"6b155309-549e-4057-b0c0-b879145278ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76458a7c-df41-4efe-ac58-2273c4d3e898","name":"76458a7c-df41-4efe-ac58-2273c4d3e898","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$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, "gridY":0, @@ -72,18 +72,10 @@ "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":"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,}, ],"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_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy index b8bcd22279..b70a168864 100644 --- a/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy +++ b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dreadnought_chasis_colors", "bboxMode":0, "bbox_bottom":207, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy b/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy index db4048c15e..fed4ab70d6 100644 --- a/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy +++ b/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dreadnought_complex", "bboxMode":0, "bbox_bottom":207, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aabebdae-4337-4746-b7cf-292919a40ce4","name":"aabebdae-4337-4746-b7cf-292919a40ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aabebdae-4337-4746-b7cf-292919a40ce4","name":"aabebdae-4337-4746-b7cf-292919a40ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,15 +71,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aabebdae-4337-4746-b7cf-292919a40ce4","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65bae6f8-d3e2-4194-bb96-1b9a164e1363","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6dd38061-8f30-4017-9c12-2a438b531089","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af61cb93-84de-4fd7-8b9f-571f6d621427","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aabebdae-4337-4746-b7cf-292919a40ce4","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65bae6f8-d3e2-4194-bb96-1b9a164e1363","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6dd38061-8f30-4017-9c12-2a438b531089","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af61cb93-84de-4fd7-8b9f-571f6d621427","IsCreationKey":false,"Key":2.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_dreadnought_decorations/spr_dreadnought_decorations.yy b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy index cf7d17e80e..85357e3a03 100644 --- a/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy +++ b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dreadnought_decorations", "bboxMode":0, "bbox_bottom":98, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4ca3de8-8303-4af4-9873-ba8290935271","name":"b4ca3de8-8303-4af4-9873-ba8290935271","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4ca3de8-8303-4af4-9873-ba8290935271","name":"b4ca3de8-8303-4af4-9873-ba8290935271","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aeff9adb-1df6-477e-997f-f351dba2f5af","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09c36d69-135f-471a-8232-a16c5f00f8c6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4ca3de8-8303-4af4-9873-ba8290935271","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a9b1205-3f6f-4058-a295-0fbc6bedd565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aeff9adb-1df6-477e-997f-f351dba2f5af","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09c36d69-135f-471a-8232-a16c5f00f8c6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4ca3de8-8303-4af4-9873-ba8290935271","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a9b1205-3f6f-4058-a295-0fbc6bedd565","IsCreationKey":false,"Key":2.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_eldar_hire/spr_eldar_hire.yy b/sprites/spr_eldar_hire/spr_eldar_hire.yy index 4b188788c5..9cd2d8e462 100644 --- a/sprites/spr_eldar_hire/spr_eldar_hire.yy +++ b/sprites/spr_eldar_hire/spr_eldar_hire.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_eldar_hire", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"726d2a74-104c-4f7b-9aa9-94384a3016da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c601feea-f73e-4b85-9b2e-6dff6fbdc36a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"726d2a74-104c-4f7b-9aa9-94384a3016da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c601feea-f73e-4b85-9b2e-6dff6fbdc36a","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_errant_colors/spr_errant_colors.yy b/sprites/spr_errant_colors/spr_errant_colors.yy index a3d10eb2ce..dbb1c44ec9 100644 --- a/sprites/spr_errant_colors/spr_errant_colors.yy +++ b/sprites/spr_errant_colors/spr_errant_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_errant_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9544e4ca-8deb-4023-9e28-01c84f22df16","name":"9544e4ca-8deb-4023-9e28-01c84f22df16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a10b8352-7ebd-4760-a267-f798c056d29b","name":"a10b8352-7ebd-4760-a267-f798c056d29b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb6be082-0971-43b9-adc2-1e913811792c","name":"fb6be082-0971-43b9-adc2-1e913811792c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46302f6a-d029-4696-be8d-80565fe68ad6","name":"46302f6a-d029-4696-be8d-80565fe68ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9544e4ca-8deb-4023-9e28-01c84f22df16","name":"9544e4ca-8deb-4023-9e28-01c84f22df16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a10b8352-7ebd-4760-a267-f798c056d29b","name":"a10b8352-7ebd-4760-a267-f798c056d29b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb6be082-0971-43b9-adc2-1e913811792c","name":"fb6be082-0971-43b9-adc2-1e913811792c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46302f6a-d029-4696-be8d-80565fe68ad6","name":"46302f6a-d029-4696-be8d-80565fe68ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9544e4ca-8deb-4023-9e28-01c84f22df16","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"386c1cd2-14c2-4486-b4b8-8bf0c2eef1e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a10b8352-7ebd-4760-a267-f798c056d29b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a708a2b1-f744-4e46-b7c0-527418a862aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b25944be-5eba-494a-b10a-2809827e3a27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6be082-0971-43b9-adc2-1e913811792c","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2967068b-c211-47ce-bc52-8fdaa30a3cd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be148d13-3b3f-4248-bd42-e6363882155f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4fe5d94c-5588-45d5-8ad1-110fb67d26ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0888e933-4c29-4190-b7fd-a30231124397","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"539c145b-3fd4-4b1e-8292-e3cff3c2f037","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46302f6a-d029-4696-be8d-80565fe68ad6","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b754efb-eeb3-4086-8b5d-22878e235bea","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67744f2d-aa0e-42d6-bef0-0259800b2442","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94da88c6-5ce0-4357-ba9a-8b10c81594b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afddc36c-cbe5-4855-9ad8-1d0b1b349b3a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed65ebcd-beaf-4643-b94d-1ad4638917d3","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45a581ba-1236-44d3-8e79-b8ad3c1b25bb","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9544e4ca-8deb-4023-9e28-01c84f22df16","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"386c1cd2-14c2-4486-b4b8-8bf0c2eef1e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a10b8352-7ebd-4760-a267-f798c056d29b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a708a2b1-f744-4e46-b7c0-527418a862aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b25944be-5eba-494a-b10a-2809827e3a27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6be082-0971-43b9-adc2-1e913811792c","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2967068b-c211-47ce-bc52-8fdaa30a3cd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be148d13-3b3f-4248-bd42-e6363882155f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4fe5d94c-5588-45d5-8ad1-110fb67d26ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0888e933-4c29-4190-b7fd-a30231124397","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"539c145b-3fd4-4b1e-8292-e3cff3c2f037","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46302f6a-d029-4696-be8d-80565fe68ad6","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b754efb-eeb3-4086-8b5d-22878e235bea","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67744f2d-aa0e-42d6-bef0-0259800b2442","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94da88c6-5ce0-4357-ba9a-8b10c81594b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afddc36c-cbe5-4855-9ad8-1d0b1b349b3a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed65ebcd-beaf-4643-b94d-1ad4638917d3","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45a581ba-1236-44d3-8e79-b8ad3c1b25bb","IsCreationKey":false,"Key":13.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_explosion/spr_explosion.yy b/sprites/spr_explosion/spr_explosion.yy index 99ed55df75..ab1f1e9b0e 100644 --- a/sprites/spr_explosion/spr_explosion.yy +++ b/sprites/spr_explosion/spr_explosion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion", "bboxMode":0, "bbox_bottom":63, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52116bac-6671-4450-a26f-440a7edd7c27","name":"52116bac-6671-4450-a26f-440a7edd7c27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d404122-5c02-46b9-b517-35a17f961896","name":"5d404122-5c02-46b9-b517-35a17f961896","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31e4d6de-a635-4c43-9e1e-e4607138a682","name":"31e4d6de-a635-4c43-9e1e-e4607138a682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e6aec035-57d4-4eb2-be16-cf484e396e35","name":"e6aec035-57d4-4eb2-be16-cf484e396e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52116bac-6671-4450-a26f-440a7edd7c27","name":"52116bac-6671-4450-a26f-440a7edd7c27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d404122-5c02-46b9-b517-35a17f961896","name":"5d404122-5c02-46b9-b517-35a17f961896","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31e4d6de-a635-4c43-9e1e-e4607138a682","name":"31e4d6de-a635-4c43-9e1e-e4607138a682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6aec035-57d4-4eb2-be16-cf484e396e35","name":"e6aec035-57d4-4eb2-be16-cf484e396e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -76,27 +76,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d343002-ffe7-4204-9371-9333e1ad1463","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52116bac-6671-4450-a26f-440a7edd7c27","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6e32fb8-aafa-4330-a230-eb6d6ebf6d18","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9c9185f-adc9-4b49-a5c7-cb6048c7c149","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d404122-5c02-46b9-b517-35a17f961896","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc47f108-00a0-401d-ad1a-4ca916d1d003","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31e4d6de-a635-4c43-9e1e-e4607138a682","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee749173-6e75-41f7-b09b-6a307e207eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6aec035-57d4-4eb2-be16-cf484e396e35","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45d0bfc3-134e-4498-bcf0-f52e7f60b493","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e3586009-fe9f-4ffd-ae6b-5306a1bbaa08","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d343002-ffe7-4204-9371-9333e1ad1463","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52116bac-6671-4450-a26f-440a7edd7c27","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6e32fb8-aafa-4330-a230-eb6d6ebf6d18","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9c9185f-adc9-4b49-a5c7-cb6048c7c149","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d404122-5c02-46b9-b517-35a17f961896","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc47f108-00a0-401d-ad1a-4ca916d1d003","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31e4d6de-a635-4c43-9e1e-e4607138a682","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee749173-6e75-41f7-b09b-6a307e207eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6aec035-57d4-4eb2-be16-cf484e396e35","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45d0bfc3-134e-4498-bcf0-f52e7f60b493","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e3586009-fe9f-4ffd-ae6b-5306a1bbaa08","IsCreationKey":false,"Key":6.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_explosion2/spr_explosion2.yy b/sprites/spr_explosion2/spr_explosion2.yy index d5e6485b93..8ab1632c74 100644 --- a/sprites/spr_explosion2/spr_explosion2.yy +++ b/sprites/spr_explosion2/spr_explosion2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion2", "bboxMode":0, "bbox_bottom":58, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"53813458-5892-4cba-add6-692b75a62bfd","name":"53813458-5892-4cba-add6-692b75a62bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a020d709-a27c-4940-94b7-3db43987f480","name":"a020d709-a27c-4940-94b7-3db43987f480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dae59a24-ed41-46c2-9f66-c11a2476034d","name":"dae59a24-ed41-46c2-9f66-c11a2476034d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f40d66fc-aca3-45de-819a-57f86935a083","name":"f40d66fc-aca3-45de-819a-57f86935a083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3823df8b-b54d-42bc-8208-8403c945b4d7","name":"3823df8b-b54d-42bc-8208-8403c945b4d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"53813458-5892-4cba-add6-692b75a62bfd","name":"53813458-5892-4cba-add6-692b75a62bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a020d709-a27c-4940-94b7-3db43987f480","name":"a020d709-a27c-4940-94b7-3db43987f480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dae59a24-ed41-46c2-9f66-c11a2476034d","name":"dae59a24-ed41-46c2-9f66-c11a2476034d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f40d66fc-aca3-45de-819a-57f86935a083","name":"f40d66fc-aca3-45de-819a-57f86935a083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3823df8b-b54d-42bc-8208-8403c945b4d7","name":"3823df8b-b54d-42bc-8208-8403c945b4d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,48 +83,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c810941-adf2-44d7-b828-12e25ba61f1f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff1bf792-86f8-46d9-971f-6ac7a81a4667","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"53813458-5892-4cba-add6-692b75a62bfd","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"097c430e-5373-4508-9bc5-c70457884bfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89224419-71a8-41fb-9e1d-be020176082e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a020d709-a27c-4940-94b7-3db43987f480","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b760c522-b6ec-4a8d-b44f-3a586e9ec463","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10c2c640-a3ba-403b-911f-b91bd70d9f39","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2574f08-e44e-4e87-a54a-5ef93553c660","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f65995c-2bc8-47bb-a944-0ece5f4ca61a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dae59a24-ed41-46c2-9f66-c11a2476034d","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"20b715b7-bbe7-45bf-a13b-61f9b5ddd203","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88279162-524b-4420-950d-25d8c41ad2d5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2de496d-cd1a-49a4-a738-3c158e6957b2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40d66fc-aca3-45de-819a-57f86935a083","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21c8508e-3350-402a-8c86-6e16f0b2c05c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3823df8b-b54d-42bc-8208-8403c945b4d7","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80954673-ffc9-4083-b687-7dc6ce0848ed","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a8df266-eb69-44d0-a7dc-ac3177820f19","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c810941-adf2-44d7-b828-12e25ba61f1f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff1bf792-86f8-46d9-971f-6ac7a81a4667","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"53813458-5892-4cba-add6-692b75a62bfd","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"097c430e-5373-4508-9bc5-c70457884bfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89224419-71a8-41fb-9e1d-be020176082e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a020d709-a27c-4940-94b7-3db43987f480","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b760c522-b6ec-4a8d-b44f-3a586e9ec463","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10c2c640-a3ba-403b-911f-b91bd70d9f39","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2574f08-e44e-4e87-a54a-5ef93553c660","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f65995c-2bc8-47bb-a944-0ece5f4ca61a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dae59a24-ed41-46c2-9f66-c11a2476034d","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"20b715b7-bbe7-45bf-a13b-61f9b5ddd203","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88279162-524b-4420-950d-25d8c41ad2d5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2de496d-cd1a-49a4-a738-3c158e6957b2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40d66fc-aca3-45de-819a-57f86935a083","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21c8508e-3350-402a-8c86-6e16f0b2c05c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3823df8b-b54d-42bc-8208-8403c945b4d7","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80954673-ffc9-4083-b687-7dc6ce0848ed","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a8df266-eb69-44d0-a7dc-ac3177820f19","IsCreationKey":false,"Key":13.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_explosion3/spr_explosion3.yy b/sprites/spr_explosion3/spr_explosion3.yy index df95777625..66f94debbb 100644 --- a/sprites/spr_explosion3/spr_explosion3.yy +++ b/sprites/spr_explosion3/spr_explosion3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion3", "bboxMode":0, "bbox_bottom":61, @@ -12,30 +12,30 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28f82647-071a-4f36-ae13-d60316fe3e33","name":"28f82647-071a-4f36-ae13-d60316fe3e33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"69434878-27a3-43c9-a142-030800af28a0","name":"69434878-27a3-43c9-a142-030800af28a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68ffd8e7-768a-4a82-9232-b73b91a84636","name":"68ffd8e7-768a-4a82-9232-b73b91a84636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d48b1389-5756-4855-ab12-c1241aa6f60f","name":"d48b1389-5756-4855-ab12-c1241aa6f60f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c54c27c-5496-4211-9a7b-73d135706816","name":"8c54c27c-5496-4211-9a7b-73d135706816","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01e32b7e-586e-4248-8217-3e73ed7473e4","name":"01e32b7e-586e-4248-8217-3e73ed7473e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6607dda3-f79a-402a-9e7d-f703a294a940","name":"6607dda3-f79a-402a-9e7d-f703a294a940","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b870110-a292-4c4f-a99c-defb8c5854a9","name":"7b870110-a292-4c4f-a99c-defb8c5854a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4927e668-61af-4c28-9c28-857835e7f1c2","name":"4927e668-61af-4c28-9c28-857835e7f1c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28f82647-071a-4f36-ae13-d60316fe3e33","name":"28f82647-071a-4f36-ae13-d60316fe3e33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69434878-27a3-43c9-a142-030800af28a0","name":"69434878-27a3-43c9-a142-030800af28a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68ffd8e7-768a-4a82-9232-b73b91a84636","name":"68ffd8e7-768a-4a82-9232-b73b91a84636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d48b1389-5756-4855-ab12-c1241aa6f60f","name":"d48b1389-5756-4855-ab12-c1241aa6f60f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c54c27c-5496-4211-9a7b-73d135706816","name":"8c54c27c-5496-4211-9a7b-73d135706816","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01e32b7e-586e-4248-8217-3e73ed7473e4","name":"01e32b7e-586e-4248-8217-3e73ed7473e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6607dda3-f79a-402a-9e7d-f703a294a940","name":"6607dda3-f79a-402a-9e7d-f703a294a940","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b870110-a292-4c4f-a99c-defb8c5854a9","name":"7b870110-a292-4c4f-a99c-defb8c5854a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4927e668-61af-4c28-9c28-857835e7f1c2","name":"4927e668-61af-4c28-9c28-857835e7f1c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,78 +93,30 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f03ffb87-14fc-4f87-85cf-a6d051f7812d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28f82647-071a-4f36-ae13-d60316fe3e33","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24d5fce8-7a8a-4e11-bc6d-d3eaa0b68410","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69434878-27a3-43c9-a142-030800af28a0","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8082a40f-310e-4d18-bfc7-d8dea00b48d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9445442-5b49-46c9-b812-4c1b446e05b2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b3f59c0-8a0d-4f2e-ab81-c18dd6d7e186","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68ffd8e7-768a-4a82-9232-b73b91a84636","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"56c993d9-9b07-4059-ade7-062c11c5c9cb","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48b1389-5756-4855-ab12-c1241aa6f60f","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c08d36ad-d315-4755-9a00-73e0c73cd90b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b93ae72c-c88e-477e-9902-cf0806092381","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0309e7a-14a7-48d1-8611-cc44719abc08","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05c8cdac-c9c0-4c04-bb34-3890bde38674","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c54c27c-5496-4211-9a7b-73d135706816","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"649915e4-7305-4034-a7de-6ca77c662585","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf8de3a4-34ed-4d16-b9b7-213eba118837","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e32b7e-586e-4248-8217-3e73ed7473e4","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb4de27d-a01b-451a-9011-1e5e9187525d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b42c446-cab6-4af5-8876-1cef1e78351a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dec73924-4b9e-41b7-81f3-cc442bc95a3b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f41c7b93-28e5-40a2-91cc-cc113447d5bd","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d81c94c-397c-46a4-a1b3-f3c989a15d0f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f396343f-a798-4da4-8330-11b7631b54b8","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607dda3-f79a-402a-9e7d-f703a294a940","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"add2276b-8895-48a1-9bb7-4b4863899549","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a65238b6-c1d4-4151-9d9f-3fcd36df9635","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0703b80-f85b-4ce5-a71b-497f5d433421","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b870110-a292-4c4f-a99c-defb8c5854a9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02ccfd46-b64f-48d9-8bc7-e9776e097890","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c509de9-78bf-4741-98c4-3edd92af9d06","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4927e668-61af-4c28-9c28-857835e7f1c2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b45e1ad1-5605-4f37-9ba1-0739e0a8a14c","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f03ffb87-14fc-4f87-85cf-a6d051f7812d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28f82647-071a-4f36-ae13-d60316fe3e33","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24d5fce8-7a8a-4e11-bc6d-d3eaa0b68410","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69434878-27a3-43c9-a142-030800af28a0","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8082a40f-310e-4d18-bfc7-d8dea00b48d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9445442-5b49-46c9-b812-4c1b446e05b2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b3f59c0-8a0d-4f2e-ab81-c18dd6d7e186","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68ffd8e7-768a-4a82-9232-b73b91a84636","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"56c993d9-9b07-4059-ade7-062c11c5c9cb","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48b1389-5756-4855-ab12-c1241aa6f60f","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c08d36ad-d315-4755-9a00-73e0c73cd90b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b93ae72c-c88e-477e-9902-cf0806092381","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0309e7a-14a7-48d1-8611-cc44719abc08","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05c8cdac-c9c0-4c04-bb34-3890bde38674","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c54c27c-5496-4211-9a7b-73d135706816","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"649915e4-7305-4034-a7de-6ca77c662585","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf8de3a4-34ed-4d16-b9b7-213eba118837","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e32b7e-586e-4248-8217-3e73ed7473e4","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb4de27d-a01b-451a-9011-1e5e9187525d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b42c446-cab6-4af5-8876-1cef1e78351a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dec73924-4b9e-41b7-81f3-cc442bc95a3b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f41c7b93-28e5-40a2-91cc-cc113447d5bd","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d81c94c-397c-46a4-a1b3-f3c989a15d0f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f396343f-a798-4da4-8330-11b7631b54b8","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607dda3-f79a-402a-9e7d-f703a294a940","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"add2276b-8895-48a1-9bb7-4b4863899549","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a65238b6-c1d4-4151-9d9f-3fcd36df9635","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0703b80-f85b-4ce5-a71b-497f5d433421","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b870110-a292-4c4f-a99c-defb8c5854a9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02ccfd46-b64f-48d9-8bc7-e9776e097890","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c509de9-78bf-4741-98c4-3edd92af9d06","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4927e668-61af-4c28-9c28-857835e7f1c2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b45e1ad1-5605-4f37-9ba1-0739e0a8a14c","IsCreationKey":false,"Key":23.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_explosion_plas/spr_explosion_plas.yy b/sprites/spr_explosion_plas/spr_explosion_plas.yy index c36009316f..d9a43d70c1 100644 --- a/sprites/spr_explosion_plas/spr_explosion_plas.yy +++ b/sprites/spr_explosion_plas/spr_explosion_plas.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion_plas", "bboxMode":0, "bbox_bottom":63, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3edf782d-d066-403d-b693-9dd1ebd579d9","name":"3edf782d-d066-403d-b693-9dd1ebd579d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f249bfd-e297-460c-9f3e-42e085e4218e","name":"9f249bfd-e297-460c-9f3e-42e085e4218e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3edf782d-d066-403d-b693-9dd1ebd579d9","name":"3edf782d-d066-403d-b693-9dd1ebd579d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f249bfd-e297-460c-9f3e-42e085e4218e","name":"9f249bfd-e297-460c-9f3e-42e085e4218e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -76,27 +76,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff02a50d-6084-408c-9078-187ce0b830fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba260f64-12d5-4a3a-92d5-4c9b126f6084","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c56f37df-cce4-4716-9c34-4a8b4e1ae6a3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e5800a07-8496-49bd-8ff8-1a69e21ecf11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3edf782d-d066-403d-b693-9dd1ebd579d9","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5afa515-8687-43a8-8f04-39e9b27fb0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b6f5ae4-9b9d-4012-9d6a-387ab7e0bd01","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f249bfd-e297-460c-9f3e-42e085e4218e","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a319f899-f3d0-4b64-9869-6965563b4843","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff02a50d-6084-408c-9078-187ce0b830fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba260f64-12d5-4a3a-92d5-4c9b126f6084","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c56f37df-cce4-4716-9c34-4a8b4e1ae6a3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e5800a07-8496-49bd-8ff8-1a69e21ecf11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3edf782d-d066-403d-b693-9dd1ebd579d9","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5afa515-8687-43a8-8f04-39e9b27fb0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b6f5ae4-9b9d-4012-9d6a-387ab7e0bd01","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f249bfd-e297-460c-9f3e-42e085e4218e","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a319f899-f3d0-4b64-9869-6965563b4843","IsCreationKey":false,"Key":6.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_facial_colors/spr_facial_colors.yy b/sprites/spr_facial_colors/spr_facial_colors.yy index 6a55b9fa92..fe7f7fcdda 100644 --- a/sprites/spr_facial_colors/spr_facial_colors.yy +++ b/sprites/spr_facial_colors/spr_facial_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_facial_colors", "bboxMode":0, "bbox_bottom":70, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b2fd1690-ad2e-4dea-913f-7440f3207956","name":"b2fd1690-ad2e-4dea-913f-7440f3207956","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a0af901-a520-42bd-b1ac-947b53d45c39","name":"7a0af901-a520-42bd-b1ac-947b53d45c39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2fd1690-ad2e-4dea-913f-7440f3207956","name":"b2fd1690-ad2e-4dea-913f-7440f3207956","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a0af901-a520-42bd-b1ac-947b53d45c39","name":"7a0af901-a520-42bd-b1ac-947b53d45c39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e46075c-708a-4a1d-b8d4-94a3ae893431","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2fd1690-ad2e-4dea-913f-7440f3207956","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84706981-bf4b-4af8-aeaa-d3eb9231d9a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"03ab84fc-5ffb-4f14-9645-5c41504d8243","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65faf790-8c1e-4d39-9557-951e2d4830ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d567fc9-e5a0-444d-91ee-e3c5f7137ced","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a0af901-a520-42bd-b1ac-947b53d45c39","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eec80b21-96a4-43c1-8943-e7cad91b86ae","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e46075c-708a-4a1d-b8d4-94a3ae893431","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2fd1690-ad2e-4dea-913f-7440f3207956","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84706981-bf4b-4af8-aeaa-d3eb9231d9a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03ab84fc-5ffb-4f14-9645-5c41504d8243","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65faf790-8c1e-4d39-9557-951e2d4830ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d567fc9-e5a0-444d-91ee-e3c5f7137ced","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a0af901-a520-42bd-b1ac-947b53d45c39","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eec80b21-96a4-43c1-8943-e7cad91b86ae","IsCreationKey":false,"Key":5.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_faction_icons/spr_faction_icons.yy b/sprites/spr_faction_icons/spr_faction_icons.yy index 5191466385..f0fd9ed434 100644 --- a/sprites/spr_faction_icons/spr_faction_icons.yy +++ b/sprites/spr_faction_icons/spr_faction_icons.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_faction_icons", "bboxMode":0, "bbox_bottom":57, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"458ae16e-c6e8-45b5-b056-9c021caa006d","name":"458ae16e-c6e8-45b5-b056-9c021caa006d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42355dbb-212b-40b0-bebd-21530e2fa783","name":"42355dbb-212b-40b0-bebd-21530e2fa783","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1e240158-bc5c-4162-85c8-a39ec678cea5","name":"1e240158-bc5c-4162-85c8-a39ec678cea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"458ae16e-c6e8-45b5-b056-9c021caa006d","name":"458ae16e-c6e8-45b5-b056-9c021caa006d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42355dbb-212b-40b0-bebd-21530e2fa783","name":"42355dbb-212b-40b0-bebd-21530e2fa783","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1e240158-bc5c-4162-85c8-a39ec678cea5","name":"1e240158-bc5c-4162-85c8-a39ec678cea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -85,54 +85,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d70ecb5d-690b-460c-8ca5-89d5cfba7807","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44cd17a1-e6c0-4ede-9f27-59cd285845e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2de99ab3-2c6e-4ff1-92a0-84baaab0a45f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b0c9adc-db88-4f02-8ca9-61a9f1bdbde7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3601bbbe-f76d-4c96-a08a-26c7d2ef5caa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"458ae16e-c6e8-45b5-b056-9c021caa006d","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b392962f-07ba-432b-abfa-1dec5bd977a7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4d8139e-197d-4160-a6b5-347132c816f9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a98c5de5-4d16-4f57-b456-ef1225e54944","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d43e6fe-7e95-486f-8263-a8289c543acd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69aeaeeb-f959-4064-a75b-c0bae2a8a8ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42355dbb-212b-40b0-bebd-21530e2fa783","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90297261-4eaa-4d25-a826-308e4e5e31f8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2b25933-4999-4026-826e-25784a625769","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ba1e06a-ef6e-46c3-ab25-b4a119bd66ce","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff58b031-e3a5-4d1c-913f-930259b4bada","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82df5ccb-69b1-4fe1-8a7b-a9df60a5bd39","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e240158-bc5c-4162-85c8-a39ec678cea5","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04a8b061-b249-427b-bf65-b350329c1cbb","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d70ecb5d-690b-460c-8ca5-89d5cfba7807","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44cd17a1-e6c0-4ede-9f27-59cd285845e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2de99ab3-2c6e-4ff1-92a0-84baaab0a45f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b0c9adc-db88-4f02-8ca9-61a9f1bdbde7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3601bbbe-f76d-4c96-a08a-26c7d2ef5caa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"458ae16e-c6e8-45b5-b056-9c021caa006d","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b392962f-07ba-432b-abfa-1dec5bd977a7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4d8139e-197d-4160-a6b5-347132c816f9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a98c5de5-4d16-4f57-b456-ef1225e54944","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d43e6fe-7e95-486f-8263-a8289c543acd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69aeaeeb-f959-4064-a75b-c0bae2a8a8ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42355dbb-212b-40b0-bebd-21530e2fa783","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90297261-4eaa-4d25-a826-308e4e5e31f8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2b25933-4999-4026-826e-25784a625769","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ba1e06a-ef6e-46c3-ab25-b4a119bd66ce","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff58b031-e3a5-4d1c-913f-930259b4bada","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82df5ccb-69b1-4fe1-8a7b-a9df60a5bd39","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e240158-bc5c-4162-85c8-a39ec678cea5","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04a8b061-b249-427b-bf65-b350329c1cbb","IsCreationKey":false,"Key":15.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_faith_icon/spr_faith_icon.yy b/sprites/spr_faith_icon/spr_faith_icon.yy index 987a7f439b..623283f47f 100644 --- a/sprites/spr_faith_icon/spr_faith_icon.yy +++ b/sprites/spr_faith_icon/spr_faith_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_faith_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","path":"sprites/spr_faith_icon/spr_faith_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f0876cf-f608-41c0-bf42-e8b8d393ae12","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","path":"sprites/spr_faith_icon/spr_faith_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f0876cf-f608-41c0-bf42-e8b8d393ae12","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_fast_forward/spr_fast_forward.yy b/sprites/spr_fast_forward/spr_fast_forward.yy index 56627276c6..4ac20167ff 100644 --- a/sprites/spr_fast_forward/spr_fast_forward.yy +++ b/sprites/spr_fast_forward/spr_fast_forward.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fast_forward", "bboxMode":0, "bbox_bottom":31, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","path":"sprites/spr_fast_forward/spr_fast_forward.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"463e807f-9e8d-43a8-90e0-01654427ed84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","path":"sprites/spr_fast_forward/spr_fast_forward.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"463e807f-9e8d-43a8-90e0-01654427ed84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fighta/spr_fighta.yy b/sprites/spr_fighta/spr_fighta.yy index 1ce514d420..7d03e55433 100644 --- a/sprites/spr_fighta/spr_fighta.yy +++ b/sprites/spr_fighta/spr_fighta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fighta", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","path":"sprites/spr_fighta/spr_fighta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fa7cfcf-9b37-4a7d-ae1b-3fbb0aa84cff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","path":"sprites/spr_fighta/spr_fighta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fa7cfcf-9b37-4a7d-ae1b-3fbb0aa84cff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_flame/spr_flame.yy b/sprites/spr_flame/spr_flame.yy index 751be7fa2b..741063e030 100644 --- a/sprites/spr_flame/spr_flame.yy +++ b/sprites/spr_flame/spr_flame.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flame", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14afd175-9af1-4620-b14e-66b195d01ab9","name":"14afd175-9af1-4620-b14e-66b195d01ab9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14afd175-9af1-4620-b14e-66b195d01ab9","name":"14afd175-9af1-4620-b14e-66b195d01ab9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c31b035-9dd2-4571-8e92-3abdb0dcecb2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14afd175-9af1-4620-b14e-66b195d01ab9","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b3432aa-c967-4f4c-9bee-ac65e5e10262","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f73ff78e-f298-404c-a03a-257e6e0e6c56","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f84d6149-6b95-4fe0-aeb4-b9b19b53dcd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"197060ec-b1f9-44ac-8f1b-3533517607be","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff1de936-a8ea-489a-af27-1b9f944b9195","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f535a69d-b886-4e19-94cd-6d09228e4d7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb641164-0c29-47cd-98e1-d3c1c812868d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c31b035-9dd2-4571-8e92-3abdb0dcecb2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14afd175-9af1-4620-b14e-66b195d01ab9","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b3432aa-c967-4f4c-9bee-ac65e5e10262","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f73ff78e-f298-404c-a03a-257e6e0e6c56","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f84d6149-6b95-4fe0-aeb4-b9b19b53dcd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"197060ec-b1f9-44ac-8f1b-3533517607be","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff1de936-a8ea-489a-af27-1b9f944b9195","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f535a69d-b886-4e19-94cd-6d09228e4d7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb641164-0c29-47cd-98e1-d3c1c812868d","IsCreationKey":false,"Key":7.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_flame2/spr_flame2.yy b/sprites/spr_flame2/spr_flame2.yy index 8ef57a4cb0..808d94a5b4 100644 --- a/sprites/spr_flame2/spr_flame2.yy +++ b/sprites/spr_flame2/spr_flame2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flame2", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af333edf-6007-47d6-95c3-007dfa1df6f1","name":"af333edf-6007-47d6-95c3-007dfa1df6f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ed78f26-9a75-4840-a210-528819aaa311","name":"3ed78f26-9a75-4840-a210-528819aaa311","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af333edf-6007-47d6-95c3-007dfa1df6f1","name":"af333edf-6007-47d6-95c3-007dfa1df6f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ed78f26-9a75-4840-a210-528819aaa311","name":"3ed78f26-9a75-4840-a210-528819aaa311","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3b33f81-54f2-43f9-b23c-fa822d0e83d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c3a04a7-ff72-40b9-8c55-cc9a1a4d22f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae67ab58-4666-4c9e-9f41-aa05391d5398","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af333edf-6007-47d6-95c3-007dfa1df6f1","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2e034a5-03dd-488f-b460-f6f96fd22eb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05a3ebe7-7bee-41cb-8d55-33eec1f714f3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ed78f26-9a75-4840-a210-528819aaa311","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6c09481-c282-4c9a-b834-35c505049808","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dbedd24f-98b9-4a11-99fe-69d2066f15fd","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96fa7221-c449-4ef0-8ce2-c7567bd3e44e","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3b33f81-54f2-43f9-b23c-fa822d0e83d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c3a04a7-ff72-40b9-8c55-cc9a1a4d22f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae67ab58-4666-4c9e-9f41-aa05391d5398","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af333edf-6007-47d6-95c3-007dfa1df6f1","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2e034a5-03dd-488f-b460-f6f96fd22eb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05a3ebe7-7bee-41cb-8d55-33eec1f714f3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ed78f26-9a75-4840-a210-528819aaa311","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6c09481-c282-4c9a-b834-35c505049808","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dbedd24f-98b9-4a11-99fe-69d2066f15fd","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96fa7221-c449-4ef0-8ce2-c7567bd3e44e","IsCreationKey":false,"Key":7.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_flamer_new/spr_flamer_new.yy b/sprites/spr_flamer_new/spr_flamer_new.yy index 09faf1047b..de677568b7 100644 --- a/sprites/spr_flamer_new/spr_flamer_new.yy +++ b/sprites/spr_flamer_new/spr_flamer_new.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flamer_new", "bboxMode":0, "bbox_bottom":113, @@ -12,27 +12,27 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"761eefee-a078-4b95-aeb7-cbe4004c0025","name":"761eefee-a078-4b95-aeb7-cbe4004c0025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"30d37538-6ee7-40b1-b686-40375b62edcf","name":"30d37538-6ee7-40b1-b686-40375b62edcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b203eec-68cd-4703-a483-5cdce413011e","name":"2b203eec-68cd-4703-a483-5cdce413011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7508a11-afe6-4d42-9021-77b8885dd408","name":"d7508a11-afe6-4d42-9021-77b8885dd408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70abc107-ab83-4789-86d8-51113339f174","name":"70abc107-ab83-4789-86d8-51113339f174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01751f85-11b9-4c41-9460-0374d62bd7ae","name":"01751f85-11b9-4c41-9460-0374d62bd7ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"761eefee-a078-4b95-aeb7-cbe4004c0025","name":"761eefee-a078-4b95-aeb7-cbe4004c0025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30d37538-6ee7-40b1-b686-40375b62edcf","name":"30d37538-6ee7-40b1-b686-40375b62edcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b203eec-68cd-4703-a483-5cdce413011e","name":"2b203eec-68cd-4703-a483-5cdce413011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7508a11-afe6-4d42-9021-77b8885dd408","name":"d7508a11-afe6-4d42-9021-77b8885dd408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70abc107-ab83-4789-86d8-51113339f174","name":"70abc107-ab83-4789-86d8-51113339f174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01751f85-11b9-4c41-9460-0374d62bd7ae","name":"01751f85-11b9-4c41-9460-0374d62bd7ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -90,69 +90,27 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ef1a9d3-3154-4e88-88c0-3a2673985ba8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d3a007a-6992-43c4-adab-80302d987450","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"761eefee-a078-4b95-aeb7-cbe4004c0025","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f517dfd-7dc8-4c61-8e83-1cd65b2751d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30d37538-6ee7-40b1-b686-40375b62edcf","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c8016ec-c767-40e1-bd9c-8561c21ae50e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f90cd282-b3dc-47aa-8643-8e6436075eca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"760db19f-5863-4118-b636-76df78b253b7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"010bc769-578c-46aa-bee2-0570802b712c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4833e8bc-594b-4306-b2d1-d89b8de18b10","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f14d596d-e04d-4edc-90b2-5c86dfe1e529","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc4bf285-6aea-4e6a-ad13-45e4808cfc66","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b203eec-68cd-4703-a483-5cdce413011e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"199fc9e1-df58-417a-9789-47db90f740d4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ccd1782-80ad-4c30-8c54-616e26de9228","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9c6c2b0-f920-40f3-8ab3-d7573d2dda8a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ff30df4-e685-47a7-9606-51ca71ce9cda","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7508a11-afe6-4d42-9021-77b8885dd408","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f44de32-3a46-4236-883f-3d122c424869","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70abc107-ab83-4789-86d8-51113339f174","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00f57f51-bf79-429c-8f73-fc072656da5e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aea8f53-12be-450b-a342-57473f71cd92","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b16ded8a-a9c5-4ae0-adbd-5bce33f26e43","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01751f85-11b9-4c41-9460-0374d62bd7ae","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b21669d-1950-4afd-9a97-93a07b2c3c7f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38e1cf94-596e-4c67-9834-606e358858c3","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e70953da-f7e6-4c0e-bd0c-a1821a4a4d21","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ef1a9d3-3154-4e88-88c0-3a2673985ba8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d3a007a-6992-43c4-adab-80302d987450","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"761eefee-a078-4b95-aeb7-cbe4004c0025","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f517dfd-7dc8-4c61-8e83-1cd65b2751d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30d37538-6ee7-40b1-b686-40375b62edcf","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c8016ec-c767-40e1-bd9c-8561c21ae50e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f90cd282-b3dc-47aa-8643-8e6436075eca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"760db19f-5863-4118-b636-76df78b253b7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"010bc769-578c-46aa-bee2-0570802b712c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4833e8bc-594b-4306-b2d1-d89b8de18b10","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f14d596d-e04d-4edc-90b2-5c86dfe1e529","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc4bf285-6aea-4e6a-ad13-45e4808cfc66","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b203eec-68cd-4703-a483-5cdce413011e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"199fc9e1-df58-417a-9789-47db90f740d4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ccd1782-80ad-4c30-8c54-616e26de9228","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9c6c2b0-f920-40f3-8ab3-d7573d2dda8a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ff30df4-e685-47a7-9606-51ca71ce9cda","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7508a11-afe6-4d42-9021-77b8885dd408","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f44de32-3a46-4236-883f-3d122c424869","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70abc107-ab83-4789-86d8-51113339f174","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00f57f51-bf79-429c-8f73-fc072656da5e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aea8f53-12be-450b-a342-57473f71cd92","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b16ded8a-a9c5-4ae0-adbd-5bce33f26e43","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01751f85-11b9-4c41-9460-0374d62bd7ae","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b21669d-1950-4afd-9a97-93a07b2c3c7f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38e1cf94-596e-4c67-9834-606e358858c3","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e70953da-f7e6-4c0e-bd0c-a1821a4a4d21","IsCreationKey":false,"Key":20.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_fleet_alert/spr_fleet_alert.yy b/sprites/spr_fleet_alert/spr_fleet_alert.yy index a63b853bb5..2becca5d33 100644 --- a/sprites/spr_fleet_alert/spr_fleet_alert.yy +++ b/sprites/spr_fleet_alert/spr_fleet_alert.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_alert", "bboxMode":0, "bbox_bottom":65, @@ -12,34 +12,34 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1b868bf-e07e-4504-9be4-050c777e2959","name":"d1b868bf-e07e-4504-9be4-050c777e2959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16841a42-f578-4d0f-bc53-345e26a4309d","name":"16841a42-f578-4d0f-bc53-345e26a4309d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bfdf43a6-c842-49fb-b161-ba27246384f4","name":"bfdf43a6-c842-49fb-b161-ba27246384f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d55e1739-d36d-4487-a702-b89fa087184e","name":"d55e1739-d36d-4487-a702-b89fa087184e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44b7382e-2196-405b-bee8-29c85e8f23ed","name":"44b7382e-2196-405b-bee8-29c85e8f23ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0abe3892-4dff-4baa-b14c-eb85368af891","name":"0abe3892-4dff-4baa-b14c-eb85368af891","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b193357-84c6-4399-a900-b24b88446930","name":"7b193357-84c6-4399-a900-b24b88446930","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae2db314-7ff4-460f-b597-1f330bfee00a","name":"ae2db314-7ff4-460f-b597-1f330bfee00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"380032a1-f564-49dd-bbf9-04391109226e","name":"380032a1-f564-49dd-bbf9-04391109226e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d869733-1346-401e-90c3-26ce45631ab2","name":"0d869733-1346-401e-90c3-26ce45631ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78291903-2783-4041-82d8-cc072217aca3","name":"78291903-2783-4041-82d8-cc072217aca3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1b868bf-e07e-4504-9be4-050c777e2959","name":"d1b868bf-e07e-4504-9be4-050c777e2959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16841a42-f578-4d0f-bc53-345e26a4309d","name":"16841a42-f578-4d0f-bc53-345e26a4309d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfdf43a6-c842-49fb-b161-ba27246384f4","name":"bfdf43a6-c842-49fb-b161-ba27246384f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d55e1739-d36d-4487-a702-b89fa087184e","name":"d55e1739-d36d-4487-a702-b89fa087184e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44b7382e-2196-405b-bee8-29c85e8f23ed","name":"44b7382e-2196-405b-bee8-29c85e8f23ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0abe3892-4dff-4baa-b14c-eb85368af891","name":"0abe3892-4dff-4baa-b14c-eb85368af891","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b193357-84c6-4399-a900-b24b88446930","name":"7b193357-84c6-4399-a900-b24b88446930","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae2db314-7ff4-460f-b597-1f330bfee00a","name":"ae2db314-7ff4-460f-b597-1f330bfee00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"380032a1-f564-49dd-bbf9-04391109226e","name":"380032a1-f564-49dd-bbf9-04391109226e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d869733-1346-401e-90c3-26ce45631ab2","name":"0d869733-1346-401e-90c3-26ce45631ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78291903-2783-4041-82d8-cc072217aca3","name":"78291903-2783-4041-82d8-cc072217aca3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -95,90 +95,34 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0737c21-c8fc-4c51-babe-20c7f6301068","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"106eb3e4-1b1b-46ba-8ad5-7ffef628f808","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4baa6bd-fad7-44c9-8f44-2f639e7672df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1b868bf-e07e-4504-9be4-050c777e2959","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16345a42-4a6d-469c-bc2b-068c367f3e84","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b5d675a-5366-4c96-b59d-7bbd3e337f6e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcdd4262-9976-40ae-b742-018b5456d2b2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f43d1ca9-dcd0-4f92-9164-3f83f26fceb1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16841a42-f578-4d0f-bc53-345e26a4309d","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd73b924-43bf-41d9-8271-12542380d00d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfdf43a6-c842-49fb-b161-ba27246384f4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea6a1361-f0b5-4c2a-b600-50b96b43d815","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d55e1739-d36d-4487-a702-b89fa087184e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1583cf2-655a-4eed-beda-a527948cbcf2","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44b7382e-2196-405b-bee8-29c85e8f23ed","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d7f9166-2daf-46d0-8160-71fe9d34b349","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b73b1e4a-ddc4-43e6-8264-d7e596a94a2c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0abe3892-4dff-4baa-b14c-eb85368af891","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c69ae899-b335-453b-a60c-77619c337695","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b193357-84c6-4399-a900-b24b88446930","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed9f679c-0740-4403-8633-8d1e1b1b248a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae2db314-7ff4-460f-b597-1f330bfee00a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b7520c4-53d0-4480-b6bc-988a15adf5b2","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e713a8a3-fb54-46a7-9848-4acf88a1a942","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"380032a1-f564-49dd-bbf9-04391109226e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85b99d1f-cbb3-48ec-9bdb-1c0c8f2d161f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a05aa8d-8b2b-453b-b618-b3751e52eae7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d869733-1346-401e-90c3-26ce45631ab2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"52e4c85c-97cb-4ab5-9dc2-1997aa6af9ae","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cff2981f-56c2-4d04-b56d-e3be09a68c89","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16ae9ca2-b3ac-4381-8412-f62fe7f210ed","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"164a8aed-d9a1-4517-973b-a5ef5c079aff","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c25a0fdd-5401-4665-a190-406d7fc58efe","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"990fb6a9-5f10-4b9e-915c-c8b6e0364438","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78291903-2783-4041-82d8-cc072217aca3","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"038df30f-7867-44fb-b37a-036a567daf58","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"180be3f9-5423-4b36-82a2-253919c7b724","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2b9f7b3-5c75-4e9c-90d7-c22ba4be3d6b","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f2d209b-fa65-4288-a103-8204e39673c2","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0737c21-c8fc-4c51-babe-20c7f6301068","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"106eb3e4-1b1b-46ba-8ad5-7ffef628f808","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4baa6bd-fad7-44c9-8f44-2f639e7672df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1b868bf-e07e-4504-9be4-050c777e2959","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16345a42-4a6d-469c-bc2b-068c367f3e84","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b5d675a-5366-4c96-b59d-7bbd3e337f6e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcdd4262-9976-40ae-b742-018b5456d2b2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f43d1ca9-dcd0-4f92-9164-3f83f26fceb1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16841a42-f578-4d0f-bc53-345e26a4309d","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd73b924-43bf-41d9-8271-12542380d00d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfdf43a6-c842-49fb-b161-ba27246384f4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea6a1361-f0b5-4c2a-b600-50b96b43d815","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d55e1739-d36d-4487-a702-b89fa087184e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1583cf2-655a-4eed-beda-a527948cbcf2","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44b7382e-2196-405b-bee8-29c85e8f23ed","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d7f9166-2daf-46d0-8160-71fe9d34b349","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b73b1e4a-ddc4-43e6-8264-d7e596a94a2c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0abe3892-4dff-4baa-b14c-eb85368af891","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c69ae899-b335-453b-a60c-77619c337695","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b193357-84c6-4399-a900-b24b88446930","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed9f679c-0740-4403-8633-8d1e1b1b248a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae2db314-7ff4-460f-b597-1f330bfee00a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b7520c4-53d0-4480-b6bc-988a15adf5b2","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e713a8a3-fb54-46a7-9848-4acf88a1a942","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"380032a1-f564-49dd-bbf9-04391109226e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85b99d1f-cbb3-48ec-9bdb-1c0c8f2d161f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a05aa8d-8b2b-453b-b618-b3751e52eae7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d869733-1346-401e-90c3-26ce45631ab2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"52e4c85c-97cb-4ab5-9dc2-1997aa6af9ae","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cff2981f-56c2-4d04-b56d-e3be09a68c89","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16ae9ca2-b3ac-4381-8412-f62fe7f210ed","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"164a8aed-d9a1-4517-973b-a5ef5c079aff","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c25a0fdd-5401-4665-a190-406d7fc58efe","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"990fb6a9-5f10-4b9e-915c-c8b6e0364438","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78291903-2783-4041-82d8-cc072217aca3","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"038df30f-7867-44fb-b37a-036a567daf58","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"180be3f9-5423-4b36-82a2-253919c7b724","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2b9f7b3-5c75-4e9c-90d7-c22ba4be3d6b","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f2d209b-fa65-4288-a103-8204e39673c2","IsCreationKey":false,"Key":27.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":{ diff --git a/sprites/spr_fleet_chaos/spr_fleet_chaos.yy b/sprites/spr_fleet_chaos/spr_fleet_chaos.yy index 16ce6be63c..730a9ecb79 100644 --- a/sprites/spr_fleet_chaos/spr_fleet_chaos.yy +++ b/sprites/spr_fleet_chaos/spr_fleet_chaos.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_chaos", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e266532a-e48d-4033-9198-983dc9aeaa12","name":"e266532a-e48d-4033-9198-983dc9aeaa12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3265f69d-3464-4951-996a-68f67b9c2d1b","name":"3265f69d-3464-4951-996a-68f67b9c2d1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80628aac-30ac-47a2-9a43-54358b1e409f","name":"80628aac-30ac-47a2-9a43-54358b1e409f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e266532a-e48d-4033-9198-983dc9aeaa12","name":"e266532a-e48d-4033-9198-983dc9aeaa12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3265f69d-3464-4951-996a-68f67b9c2d1b","name":"3265f69d-3464-4951-996a-68f67b9c2d1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80628aac-30ac-47a2-9a43-54358b1e409f","name":"80628aac-30ac-47a2-9a43-54358b1e409f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46f28293-2d79-4fe6-b237-4ed40fde54c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81d93c89-67ae-4cf0-9ad1-d86e5c05bcaf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e266532a-e48d-4033-9198-983dc9aeaa12","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"373f910c-a495-411f-8ada-1eb09f64c89d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3265f69d-3464-4951-996a-68f67b9c2d1b","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8d984fe-634e-4902-83bc-bd164b7f00fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"738f4e69-702b-48d6-8c35-14324d057bba","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c47715b4-c38b-45f3-8145-9cc384fca54d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80628aac-30ac-47a2-9a43-54358b1e409f","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0c8f245-188c-4a06-bb04-f588e568bfa0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"856878f8-b182-4126-8ded-d2c9a415b2f3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e495674e-7f72-4e9e-9cd6-f2e58f050dd2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d334534b-9968-4419-b7c0-f093f5407545","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46f28293-2d79-4fe6-b237-4ed40fde54c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81d93c89-67ae-4cf0-9ad1-d86e5c05bcaf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e266532a-e48d-4033-9198-983dc9aeaa12","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"373f910c-a495-411f-8ada-1eb09f64c89d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3265f69d-3464-4951-996a-68f67b9c2d1b","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8d984fe-634e-4902-83bc-bd164b7f00fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"738f4e69-702b-48d6-8c35-14324d057bba","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c47715b4-c38b-45f3-8145-9cc384fca54d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80628aac-30ac-47a2-9a43-54358b1e409f","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0c8f245-188c-4a06-bb04-f588e568bfa0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"856878f8-b182-4126-8ded-d2c9a415b2f3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e495674e-7f72-4e9e-9cd6-f2e58f050dd2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d334534b-9968-4419-b7c0-f093f5407545","IsCreationKey":false,"Key":9.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":{ diff --git a/sprites/spr_fleet_civilian/spr_fleet_civilian.yy b/sprites/spr_fleet_civilian/spr_fleet_civilian.yy index b02151edd3..c7f8276266 100644 --- a/sprites/spr_fleet_civilian/spr_fleet_civilian.yy +++ b/sprites/spr_fleet_civilian/spr_fleet_civilian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_civilian", "bboxMode":0, "bbox_bottom":20, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b251f968-ec3e-41e2-a361-0447e500b762","name":"b251f968-ec3e-41e2-a361-0447e500b762","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b251f968-ec3e-41e2-a361-0447e500b762","name":"b251f968-ec3e-41e2-a361-0447e500b762","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bc6e585-d6ed-418b-9fbb-6cc8e6d4132d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b251f968-ec3e-41e2-a361-0447e500b762","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16bf733e-060b-4c84-810f-43f99f54487d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9238b428-2d61-45a2-9fb1-5bbffbb1fec7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c62ff3a-b746-4928-ab52-9f9787ba8f77","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bc6e585-d6ed-418b-9fbb-6cc8e6d4132d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b251f968-ec3e-41e2-a361-0447e500b762","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16bf733e-060b-4c84-810f-43f99f54487d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9238b428-2d61-45a2-9fb1-5bbffbb1fec7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c62ff3a-b746-4928-ab52-9f9787ba8f77","IsCreationKey":false,"Key":3.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":{ diff --git a/sprites/spr_fleet_eldar/spr_fleet_eldar.yy b/sprites/spr_fleet_eldar/spr_fleet_eldar.yy index d32aea41c8..433357957d 100644 --- a/sprites/spr_fleet_eldar/spr_fleet_eldar.yy +++ b/sprites/spr_fleet_eldar/spr_fleet_eldar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_eldar", "bboxMode":0, "bbox_bottom":19, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"368992a1-ac68-4259-81ba-06e750f8b4db","name":"368992a1-ac68-4259-81ba-06e750f8b4db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5763d425-3fc4-42f6-a71e-92566cf717dc","name":"5763d425-3fc4-42f6-a71e-92566cf717dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"11bb694a-8030-4caf-9546-1b54d0afebde","name":"11bb694a-8030-4caf-9546-1b54d0afebde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"beacacea-0909-441b-ac0c-db594bb0be14","name":"beacacea-0909-441b-ac0c-db594bb0be14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"368992a1-ac68-4259-81ba-06e750f8b4db","name":"368992a1-ac68-4259-81ba-06e750f8b4db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5763d425-3fc4-42f6-a71e-92566cf717dc","name":"5763d425-3fc4-42f6-a71e-92566cf717dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"11bb694a-8030-4caf-9546-1b54d0afebde","name":"11bb694a-8030-4caf-9546-1b54d0afebde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"beacacea-0909-441b-ac0c-db594bb0be14","name":"beacacea-0909-441b-ac0c-db594bb0be14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"368992a1-ac68-4259-81ba-06e750f8b4db","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10a985b8-002c-4bf6-b9b2-b0e898422970","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5763d425-3fc4-42f6-a71e-92566cf717dc","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21f1d001-d744-4a6b-95a7-2ded391437e0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"11bb694a-8030-4caf-9546-1b54d0afebde","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"759a4d6a-a3a6-46a8-b605-f17aec42061a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fff703a1-f607-4b81-85f0-b21a6749daa0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f072f03b-0c53-4533-81fe-c72602a84056","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"beacacea-0909-441b-ac0c-db594bb0be14","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a3e376f-c503-4786-b5ff-7e30e266fdef","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"368992a1-ac68-4259-81ba-06e750f8b4db","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10a985b8-002c-4bf6-b9b2-b0e898422970","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5763d425-3fc4-42f6-a71e-92566cf717dc","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21f1d001-d744-4a6b-95a7-2ded391437e0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"11bb694a-8030-4caf-9546-1b54d0afebde","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"759a4d6a-a3a6-46a8-b605-f17aec42061a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fff703a1-f607-4b81-85f0-b21a6749daa0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f072f03b-0c53-4533-81fe-c72602a84056","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"beacacea-0909-441b-ac0c-db594bb0be14","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a3e376f-c503-4786-b5ff-7e30e266fdef","IsCreationKey":false,"Key":5.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":{ diff --git a/sprites/spr_fleet_imperial/spr_fleet_imperial.yy b/sprites/spr_fleet_imperial/spr_fleet_imperial.yy index 4a0ff9c371..bd2735723c 100644 --- a/sprites/spr_fleet_imperial/spr_fleet_imperial.yy +++ b/sprites/spr_fleet_imperial/spr_fleet_imperial.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_imperial", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c517f52-18b0-4ce3-907a-266b27998f5e","name":"7c517f52-18b0-4ce3-907a-266b27998f5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83e2105e-06f4-433a-b155-899860422247","name":"83e2105e-06f4-433a-b155-899860422247","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"948a2eb0-29bf-4b0d-8710-2641375e304c","name":"948a2eb0-29bf-4b0d-8710-2641375e304c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c517f52-18b0-4ce3-907a-266b27998f5e","name":"7c517f52-18b0-4ce3-907a-266b27998f5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83e2105e-06f4-433a-b155-899860422247","name":"83e2105e-06f4-433a-b155-899860422247","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"948a2eb0-29bf-4b0d-8710-2641375e304c","name":"948a2eb0-29bf-4b0d-8710-2641375e304c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2227933-b8bc-4bf6-9d8e-524410250dc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1746812c-c63b-415d-b459-f12dc9208349","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"edc14729-eece-4ed2-8dfc-a5f8c7dfe38b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c517f52-18b0-4ce3-907a-266b27998f5e","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da9e9585-4af5-4c8f-bf1e-b0865913f48c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e924ab6f-120a-498b-80ba-78f1ec0f34fe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83e2105e-06f4-433a-b155-899860422247","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e7f9699-c511-43fb-b4aa-f01b6cb66560","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cfe88df-f523-462d-bcf6-20f2367cf625","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"948a2eb0-29bf-4b0d-8710-2641375e304c","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e41b6128-03e4-490c-be0e-4c177c1dcfaa","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38bd26a6-a925-4d86-8cc1-91d1fa137e25","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"212d7172-82b2-47e9-95c1-fb55d943413e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2227933-b8bc-4bf6-9d8e-524410250dc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1746812c-c63b-415d-b459-f12dc9208349","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edc14729-eece-4ed2-8dfc-a5f8c7dfe38b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c517f52-18b0-4ce3-907a-266b27998f5e","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da9e9585-4af5-4c8f-bf1e-b0865913f48c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e924ab6f-120a-498b-80ba-78f1ec0f34fe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83e2105e-06f4-433a-b155-899860422247","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e7f9699-c511-43fb-b4aa-f01b6cb66560","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cfe88df-f523-462d-bcf6-20f2367cf625","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"948a2eb0-29bf-4b0d-8710-2641375e304c","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e41b6128-03e4-490c-be0e-4c177c1dcfaa","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38bd26a6-a925-4d86-8cc1-91d1fa137e25","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"212d7172-82b2-47e9-95c1-fb55d943413e","IsCreationKey":false,"Key":9.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":{ diff --git a/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy b/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy index f77c68a02d..1982cd9ff2 100644 --- a/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy +++ b/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_inquisition", "bboxMode":0, "bbox_bottom":14, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"92019af0-cd11-4fd1-a771-9349389afadf","name":"92019af0-cd11-4fd1-a771-9349389afadf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"49595a43-1634-487e-b0b0-fce6c652401d","name":"49595a43-1634-487e-b0b0-fce6c652401d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92019af0-cd11-4fd1-a771-9349389afadf","name":"92019af0-cd11-4fd1-a771-9349389afadf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49595a43-1634-487e-b0b0-fce6c652401d","name":"49595a43-1634-487e-b0b0-fce6c652401d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92019af0-cd11-4fd1-a771-9349389afadf","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1a6ee6e-e331-44c5-85e3-374e6df5a48f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49595a43-1634-487e-b0b0-fce6c652401d","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b8571ff-c45f-4144-95b8-bd2e724dcb52","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7dcabe8c-e56b-40a7-a72c-ed6b3c6099d2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92019af0-cd11-4fd1-a771-9349389afadf","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1a6ee6e-e331-44c5-85e3-374e6df5a48f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49595a43-1634-487e-b0b0-fce6c652401d","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b8571ff-c45f-4144-95b8-bd2e724dcb52","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7dcabe8c-e56b-40a7-a72c-ed6b3c6099d2","IsCreationKey":false,"Key":2.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":{ diff --git a/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy b/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy index ecd7b874c2..4d232c696e 100644 --- a/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy +++ b/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_mechanicus", "bboxMode":0, "bbox_bottom":15, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","path":"sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"758c2ed2-dbe8-403f-85bc-60e54b5cd9dc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","path":"sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"758c2ed2-dbe8-403f-85bc-60e54b5cd9dc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_necron/spr_fleet_necron.yy b/sprites/spr_fleet_necron/spr_fleet_necron.yy index e599309694..b6147162a9 100644 --- a/sprites/spr_fleet_necron/spr_fleet_necron.yy +++ b/sprites/spr_fleet_necron/spr_fleet_necron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_necron", "bboxMode":0, "bbox_bottom":21, @@ -12,15 +12,15 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"12d78257-948b-4e4e-a3c5-3274e1470a06","name":"12d78257-948b-4e4e-a3c5-3274e1470a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3875805-121c-458b-8790-8b3798976a94","name":"a3875805-121c-458b-8790-8b3798976a94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"981f81fe-69dc-4d16-b298-7e604b67d975","name":"981f81fe-69dc-4d16-b298-7e604b67d975","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27ab43a2-1742-40b7-85bb-00ea316f8853","name":"27ab43a2-1742-40b7-85bb-00ea316f8853","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fae4629c-6732-4029-8e33-8f8ade262473","name":"fae4629c-6732-4029-8e33-8f8ade262473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"12d78257-948b-4e4e-a3c5-3274e1470a06","name":"12d78257-948b-4e4e-a3c5-3274e1470a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3875805-121c-458b-8790-8b3798976a94","name":"a3875805-121c-458b-8790-8b3798976a94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"981f81fe-69dc-4d16-b298-7e604b67d975","name":"981f81fe-69dc-4d16-b298-7e604b67d975","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27ab43a2-1742-40b7-85bb-00ea316f8853","name":"27ab43a2-1742-40b7-85bb-00ea316f8853","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fae4629c-6732-4029-8e33-8f8ade262473","name":"fae4629c-6732-4029-8e33-8f8ade262473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -76,33 +76,15 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c53a9c8b-e405-4375-a26d-333ff1ee9885","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc446df6-18f0-4424-b0c4-bc121b3912d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e41c2b1-3401-4355-899a-799f973fc94c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"12d78257-948b-4e4e-a3c5-3274e1470a06","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8738c31-dff4-479e-a621-cc9b6b92ab5f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80bc09f8-1b80-4d45-80f1-d9c696519868","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3875805-121c-458b-8790-8b3798976a94","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc5705e1-b55f-4a26-b422-688b5da3abd2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"981f81fe-69dc-4d16-b298-7e604b67d975","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64e8bc4e-10cf-4213-838c-cec6dc7b981d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ab43a2-1742-40b7-85bb-00ea316f8853","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"29b29106-6a2b-4e17-84d7-0dc589e0dcc9","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fae4629c-6732-4029-8e33-8f8ade262473","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e57f3f58-288a-45e4-bc21-d612ca745ad2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c53a9c8b-e405-4375-a26d-333ff1ee9885","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc446df6-18f0-4424-b0c4-bc121b3912d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e41c2b1-3401-4355-899a-799f973fc94c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"12d78257-948b-4e4e-a3c5-3274e1470a06","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8738c31-dff4-479e-a621-cc9b6b92ab5f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80bc09f8-1b80-4d45-80f1-d9c696519868","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3875805-121c-458b-8790-8b3798976a94","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc5705e1-b55f-4a26-b422-688b5da3abd2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"981f81fe-69dc-4d16-b298-7e604b67d975","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64e8bc4e-10cf-4213-838c-cec6dc7b981d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ab43a2-1742-40b7-85bb-00ea316f8853","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"29b29106-6a2b-4e17-84d7-0dc589e0dcc9","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fae4629c-6732-4029-8e33-8f8ade262473","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e57f3f58-288a-45e4-bc21-d612ca745ad2","IsCreationKey":false,"Key":8.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":{ diff --git a/sprites/spr_fleet_ork/spr_fleet_ork.yy b/sprites/spr_fleet_ork/spr_fleet_ork.yy index 0873800d21..5468bdfa52 100644 --- a/sprites/spr_fleet_ork/spr_fleet_ork.yy +++ b/sprites/spr_fleet_ork/spr_fleet_ork.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_ork", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"af934098-f3c2-43d2-b187-dcee782ee97b","name":"af934098-f3c2-43d2-b187-dcee782ee97b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"97738318-6ef9-490c-a02b-9f3e648a040b","name":"97738318-6ef9-490c-a02b-9f3e648a040b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ab9ddac-8e42-4f5c-b217-99251e829722","name":"6ab9ddac-8e42-4f5c-b217-99251e829722","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af934098-f3c2-43d2-b187-dcee782ee97b","name":"af934098-f3c2-43d2-b187-dcee782ee97b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97738318-6ef9-490c-a02b-9f3e648a040b","name":"97738318-6ef9-490c-a02b-9f3e648a040b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ab9ddac-8e42-4f5c-b217-99251e829722","name":"6ab9ddac-8e42-4f5c-b217-99251e829722","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af934098-f3c2-43d2-b187-dcee782ee97b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67c20234-9707-42df-beac-ff0dda5b9c90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"859afc2d-3b8a-4c92-99b5-a9e260b4afa9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97738318-6ef9-490c-a02b-9f3e648a040b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a9efd0-a71e-4a03-94a4-30b508ce83c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b16536ea-9fda-4393-adfa-41cf01e30dff","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ecd3505-f84e-4413-848c-be7fe976be6b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed56594a-e030-488f-bec5-a202dae99407","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f69f7e34-5ec6-42bb-a21a-64a5f37514e8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d361abfb-cafd-405c-9b79-c66655dbe7ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ab9ddac-8e42-4f5c-b217-99251e829722","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ec537ed-9141-47b4-bd1c-8c11bafadcac","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90531e4a-e9cc-4501-9a48-f0b3a50ad878","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af934098-f3c2-43d2-b187-dcee782ee97b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67c20234-9707-42df-beac-ff0dda5b9c90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"859afc2d-3b8a-4c92-99b5-a9e260b4afa9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97738318-6ef9-490c-a02b-9f3e648a040b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a9efd0-a71e-4a03-94a4-30b508ce83c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b16536ea-9fda-4393-adfa-41cf01e30dff","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ecd3505-f84e-4413-848c-be7fe976be6b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed56594a-e030-488f-bec5-a202dae99407","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f69f7e34-5ec6-42bb-a21a-64a5f37514e8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d361abfb-cafd-405c-9b79-c66655dbe7ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ab9ddac-8e42-4f5c-b217-99251e829722","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ec537ed-9141-47b4-bd1c-8c11bafadcac","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90531e4a-e9cc-4501-9a48-f0b3a50ad878","IsCreationKey":false,"Key":9.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_fleet_tau/spr_fleet_tau.yy b/sprites/spr_fleet_tau/spr_fleet_tau.yy index a8c2d1d4f7..3e3b10899a 100644 --- a/sprites/spr_fleet_tau/spr_fleet_tau.yy +++ b/sprites/spr_fleet_tau/spr_fleet_tau.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_tau", "bboxMode":0, "bbox_bottom":20, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95d93dc5-c7db-4369-b68a-31026d5959fc","name":"95d93dc5-c7db-4369-b68a-31026d5959fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"617ee12d-133c-4e96-ba8d-93535804252d","name":"617ee12d-133c-4e96-ba8d-93535804252d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"06e6544f-caed-4f40-8705-c7108e508215","name":"06e6544f-caed-4f40-8705-c7108e508215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a28eb7be-b330-4c6f-a971-0412e89f9546","name":"a28eb7be-b330-4c6f-a971-0412e89f9546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95d93dc5-c7db-4369-b68a-31026d5959fc","name":"95d93dc5-c7db-4369-b68a-31026d5959fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"617ee12d-133c-4e96-ba8d-93535804252d","name":"617ee12d-133c-4e96-ba8d-93535804252d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"06e6544f-caed-4f40-8705-c7108e508215","name":"06e6544f-caed-4f40-8705-c7108e508215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a28eb7be-b330-4c6f-a971-0412e89f9546","name":"a28eb7be-b330-4c6f-a971-0412e89f9546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1641c7b0-ba32-46a1-bdef-7751da95e1c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95d93dc5-c7db-4369-b68a-31026d5959fc","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1f176e9-a3cc-4a3b-94bf-ade7ddc106a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"617ee12d-133c-4e96-ba8d-93535804252d","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1051b8c3-13b3-4b12-909d-886c3a09de27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06e6544f-caed-4f40-8705-c7108e508215","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"195aff74-b345-485c-8c41-640d808b3d87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a06bc4eb-65c2-4824-b12e-4b2594e8cdc6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a5c0c0a4-63b3-43bc-8743-90cbd113bcb7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c0c4440-a668-4464-9e1c-647382b2af86","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a28eb7be-b330-4c6f-a971-0412e89f9546","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21ad7732-67d7-4445-a580-dc99939fd767","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c836550-2c0b-4ff6-bdf5-db3f343e1f8c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"621a69a7-bcaa-4299-821f-7014d3b98d91","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed6f8cbd-bba9-4119-b444-6aa8e37e6443","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1641c7b0-ba32-46a1-bdef-7751da95e1c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95d93dc5-c7db-4369-b68a-31026d5959fc","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1f176e9-a3cc-4a3b-94bf-ade7ddc106a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"617ee12d-133c-4e96-ba8d-93535804252d","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1051b8c3-13b3-4b12-909d-886c3a09de27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06e6544f-caed-4f40-8705-c7108e508215","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"195aff74-b345-485c-8c41-640d808b3d87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a06bc4eb-65c2-4824-b12e-4b2594e8cdc6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5c0c0a4-63b3-43bc-8743-90cbd113bcb7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c0c4440-a668-4464-9e1c-647382b2af86","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a28eb7be-b330-4c6f-a971-0412e89f9546","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21ad7732-67d7-4445-a580-dc99939fd767","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c836550-2c0b-4ff6-bdf5-db3f343e1f8c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"621a69a7-bcaa-4299-821f-7014d3b98d91","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed6f8cbd-bba9-4119-b444-6aa8e37e6443","IsCreationKey":false,"Key":10.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":{ diff --git a/sprites/spr_fleet_tiny/spr_fleet_tiny.yy b/sprites/spr_fleet_tiny/spr_fleet_tiny.yy index 0b8da40d4a..c7bcd1901c 100644 --- a/sprites/spr_fleet_tiny/spr_fleet_tiny.yy +++ b/sprites/spr_fleet_tiny/spr_fleet_tiny.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_tiny", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93ba9a2b-7ce0-4dae-9969-8dd31f9d5e05","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6614b32-3ca4-4ad2-b473-59949e9d523e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce8b2924-62d4-49f3-8e69-ce8cd6aa06f9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c02526b5-5955-44af-a6f6-2c8e50041795","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bed764f6-9eb2-4f9c-af36-1106addfda28","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfd5197f-4613-4ede-abe2-2402da165f6c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f83fdcd3-b144-4bd7-9bbd-cdb4b4dbe7f7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9cc2ee1b-d945-4a46-9985-e3051251ee4a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daded6b1-47b8-4749-854d-58c7121cabd4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19b18c63-60ec-46ff-8577-f2d094f1bad5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93ba9a2b-7ce0-4dae-9969-8dd31f9d5e05","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6614b32-3ca4-4ad2-b473-59949e9d523e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce8b2924-62d4-49f3-8e69-ce8cd6aa06f9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c02526b5-5955-44af-a6f6-2c8e50041795","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bed764f6-9eb2-4f9c-af36-1106addfda28","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfd5197f-4613-4ede-abe2-2402da165f6c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f83fdcd3-b144-4bd7-9bbd-cdb4b4dbe7f7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9cc2ee1b-d945-4a46-9985-e3051251ee4a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daded6b1-47b8-4749-854d-58c7121cabd4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19b18c63-60ec-46ff-8577-f2d094f1bad5","IsCreationKey":false,"Key":9.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":{ diff --git a/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy b/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy index bfec48951e..f62368c872 100644 --- a/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy +++ b/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_tyranid", "bboxMode":0, "bbox_bottom":27, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"916d18ce-ca97-471d-84d1-2af450e12185","name":"916d18ce-ca97-471d-84d1-2af450e12185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19de30ad-6b92-473a-9659-253e0181372b","name":"19de30ad-6b92-473a-9659-253e0181372b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd6648f1-6f79-4074-acdc-013d536fde6b","name":"fd6648f1-6f79-4074-acdc-013d536fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"916d18ce-ca97-471d-84d1-2af450e12185","name":"916d18ce-ca97-471d-84d1-2af450e12185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19de30ad-6b92-473a-9659-253e0181372b","name":"19de30ad-6b92-473a-9659-253e0181372b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd6648f1-6f79-4074-acdc-013d536fde6b","name":"fd6648f1-6f79-4074-acdc-013d536fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7cd6d2f-e931-473e-9738-5e4c11076117","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4384c81-b200-4292-9216-b89244245ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"916d18ce-ca97-471d-84d1-2af450e12185","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55965e6f-4c55-4ed7-8de5-988f48ca077c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16226b11-0e2a-45e1-b4b2-cf28f3ae789e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb705fa2-b739-499c-a2dc-6923ab82ba3d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"401e7c8a-01b5-4698-b591-1de4591b2086","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"299de8b7-0481-4a93-8893-c4364d2f6d90","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19de30ad-6b92-473a-9659-253e0181372b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"938fa86e-7dac-42c6-8e61-ceb64ab8de3f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8a6db97-f5a2-4626-82cd-a82f38c1fed4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6648f1-6f79-4074-acdc-013d536fde6b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f91a41f7-d96c-4db3-99ca-d18b241dbb81","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b698cfa6-6825-4815-aa71-09ae4d6ca041","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba17c42b-edf8-4b31-b958-ac28bf2f31e8","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7cd6d2f-e931-473e-9738-5e4c11076117","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4384c81-b200-4292-9216-b89244245ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"916d18ce-ca97-471d-84d1-2af450e12185","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55965e6f-4c55-4ed7-8de5-988f48ca077c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16226b11-0e2a-45e1-b4b2-cf28f3ae789e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb705fa2-b739-499c-a2dc-6923ab82ba3d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"401e7c8a-01b5-4698-b591-1de4591b2086","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"299de8b7-0481-4a93-8893-c4364d2f6d90","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19de30ad-6b92-473a-9659-253e0181372b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"938fa86e-7dac-42c6-8e61-ceb64ab8de3f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8a6db97-f5a2-4626-82cd-a82f38c1fed4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6648f1-6f79-4074-acdc-013d536fde6b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f91a41f7-d96c-4db3-99ca-d18b241dbb81","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b698cfa6-6825-4815-aa71-09ae4d6ca041","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba17c42b-edf8-4b31-b958-ac28bf2f31e8","IsCreationKey":false,"Key":11.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_flora_camo_texture/spr_flora_camo_texture.yy b/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy index c5085c1515..71e1d0c786 100644 --- a/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy +++ b/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flora_camo_texture", "bboxMode":0, "bbox_bottom":72, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","path":"sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09362bea-4c68-4013-b477-2be6d3bb1fa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","path":"sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09362bea-4c68-4013-b477-2be6d3bb1fa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_force_icon/spr_force_icon.yy b/sprites/spr_force_icon/spr_force_icon.yy index 93ac804119..84d75bc02d 100644 --- a/sprites/spr_force_icon/spr_force_icon.yy +++ b/sprites/spr_force_icon/spr_force_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_force_icon", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","path":"sprites/spr_force_icon/spr_force_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0cec9664-dc38-4564-ac6c-edd412b644c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","path":"sprites/spr_force_icon/spr_force_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0cec9664-dc38-4564-ac6c-edd412b644c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_forge_holo/spr_forge_holo.yy b/sprites/spr_forge_holo/spr_forge_holo.yy index a1c5bc96a7..78c33c16bf 100644 --- a/sprites/spr_forge_holo/spr_forge_holo.yy +++ b/sprites/spr_forge_holo/spr_forge_holo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_forge_holo", "bboxMode":0, "bbox_bottom":138, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f41be05e-734f-47ef-9186-d8292a3f7b91","name":"f41be05e-734f-47ef-9186-d8292a3f7b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f41be05e-734f-47ef-9186-d8292a3f7b91","name":"f41be05e-734f-47ef-9186-d8292a3f7b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f41be05e-734f-47ef-9186-d8292a3f7b91","path":"sprites/spr_forge_holo/spr_forge_holo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be63aa50-0d74-4281-81ab-928c1b946504","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f41be05e-734f-47ef-9186-d8292a3f7b91","path":"sprites/spr_forge_holo/spr_forge_holo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be63aa50-0d74-4281-81ab-928c1b946504","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_forge_points_icon/spr_forge_points_icon.yy b/sprites/spr_forge_points_icon/spr_forge_points_icon.yy index 15c79b7e0a..2d20357965 100644 --- a/sprites/spr_forge_points_icon/spr_forge_points_icon.yy +++ b/sprites/spr_forge_points_icon/spr_forge_points_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_forge_points_icon", "bboxMode":0, "bbox_bottom":59, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"980f6eb9-4992-4562-bbae-c140a4104ce9","name":"980f6eb9-4992-4562-bbae-c140a4104ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"980f6eb9-4992-4562-bbae-c140a4104ce9","name":"980f6eb9-4992-4562-bbae-c140a4104ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb46afc0-357e-44b3-8759-e74618551361","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"980f6eb9-4992-4562-bbae-c140a4104ce9","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f1e5cc4-df0f-4733-928b-ae386f337e97","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb46afc0-357e-44b3-8759-e74618551361","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"980f6eb9-4992-4562-bbae-c140a4104ce9","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f1e5cc4-df0f-4733-928b-ae386f337e97","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_formation_arrow/spr_formation_arrow.yy b/sprites/spr_formation_arrow/spr_formation_arrow.yy index a11b0d0d6a..35eb75796e 100644 --- a/sprites/spr_formation_arrow/spr_formation_arrow.yy +++ b/sprites/spr_formation_arrow/spr_formation_arrow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_formation_arrow", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","path":"sprites/spr_formation_arrow/spr_formation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6532af6-8c0d-47b6-bf0d-1d66a37d4715","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","path":"sprites/spr_formation_arrow/spr_formation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6532af6-8c0d-47b6-bf0d-1d66a37d4715","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_formation_bars/spr_formation_bars.yy b/sprites/spr_formation_bars/spr_formation_bars.yy index d8708e56dc..10ac1700fe 100644 --- a/sprites/spr_formation_bars/spr_formation_bars.yy +++ b/sprites/spr_formation_bars/spr_formation_bars.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_formation_bars", "bboxMode":0, "bbox_bottom":281, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0ac10b9-1415-4150-bf81-f0978bef4874","name":"b0ac10b9-1415-4150-bf81-f0978bef4874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"309ea92c-752f-4ff3-a70d-b2d96a061998","name":"309ea92c-752f-4ff3-a70d-b2d96a061998","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"17888442-c2b9-48de-bd24-a2be76f28fbc","name":"17888442-c2b9-48de-bd24-a2be76f28fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0ac10b9-1415-4150-bf81-f0978bef4874","name":"b0ac10b9-1415-4150-bf81-f0978bef4874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"309ea92c-752f-4ff3-a70d-b2d96a061998","name":"309ea92c-752f-4ff3-a70d-b2d96a061998","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"17888442-c2b9-48de-bd24-a2be76f28fbc","name":"17888442-c2b9-48de-bd24-a2be76f28fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46e13a28-e112-4933-8add-8b73f7768419","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9970ea10-0897-4059-a7b2-3d8e0103fa9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23c79e86-bdb6-4ce2-b417-396aeab1ca29","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"548deb30-5b96-45c3-b1c4-6c498fc763f7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4db157e-0e70-4fa4-ba33-d83926ebd4dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0ac10b9-1415-4150-bf81-f0978bef4874","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9857969a-65b3-4d67-a576-ff2f0b569960","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57a402b1-da6a-4bc9-b7af-293979d8f87f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"309ea92c-752f-4ff3-a70d-b2d96a061998","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e637be31-c60e-4d2c-b0f0-a3e597f1ca93","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa4230a7-4ca4-4805-aeda-4b4f30031465","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba040332-864d-43ee-a260-80f1b59bfe4d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a94d6dae-c243-498f-829a-58d8668118e5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"17888442-c2b9-48de-bd24-a2be76f28fbc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4025e7ee-dccf-4f10-9f84-610d5b1de2cd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c1b9ce4-040d-491a-93de-e00a1eca65e1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"492d1a9e-d4b6-4971-9559-a3b1c17313fa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c710c3c4-0e5d-4e70-b1f6-77b78619af6a","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46e13a28-e112-4933-8add-8b73f7768419","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9970ea10-0897-4059-a7b2-3d8e0103fa9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23c79e86-bdb6-4ce2-b417-396aeab1ca29","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"548deb30-5b96-45c3-b1c4-6c498fc763f7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4db157e-0e70-4fa4-ba33-d83926ebd4dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0ac10b9-1415-4150-bf81-f0978bef4874","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9857969a-65b3-4d67-a576-ff2f0b569960","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57a402b1-da6a-4bc9-b7af-293979d8f87f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"309ea92c-752f-4ff3-a70d-b2d96a061998","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e637be31-c60e-4d2c-b0f0-a3e597f1ca93","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa4230a7-4ca4-4805-aeda-4b4f30031465","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba040332-864d-43ee-a260-80f1b59bfe4d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a94d6dae-c243-498f-829a-58d8668118e5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"17888442-c2b9-48de-bd24-a2be76f28fbc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4025e7ee-dccf-4f10-9f84-610d5b1de2cd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c1b9ce4-040d-491a-93de-e00a1eca65e1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"492d1a9e-d4b6-4971-9559-a3b1c17313fa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c710c3c4-0e5d-4e70-b1f6-77b78619af6a","IsCreationKey":false,"Key":14.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_formation_splash/spr_formation_splash.yy b/sprites/spr_formation_splash/spr_formation_splash.yy index 7240461f95..1671d331bb 100644 --- a/sprites/spr_formation_splash/spr_formation_splash.yy +++ b/sprites/spr_formation_splash/spr_formation_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_formation_splash", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe3908e1-758d-486a-9f5d-307c11617dd5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe3908e1-758d-486a-9f5d-307c11617dd5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_fur_tabbard/spr_fur_tabbard.yy b/sprites/spr_fur_tabbard/spr_fur_tabbard.yy index 15c2fe08fd..2421a63efe 100644 --- a/sprites/spr_fur_tabbard/spr_fur_tabbard.yy +++ b/sprites/spr_fur_tabbard/spr_fur_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fur_tabbard", "bboxMode":0, "bbox_bottom":198, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90a6bf62-015f-4b4a-b64b-dc368cae7708","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90a6bf62-015f-4b4a-b64b-dc368cae7708","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy b/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy index 0ea79e04d8..f3a4363cb4 100644 --- a/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy +++ b/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fur_tail_topknot", "bboxMode":0, "bbox_bottom":64, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"778eed9c-61df-4cb3-b13d-b1945275af2a","name":"778eed9c-61df-4cb3-b13d-b1945275af2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"778eed9c-61df-4cb3-b13d-b1945275af2a","name":"778eed9c-61df-4cb3-b13d-b1945275af2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"778eed9c-61df-4cb3-b13d-b1945275af2a","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5190dfd2-b856-4886-b584-f0be72285950","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"778eed9c-61df-4cb3-b13d-b1945275af2a","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5190dfd2-b856-4886-b584-f0be72285950","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_apoth/spr_gear_apoth.yy b/sprites/spr_gear_apoth/spr_gear_apoth.yy index 21d8214252..1e9544c73d 100644 --- a/sprites/spr_gear_apoth/spr_gear_apoth.yy +++ b/sprites/spr_gear_apoth/spr_gear_apoth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_apoth", "bboxMode":0, "bbox_bottom":44, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2ad6063-a438-4759-a551-f4aee6d0c709","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2ad6063-a438-4759-a551-f4aee6d0c709","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","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_gear_chap/spr_gear_chap.yy b/sprites/spr_gear_chap/spr_gear_chap.yy index d6e2b900ff..3d25dbfc95 100644 --- a/sprites/spr_gear_chap/spr_gear_chap.yy +++ b/sprites/spr_gear_chap/spr_gear_chap.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_chap", "bboxMode":0, "bbox_bottom":52, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3ba98c10-77a8-4509-9736-86dc8724af44","name":"3ba98c10-77a8-4509-9736-86dc8724af44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2cca646-5608-4f41-b755-792cce5db843","name":"f2cca646-5608-4f41-b755-792cce5db843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f550793-95a9-4d27-912e-f2f416090144","name":"0f550793-95a9-4d27-912e-f2f416090144","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ba98c10-77a8-4509-9736-86dc8724af44","name":"3ba98c10-77a8-4509-9736-86dc8724af44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2cca646-5608-4f41-b755-792cce5db843","name":"f2cca646-5608-4f41-b755-792cce5db843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f550793-95a9-4d27-912e-f2f416090144","name":"0f550793-95a9-4d27-912e-f2f416090144","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ba98c10-77a8-4509-9736-86dc8724af44","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55ab5775-15c5-4857-82b8-ce4eb3b56137","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c04ded57-a614-480d-b6fe-cb01f7cbc567","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2cca646-5608-4f41-b755-792cce5db843","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"71bed354-bfe8-499f-b239-0d52d9fcc7b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f550793-95a9-4d27-912e-f2f416090144","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05190b39-b803-4f5b-9dda-2cfe5d75069d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ba98c10-77a8-4509-9736-86dc8724af44","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55ab5775-15c5-4857-82b8-ce4eb3b56137","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c04ded57-a614-480d-b6fe-cb01f7cbc567","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2cca646-5608-4f41-b755-792cce5db843","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"71bed354-bfe8-499f-b239-0d52d9fcc7b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f550793-95a9-4d27-912e-f2f416090144","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05190b39-b803-4f5b-9dda-2cfe5d75069d","IsCreationKey":false,"Key":3.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_gear_combat_shield/spr_gear_combat_shield.yy b/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy index 9dd88bb4ea..b2cb38250e 100644 --- a/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy +++ b/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_combat_shield", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdba72c1-79cb-494b-9323-35263132441a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdba72c1-79cb-494b-9323-35263132441a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","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_gear_halo/spr_gear_halo.yy b/sprites/spr_gear_halo/spr_gear_halo.yy index 1bece29be7..8818006a8d 100644 --- a/sprites/spr_gear_halo/spr_gear_halo.yy +++ b/sprites/spr_gear_halo/spr_gear_halo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_halo", "bboxMode":0, "bbox_bottom":79, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f8705cc-25c0-45f8-b522-813a85727411","name":"6f8705cc-25c0-45f8-b522-813a85727411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33022205-50ff-4396-96a1-1f77edceb66f","name":"33022205-50ff-4396-96a1-1f77edceb66f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f8705cc-25c0-45f8-b522-813a85727411","name":"6f8705cc-25c0-45f8-b522-813a85727411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33022205-50ff-4396-96a1-1f77edceb66f","name":"33022205-50ff-4396-96a1-1f77edceb66f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00e9af48-289d-43b0-9f62-a44e7132afc0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f8705cc-25c0-45f8-b522-813a85727411","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c17d17d-bf4c-4925-9341-17adaaf3e468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bdb51d63-77df-4a88-a08d-18528e64e17e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33022205-50ff-4396-96a1-1f77edceb66f","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88a68e4e-7ef5-4524-b12f-918792556dff","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00e9af48-289d-43b0-9f62-a44e7132afc0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f8705cc-25c0-45f8-b522-813a85727411","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c17d17d-bf4c-4925-9341-17adaaf3e468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bdb51d63-77df-4a88-a08d-18528e64e17e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33022205-50ff-4396-96a1-1f77edceb66f","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88a68e4e-7ef5-4524-b12f-918792556dff","IsCreationKey":false,"Key":3.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_gear_hood1/spr_gear_hood1.yy b/sprites/spr_gear_hood1/spr_gear_hood1.yy index 2da3fe6c6e..c2a3541062 100644 --- a/sprites/spr_gear_hood1/spr_gear_hood1.yy +++ b/sprites/spr_gear_hood1/spr_gear_hood1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_hood1", "bboxMode":0, "bbox_bottom":205, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d075042d-241e-45ec-b149-27f1e9c791f1","name":"d075042d-241e-45ec-b149-27f1e9c791f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82a51724-0c4e-4d0e-b911-2748b2195c11","name":"82a51724-0c4e-4d0e-b911-2748b2195c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d075042d-241e-45ec-b149-27f1e9c791f1","name":"d075042d-241e-45ec-b149-27f1e9c791f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82a51724-0c4e-4d0e-b911-2748b2195c11","name":"82a51724-0c4e-4d0e-b911-2748b2195c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7e638c1-3263-4848-a7d4-38720fec02fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8239526-bc0c-4d66-a314-912e4cecdc5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0af985c0-34a6-41d1-afc5-ed65eb09cab3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d075042d-241e-45ec-b149-27f1e9c791f1","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d59c58f0-01a2-47d6-b2f6-ba6603028e41","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8ce178ea-6dca-4a19-86f7-16e8c1a5a0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63dde102-1279-4c04-a829-c8dd453d3e92","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9dc83925-f071-463c-841a-5829c30e3d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05075f29-cf4e-4f43-9a83-f2af6be00517","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57a7a392-e649-4414-9c21-2af904a4673b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c47dc30-17eb-48c0-ba8f-26390675c8b1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82a51724-0c4e-4d0e-b911-2748b2195c11","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8aae6c0-9584-4fb4-af75-82fbee8bf42c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c6b6a99-647e-4bd1-96ab-f313a64b8e19","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7e638c1-3263-4848-a7d4-38720fec02fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8239526-bc0c-4d66-a314-912e4cecdc5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0af985c0-34a6-41d1-afc5-ed65eb09cab3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d075042d-241e-45ec-b149-27f1e9c791f1","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d59c58f0-01a2-47d6-b2f6-ba6603028e41","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8ce178ea-6dca-4a19-86f7-16e8c1a5a0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63dde102-1279-4c04-a829-c8dd453d3e92","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9dc83925-f071-463c-841a-5829c30e3d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05075f29-cf4e-4f43-9a83-f2af6be00517","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57a7a392-e649-4414-9c21-2af904a4673b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c47dc30-17eb-48c0-ba8f-26390675c8b1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82a51724-0c4e-4d0e-b911-2748b2195c11","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8aae6c0-9584-4fb4-af75-82fbee8bf42c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c6b6a99-647e-4bd1-96ab-f313a64b8e19","IsCreationKey":false,"Key":11.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_gear_hood2/spr_gear_hood2.yy b/sprites/spr_gear_hood2/spr_gear_hood2.yy index 0b05d5be79..87c73ba533 100644 --- a/sprites/spr_gear_hood2/spr_gear_hood2.yy +++ b/sprites/spr_gear_hood2/spr_gear_hood2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_hood2", "bboxMode":0, "bbox_bottom":49, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98625b1b-c315-421f-942a-61723f81b005","path":"sprites/spr_gear_hood2/spr_gear_hood2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"50ebdc76-7691-4e67-ab14-f9533598ea2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"98625b1b-c315-421f-942a-61723f81b005","path":"sprites/spr_gear_hood2/spr_gear_hood2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"50ebdc76-7691-4e67-ab14-f9533598ea2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_hood3/spr_gear_hood3.yy b/sprites/spr_gear_hood3/spr_gear_hood3.yy index af04159b73..97aab2603b 100644 --- a/sprites/spr_gear_hood3/spr_gear_hood3.yy +++ b/sprites/spr_gear_hood3/spr_gear_hood3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_hood3", "bboxMode":0, "bbox_bottom":204, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba011eb4-2602-4258-922e-22163b5795a3","name":"ba011eb4-2602-4258-922e-22163b5795a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0528e4b3-353d-478c-a12c-f800434d667a","name":"0528e4b3-353d-478c-a12c-f800434d667a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c26273f9-5689-449b-9f3f-31af9c1d16be","name":"c26273f9-5689-449b-9f3f-31af9c1d16be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2e8a472-302d-42a0-a191-6e8189f9d053","name":"a2e8a472-302d-42a0-a191-6e8189f9d053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d904ff69-d790-42e1-968d-d98335c4ba1e","name":"d904ff69-d790-42e1-968d-d98335c4ba1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba011eb4-2602-4258-922e-22163b5795a3","name":"ba011eb4-2602-4258-922e-22163b5795a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0528e4b3-353d-478c-a12c-f800434d667a","name":"0528e4b3-353d-478c-a12c-f800434d667a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c26273f9-5689-449b-9f3f-31af9c1d16be","name":"c26273f9-5689-449b-9f3f-31af9c1d16be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2e8a472-302d-42a0-a191-6e8189f9d053","name":"a2e8a472-302d-42a0-a191-6e8189f9d053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d904ff69-d790-42e1-968d-d98335c4ba1e","name":"d904ff69-d790-42e1-968d-d98335c4ba1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f654497a-61ba-4e49-a98d-cb9a20cd50d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba011eb4-2602-4258-922e-22163b5795a3","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f9849ba-5797-4abd-98e0-345ac5e46957","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0528e4b3-353d-478c-a12c-f800434d667a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87edcd92-5d55-4c60-aa8b-b0c674592211","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c26273f9-5689-449b-9f3f-31af9c1d16be","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"946368d6-ba73-4b0c-8325-2cd22cf1f5a2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2e8a472-302d-42a0-a191-6e8189f9d053","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"120c2802-b902-4f6f-9fc6-e9dc234c36e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d1d2263-a1ca-4228-81dc-d3cad2cb4103","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d904ff69-d790-42e1-968d-d98335c4ba1e","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6175a05c-8d48-4db1-97a3-f66939c811e6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27a5cb26-478e-4331-85a9-a2c45373712a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a045cd17-94fb-4bb7-84a6-93ce47448460","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5dfaef21-c07e-4e46-8877-113627f722ef","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f654497a-61ba-4e49-a98d-cb9a20cd50d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba011eb4-2602-4258-922e-22163b5795a3","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f9849ba-5797-4abd-98e0-345ac5e46957","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0528e4b3-353d-478c-a12c-f800434d667a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87edcd92-5d55-4c60-aa8b-b0c674592211","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c26273f9-5689-449b-9f3f-31af9c1d16be","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"946368d6-ba73-4b0c-8325-2cd22cf1f5a2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2e8a472-302d-42a0-a191-6e8189f9d053","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"120c2802-b902-4f6f-9fc6-e9dc234c36e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d1d2263-a1ca-4228-81dc-d3cad2cb4103","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d904ff69-d790-42e1-968d-d98335c4ba1e","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6175a05c-8d48-4db1-97a3-f66939c811e6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27a5cb26-478e-4331-85a9-a2c45373712a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a045cd17-94fb-4bb7-84a6-93ce47448460","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5dfaef21-c07e-4e46-8877-113627f722ef","IsCreationKey":false,"Key":9.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_gear_librarian/spr_gear_librarian.yy b/sprites/spr_gear_librarian/spr_gear_librarian.yy index 56227bed6f..f0bc7a6f3f 100644 --- a/sprites/spr_gear_librarian/spr_gear_librarian.yy +++ b/sprites/spr_gear_librarian/spr_gear_librarian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_librarian", "bboxMode":0, "bbox_bottom":67, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian/spr_gear_librarian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"77965c26-dffa-4b7c-baec-050b652956e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian/spr_gear_librarian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"77965c26-dffa-4b7c-baec-050b652956e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy b/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy index e232d04be8..51742ec2db 100644 --- a/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy +++ b/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_librarian_term", "bboxMode":0, "bbox_bottom":68, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"667c99aa-306d-4da1-a87a-14e37704f784","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"667c99aa-306d-4da1-a87a-14e37704f784","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_techa/spr_gear_techa.yy b/sprites/spr_gear_techa/spr_gear_techa.yy index a17db13c56..5e8d4140cd 100644 --- a/sprites/spr_gear_techa/spr_gear_techa.yy +++ b/sprites/spr_gear_techa/spr_gear_techa.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_techa", "bboxMode":0, "bbox_bottom":45, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_techa/spr_gear_techa.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef2b2955-191c-4da1-a891-355c842c33b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_techa/spr_gear_techa.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef2b2955-191c-4da1-a891-355c842c33b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy index 08745c2691..8db0a8e2df 100644 --- a/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy +++ b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_honor_guard", "bboxMode":0, "bbox_bottom":220, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36357777-96a0-45ba-9211-32f9f0c807f9","name":"36357777-96a0-45ba-9211-32f9f0c807f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"32642e56-6593-4c11-b48b-a780b48d9332","name":"32642e56-6593-4c11-b48b-a780b48d9332","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36357777-96a0-45ba-9211-32f9f0c807f9","name":"36357777-96a0-45ba-9211-32f9f0c807f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"32642e56-6593-4c11-b48b-a780b48d9332","name":"32642e56-6593-4c11-b48b-a780b48d9332","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c66cce41-4b23-4476-82b8-6046bf8be6aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36357777-96a0-45ba-9211-32f9f0c807f9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7581b692-35d0-4dad-91d1-ac5b40020afc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"497b6308-557a-4877-8fe6-4a0ea6442f0b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd2d972b-1bff-4558-a244-a0de713ea441","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af180f89-ae18-4ab3-973a-12d8556cf866","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32642e56-6593-4c11-b48b-a780b48d9332","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed017c0c-0f4f-4fd1-90d3-ae09be762548","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c66cce41-4b23-4476-82b8-6046bf8be6aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36357777-96a0-45ba-9211-32f9f0c807f9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7581b692-35d0-4dad-91d1-ac5b40020afc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"497b6308-557a-4877-8fe6-4a0ea6442f0b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd2d972b-1bff-4558-a244-a0de713ea441","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af180f89-ae18-4ab3-973a-12d8556cf866","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32642e56-6593-4c11-b48b-a780b48d9332","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed017c0c-0f4f-4fd1-90d3-ae09be762548","IsCreationKey":false,"Key":5.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_generic_sgt_mk3/spr_generic_sgt_mk3.yy b/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy index c39da9ff02..6bab660fe1 100644 --- a/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy +++ b/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk3", "bboxMode":0, "bbox_bottom":52, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"453548fa-1925-4ac4-90d9-0c74608db18c","name":"453548fa-1925-4ac4-90d9-0c74608db18c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7944d23-8f13-4749-a313-106c17d901c2","name":"f7944d23-8f13-4749-a313-106c17d901c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"453548fa-1925-4ac4-90d9-0c74608db18c","name":"453548fa-1925-4ac4-90d9-0c74608db18c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7944d23-8f13-4749-a313-106c17d901c2","name":"f7944d23-8f13-4749-a313-106c17d901c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,18 +72,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"453548fa-1925-4ac4-90d9-0c74608db18c","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f18dc78f-1df7-4a87-9c60-07a21e6cd3ff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ea9148c-d1c5-485c-a7df-c8cc7b6a94cd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7944d23-8f13-4749-a313-106c17d901c2","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6a04fe9-de4e-4858-a54d-192e9865f75b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f21a607d-23de-4ee9-a963-1d5670934960","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"453548fa-1925-4ac4-90d9-0c74608db18c","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f18dc78f-1df7-4a87-9c60-07a21e6cd3ff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ea9148c-d1c5-485c-a7df-c8cc7b6a94cd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7944d23-8f13-4749-a313-106c17d901c2","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6a04fe9-de4e-4858-a54d-192e9865f75b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f21a607d-23de-4ee9-a963-1d5670934960","IsCreationKey":false,"Key":3.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_generic_sgt_mk4/spr_generic_sgt_mk4.yy b/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy index d4908f2dde..154b1c56e0 100644 --- a/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy +++ b/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk4", "bboxMode":0, "bbox_bottom":45, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6c40433-b796-4087-8033-516468284ec7","name":"b6c40433-b796-4087-8033-516468284ec7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc2837e3-fa50-4484-8af1-55fc959611a1","name":"bc2837e3-fa50-4484-8af1-55fc959611a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"900ad528-7741-42ae-9cf8-d3e761688379","name":"900ad528-7741-42ae-9cf8-d3e761688379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6c40433-b796-4087-8033-516468284ec7","name":"b6c40433-b796-4087-8033-516468284ec7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc2837e3-fa50-4484-8af1-55fc959611a1","name":"bc2837e3-fa50-4484-8af1-55fc959611a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"900ad528-7741-42ae-9cf8-d3e761688379","name":"900ad528-7741-42ae-9cf8-d3e761688379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6c40433-b796-4087-8033-516468284ec7","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02c37a45-2f0e-437d-b364-6d736cc0a01f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc2837e3-fa50-4484-8af1-55fc959611a1","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"492dbd86-e50a-454b-a40f-73a2da04c7a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37048c1b-0257-4c88-b79e-5a6c77932e58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"900ad528-7741-42ae-9cf8-d3e761688379","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"caf6c31f-886a-4064-9066-8b4ff4595fbb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4cbb5f2-c487-41f6-b212-5c0cb15007d8","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6c40433-b796-4087-8033-516468284ec7","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02c37a45-2f0e-437d-b364-6d736cc0a01f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc2837e3-fa50-4484-8af1-55fc959611a1","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"492dbd86-e50a-454b-a40f-73a2da04c7a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37048c1b-0257-4c88-b79e-5a6c77932e58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"900ad528-7741-42ae-9cf8-d3e761688379","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"caf6c31f-886a-4064-9066-8b4ff4595fbb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4cbb5f2-c487-41f6-b212-5c0cb15007d8","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy b/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy index fb2c47b161..b93562cccf 100644 --- a/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy +++ b/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk5", "bboxMode":0, "bbox_bottom":43, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1a21855-a9d4-4358-8ebd-1048afb81d7d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"381c6466-48f6-4b57-be56-0cdd64b73a3b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1251b2d8-d6bc-4335-98dd-69d1d7cf2190","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35bb15b6-d4bd-4c6b-899e-6f3123a0af00","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1a21855-a9d4-4358-8ebd-1048afb81d7d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"381c6466-48f6-4b57-be56-0cdd64b73a3b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1251b2d8-d6bc-4335-98dd-69d1d7cf2190","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35bb15b6-d4bd-4c6b-899e-6f3123a0af00","IsCreationKey":false,"Key":3.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_generic_sgt_mk6/spr_generic_sgt_mk6.yy b/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy index 41766d177b..5efaa2287e 100644 --- a/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy +++ b/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk6", "bboxMode":0, "bbox_bottom":47, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b049956f-a206-4f0e-89b0-a8989e560f2c","name":"b049956f-a206-4f0e-89b0-a8989e560f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b049956f-a206-4f0e-89b0-a8989e560f2c","name":"b049956f-a206-4f0e-89b0-a8989e560f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"282fff07-a56c-4045-8ba9-50ba49007c35","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b049956f-a206-4f0e-89b0-a8989e560f2c","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a5c4b8f-5f6a-4840-82fe-ae6c470cbe6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e83fe56-93a9-472c-a9e1-1535a32175bf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d0dfab9-7210-42a2-9f17-299cfd354675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"282fff07-a56c-4045-8ba9-50ba49007c35","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b049956f-a206-4f0e-89b0-a8989e560f2c","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a5c4b8f-5f6a-4840-82fe-ae6c470cbe6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e83fe56-93a9-472c-a9e1-1535a32175bf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d0dfab9-7210-42a2-9f17-299cfd354675","IsCreationKey":false,"Key":3.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_generic_sgt_mk7/spr_generic_sgt_mk7.yy b/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy index a6375c6522..849bc33ab3 100644 --- a/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy +++ b/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk7", "bboxMode":0, "bbox_bottom":44, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c3b67ba-1b77-4057-8c08-116efd008557","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10a73f48-bf94-4d68-a6ba-796328bc9468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15f3b232-4e61-44bd-81bc-8db8deeaf9c7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95fce0de-01d0-427d-b459-9896ef7ca6a8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c3b67ba-1b77-4057-8c08-116efd008557","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10a73f48-bf94-4d68-a6ba-796328bc9468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15f3b232-4e61-44bd-81bc-8db8deeaf9c7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95fce0de-01d0-427d-b459-9896ef7ca6a8","IsCreationKey":false,"Key":3.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_generic_sgt_mk8/spr_generic_sgt_mk8.yy b/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy index fe93a50a38..5f0fb069ac 100644 --- a/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy +++ b/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk8", "bboxMode":0, "bbox_bottom":38, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afed0983-ac24-4636-8ae7-bd6b7a5dd3eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1bcb94b-074f-4058-b0a0-8a9821d76426","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9d9b87b-7b58-4264-bede-ec8af0948dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9a1f0377-1634-4668-8cbf-80e38851a8c1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afed0983-ac24-4636-8ae7-bd6b7a5dd3eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1bcb94b-074f-4058-b0a0-8a9821d76426","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9d9b87b-7b58-4264-bede-ec8af0948dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9a1f0377-1634-4668-8cbf-80e38851a8c1","IsCreationKey":false,"Key":3.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_generic_terminator_sgt/spr_generic_terminator_sgt.yy b/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy index 26a1d7935e..720feb2b4c 100644 --- a/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy +++ b/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_terminator_sgt", "bboxMode":0, "bbox_bottom":88, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3617c3e-e674-42da-8f90-9aec47330e26","name":"e3617c3e-e674-42da-8f90-9aec47330e26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5cba2713-473a-411e-a40b-a7df58ed2a51","name":"5cba2713-473a-411e-a40b-a7df58ed2a51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3617c3e-e674-42da-8f90-9aec47330e26","name":"e3617c3e-e674-42da-8f90-9aec47330e26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5cba2713-473a-411e-a40b-a7df58ed2a51","name":"5cba2713-473a-411e-a40b-a7df58ed2a51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"205ae050-2827-43b3-83f8-260a37cf51ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a03d1e4-27c9-4ac7-a6c8-c9c473a7909f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3617c3e-e674-42da-8f90-9aec47330e26","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bccdd95-8e5b-4499-ab2d-6e379b86f0a4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cba2713-473a-411e-a40b-a7df58ed2a51","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c7eb130-195d-4ae5-815d-826040a80aa9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"205ae050-2827-43b3-83f8-260a37cf51ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a03d1e4-27c9-4ac7-a6c8-c9c473a7909f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3617c3e-e674-42da-8f90-9aec47330e26","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bccdd95-8e5b-4499-ab2d-6e379b86f0a4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cba2713-473a-411e-a40b-a7df58ed2a51","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c7eb130-195d-4ae5-815d-826040a80aa9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gladiator_crest/spr_gladiator_crest.yy b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy index 3e16f75b9e..801c83c38f 100644 --- a/sprites/spr_gladiator_crest/spr_gladiator_crest.yy +++ b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gladiator_crest", "bboxMode":0, "bbox_bottom":70, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ff8c3aa8-dc36-45e8-b043-45038d329396","name":"ff8c3aa8-dc36-45e8-b043-45038d329396","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff8c3aa8-dc36-45e8-b043-45038d329396","name":"ff8c3aa8-dc36-45e8-b043-45038d329396","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8c3aa8-dc36-45e8-b043-45038d329396","path":"sprites/spr_gladiator_crest/spr_gladiator_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b14dec7-6f59-49b0-8561-5319c7501f32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8c3aa8-dc36-45e8-b043-45038d329396","path":"sprites/spr_gladiator_crest/spr_gladiator_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b14dec7-6f59-49b0-8561-5319c7501f32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_glob/spr_glob.yy b/sprites/spr_glob/spr_glob.yy index dd2b112d92..30b8a12225 100644 --- a/sprites/spr_glob/spr_glob.yy +++ b/sprites/spr_glob/spr_glob.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_glob", "bboxMode":0, "bbox_bottom":6, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"94125f36-c928-402d-a8e7-3cbca709e174","name":"94125f36-c928-402d-a8e7-3cbca709e174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"94125f36-c928-402d-a8e7-3cbca709e174","name":"94125f36-c928-402d-a8e7-3cbca709e174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"94125f36-c928-402d-a8e7-3cbca709e174","path":"sprites/spr_glob/spr_glob.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80196786-2c38-4868-9fe7-eb855f01c0f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"94125f36-c928-402d-a8e7-3cbca709e174","path":"sprites/spr_glob/spr_glob.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80196786-2c38-4868-9fe7-eb855f01c0f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy b/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy index 69a0e0924a..afacf47b11 100644 --- a/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy +++ b/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gothic_numbers_right_pauldron", "bboxMode":0, "bbox_bottom":65, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87e5fd39-f168-48c2-a276-31cf1b797199","name":"87e5fd39-f168-48c2-a276-31cf1b797199","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5033b836-0568-4d4c-b81a-99fe09e568a2","name":"5033b836-0568-4d4c-b81a-99fe09e568a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da9a8b66-05d9-4947-9787-cae8b9015321","name":"da9a8b66-05d9-4947-9787-cae8b9015321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87e5fd39-f168-48c2-a276-31cf1b797199","name":"87e5fd39-f168-48c2-a276-31cf1b797199","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5033b836-0568-4d4c-b81a-99fe09e568a2","name":"5033b836-0568-4d4c-b81a-99fe09e568a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da9a8b66-05d9-4947-9787-cae8b9015321","name":"da9a8b66-05d9-4947-9787-cae8b9015321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e8f2da6-4c4a-4e13-821d-699b0e5f5e6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e5fd39-f168-48c2-a276-31cf1b797199","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6aac9d83-a704-44dd-acc9-c66ceb93e2c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d41ebca2-1e7a-4bfb-9ce1-0b68abced744","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b14dbd68-c1b6-4987-8559-ea45895073a6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5033b836-0568-4d4c-b81a-99fe09e568a2","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d75f6766-3b0f-4a70-a35a-c9a7c72e1896","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eec4d90e-c9c8-4bca-97ae-b61579e5d9ed","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc1805dc-a620-4133-b267-e9fb9480a8d7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"86664de9-14af-4223-aa04-76d40612f5fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de02452f-ee8f-49c4-8a45-db6793a11b9a","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da9a8b66-05d9-4947-9787-cae8b9015321","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94b419a4-05ae-413a-a175-9a6cdd69232b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97cf6ab4-2cb9-4a8e-9831-3ad6b5e8dfa8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e8f2da6-4c4a-4e13-821d-699b0e5f5e6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e5fd39-f168-48c2-a276-31cf1b797199","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6aac9d83-a704-44dd-acc9-c66ceb93e2c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d41ebca2-1e7a-4bfb-9ce1-0b68abced744","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b14dbd68-c1b6-4987-8559-ea45895073a6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5033b836-0568-4d4c-b81a-99fe09e568a2","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d75f6766-3b0f-4a70-a35a-c9a7c72e1896","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eec4d90e-c9c8-4bca-97ae-b61579e5d9ed","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc1805dc-a620-4133-b267-e9fb9480a8d7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"86664de9-14af-4223-aa04-76d40612f5fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de02452f-ee8f-49c4-8a45-db6793a11b9a","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da9a8b66-05d9-4947-9787-cae8b9015321","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94b419a4-05ae-413a-a175-9a6cdd69232b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97cf6ab4-2cb9-4a8e-9831-3ad6b5e8dfa8","IsCreationKey":false,"Key":10.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_green_las/spr_green_las.yy b/sprites/spr_green_las/spr_green_las.yy index 0f813ace20..7c98e3a1ed 100644 --- a/sprites/spr_green_las/spr_green_las.yy +++ b/sprites/spr_green_las/spr_green_las.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_green_las", "bboxMode":0, "bbox_bottom":1, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","path":"sprites/spr_green_las/spr_green_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b611c7a-0b17-4060-94b2-33aaf44deca6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","path":"sprites/spr_green_las/spr_green_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b611c7a-0b17-4060-94b2-33aaf44deca6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ground_conv/spr_ground_conv.yy b/sprites/spr_ground_conv/spr_ground_conv.yy index b72e0d7601..a83983405c 100644 --- a/sprites/spr_ground_conv/spr_ground_conv.yy +++ b/sprites/spr_ground_conv/spr_ground_conv.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ground_conv", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea315c54-c59c-4101-82ca-8cc522b67181","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea315c54-c59c-4101-82ca-8cc522b67181","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ground_las/spr_ground_las.yy b/sprites/spr_ground_las/spr_ground_las.yy index 33bded8a6f..7533cf3ba3 100644 --- a/sprites/spr_ground_las/spr_ground_las.yy +++ b/sprites/spr_ground_las/spr_ground_las.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ground_las", "bboxMode":0, "bbox_bottom":1, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","path":"sprites/spr_ground_las/spr_ground_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63b90f58-443f-48cf-a161-19699769319a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","path":"sprites/spr_ground_las/spr_ground_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63b90f58-443f-48cf-a161-19699769319a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ground_plasma/spr_ground_plasma.yy b/sprites/spr_ground_plasma/spr_ground_plasma.yy index f314a224e8..05126e1263 100644 --- a/sprites/spr_ground_plasma/spr_ground_plasma.yy +++ b/sprites/spr_ground_plasma/spr_ground_plasma.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ground_plasma", "bboxMode":0, "bbox_bottom":4, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","path":"sprites/spr_ground_plasma/spr_ground_plasma.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09513bc0-464f-4962-83e5-0b1bcca916ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","path":"sprites/spr_ground_plasma/spr_ground_plasma.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09513bc0-464f-4962-83e5-0b1bcca916ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_happenings_blue/spr_happenings_blue.yy b/sprites/spr_happenings_blue/spr_happenings_blue.yy index cd2130b81c..fb0cdf17bc 100644 --- a/sprites/spr_happenings_blue/spr_happenings_blue.yy +++ b/sprites/spr_happenings_blue/spr_happenings_blue.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_blue", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"398323a5-85ff-465f-8aeb-f070a17fcf79","name":"398323a5-85ff-465f-8aeb-f070a17fcf79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"12c01e65-b298-4648-a16f-47fb4e9072e9","name":"12c01e65-b298-4648-a16f-47fb4e9072e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"873b5ead-4f37-40c8-b996-1ffa989d9193","name":"873b5ead-4f37-40c8-b996-1ffa989d9193","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5e02804-71c1-4bae-a691-298c956dce73","name":"c5e02804-71c1-4bae-a691-298c956dce73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"337ce7db-005f-4394-bd10-38ae46363ea5","name":"337ce7db-005f-4394-bd10-38ae46363ea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"425b0eea-3478-4049-8d47-836d531fa61e","name":"425b0eea-3478-4049-8d47-836d531fa61e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b742df01-f74f-47fd-adee-ca128d96d708","name":"b742df01-f74f-47fd-adee-ca128d96d708","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79399347-d2ec-4a18-b332-b3f521b3e350","name":"79399347-d2ec-4a18-b332-b3f521b3e350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67fa920f-1a24-4316-80ad-e80e670533e6","name":"67fa920f-1a24-4316-80ad-e80e670533e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"156546e5-1266-4235-97b9-320f5e6c04f7","name":"156546e5-1266-4235-97b9-320f5e6c04f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"398323a5-85ff-465f-8aeb-f070a17fcf79","name":"398323a5-85ff-465f-8aeb-f070a17fcf79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"12c01e65-b298-4648-a16f-47fb4e9072e9","name":"12c01e65-b298-4648-a16f-47fb4e9072e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"873b5ead-4f37-40c8-b996-1ffa989d9193","name":"873b5ead-4f37-40c8-b996-1ffa989d9193","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5e02804-71c1-4bae-a691-298c956dce73","name":"c5e02804-71c1-4bae-a691-298c956dce73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"337ce7db-005f-4394-bd10-38ae46363ea5","name":"337ce7db-005f-4394-bd10-38ae46363ea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"425b0eea-3478-4049-8d47-836d531fa61e","name":"425b0eea-3478-4049-8d47-836d531fa61e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b742df01-f74f-47fd-adee-ca128d96d708","name":"b742df01-f74f-47fd-adee-ca128d96d708","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79399347-d2ec-4a18-b332-b3f521b3e350","name":"79399347-d2ec-4a18-b332-b3f521b3e350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67fa920f-1a24-4316-80ad-e80e670533e6","name":"67fa920f-1a24-4316-80ad-e80e670533e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"156546e5-1266-4235-97b9-320f5e6c04f7","name":"156546e5-1266-4235-97b9-320f5e6c04f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8630044a-2c21-4a9e-a95f-1613546d93cc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ecc01ce-e9dc-430c-8376-3735a9d69ff3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3680579-0a21-439f-b143-13defbc8b5a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"398323a5-85ff-465f-8aeb-f070a17fcf79","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54d24c23-94d9-4b6e-a0f8-9258e797b2bc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"12c01e65-b298-4648-a16f-47fb4e9072e9","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"786fb1c2-ee0d-4b9f-810e-ccd2154aa8ea","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"873b5ead-4f37-40c8-b996-1ffa989d9193","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"51d3ef1a-4578-4542-8abb-758d1eceac9b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db1f4c2a-b2bf-4cbc-a59a-689167d7cad9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c91c1690-a0c8-4fa6-a36c-e6ea3fccae2d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcbd78fa-2746-4204-ac4a-4e607838beff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5e02804-71c1-4bae-a691-298c956dce73","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d24ec6f-1fa8-4ee3-96e8-d7586529bfa0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5effc3bf-d1bc-4ba0-9c17-b30c871b8119","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ccfb57a-950d-4e38-96ed-5a25116a2836","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"337ce7db-005f-4394-bd10-38ae46363ea5","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf3031aa-f6ca-4d6b-b74a-229a5dbde8e8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f983fd-1955-4b75-bbbd-f8216219604c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"425b0eea-3478-4049-8d47-836d531fa61e","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bbd7dbf-40af-4314-b773-32fe095410d1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ce0072a-f108-4df4-8ef8-a7bd4d103d69","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b742df01-f74f-47fd-adee-ca128d96d708","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a275856-0da3-4069-8446-b50868f374dd","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74b4c830-cc03-4088-8136-b698c868304c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04d4884f-23e6-4034-a002-66c2c1e13b25","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24c45266-51df-4a6e-8394-77882acc7542","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c9e32754-8d11-438e-a48e-f6fc4dc94818","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79399347-d2ec-4a18-b332-b3f521b3e350","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf8d3d45-e7b0-41ff-bdf5-bc3d6c82c834","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67fa920f-1a24-4316-80ad-e80e670533e6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5876f540-45f1-4f85-a52b-d022b55d42db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1125a58a-0ab6-484c-b8c7-75a1044fdd9d","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b03965fd-f705-4b11-ac8d-05787e0e8454","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"156546e5-1266-4235-97b9-320f5e6c04f7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"585d085b-6a95-4d15-88a6-4dda3d20cbf2","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8630044a-2c21-4a9e-a95f-1613546d93cc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ecc01ce-e9dc-430c-8376-3735a9d69ff3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3680579-0a21-439f-b143-13defbc8b5a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"398323a5-85ff-465f-8aeb-f070a17fcf79","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54d24c23-94d9-4b6e-a0f8-9258e797b2bc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"12c01e65-b298-4648-a16f-47fb4e9072e9","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"786fb1c2-ee0d-4b9f-810e-ccd2154aa8ea","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"873b5ead-4f37-40c8-b996-1ffa989d9193","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51d3ef1a-4578-4542-8abb-758d1eceac9b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db1f4c2a-b2bf-4cbc-a59a-689167d7cad9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c91c1690-a0c8-4fa6-a36c-e6ea3fccae2d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcbd78fa-2746-4204-ac4a-4e607838beff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5e02804-71c1-4bae-a691-298c956dce73","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d24ec6f-1fa8-4ee3-96e8-d7586529bfa0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5effc3bf-d1bc-4ba0-9c17-b30c871b8119","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ccfb57a-950d-4e38-96ed-5a25116a2836","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"337ce7db-005f-4394-bd10-38ae46363ea5","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf3031aa-f6ca-4d6b-b74a-229a5dbde8e8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34f983fd-1955-4b75-bbbd-f8216219604c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"425b0eea-3478-4049-8d47-836d531fa61e","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bbd7dbf-40af-4314-b773-32fe095410d1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ce0072a-f108-4df4-8ef8-a7bd4d103d69","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b742df01-f74f-47fd-adee-ca128d96d708","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a275856-0da3-4069-8446-b50868f374dd","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74b4c830-cc03-4088-8136-b698c868304c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04d4884f-23e6-4034-a002-66c2c1e13b25","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24c45266-51df-4a6e-8394-77882acc7542","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c9e32754-8d11-438e-a48e-f6fc4dc94818","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79399347-d2ec-4a18-b332-b3f521b3e350","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf8d3d45-e7b0-41ff-bdf5-bc3d6c82c834","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67fa920f-1a24-4316-80ad-e80e670533e6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5876f540-45f1-4f85-a52b-d022b55d42db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1125a58a-0ab6-484c-b8c7-75a1044fdd9d","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b03965fd-f705-4b11-ac8d-05787e0e8454","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"156546e5-1266-4235-97b9-320f5e6c04f7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"585d085b-6a95-4d15-88a6-4dda3d20cbf2","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_happenings_green/spr_happenings_green.yy b/sprites/spr_happenings_green/spr_happenings_green.yy index 0f839e7fcb..0068510186 100644 --- a/sprites/spr_happenings_green/spr_happenings_green.yy +++ b/sprites/spr_happenings_green/spr_happenings_green.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_green", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e838345a-58e0-4c27-8ac5-e0293dc62516","name":"e838345a-58e0-4c27-8ac5-e0293dc62516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31948616-30f8-49af-aac8-36578e149f6d","name":"31948616-30f8-49af-aac8-36578e149f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93a8b121-857c-436d-80f4-190f9e822d48","name":"93a8b121-857c-436d-80f4-190f9e822d48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b34a906-9e51-4d50-890e-c0464cf186c1","name":"3b34a906-9e51-4d50-890e-c0464cf186c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be48cb9e-c609-45fd-84ff-262941825380","name":"be48cb9e-c609-45fd-84ff-262941825380","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8df70f45-6df1-4469-8cac-6c18c853c909","name":"8df70f45-6df1-4469-8cac-6c18c853c909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9d66e71a-806a-4c69-8f85-c61673e764ec","name":"9d66e71a-806a-4c69-8f85-c61673e764ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e838345a-58e0-4c27-8ac5-e0293dc62516","name":"e838345a-58e0-4c27-8ac5-e0293dc62516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31948616-30f8-49af-aac8-36578e149f6d","name":"31948616-30f8-49af-aac8-36578e149f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93a8b121-857c-436d-80f4-190f9e822d48","name":"93a8b121-857c-436d-80f4-190f9e822d48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b34a906-9e51-4d50-890e-c0464cf186c1","name":"3b34a906-9e51-4d50-890e-c0464cf186c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be48cb9e-c609-45fd-84ff-262941825380","name":"be48cb9e-c609-45fd-84ff-262941825380","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8df70f45-6df1-4469-8cac-6c18c853c909","name":"8df70f45-6df1-4469-8cac-6c18c853c909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d66e71a-806a-4c69-8f85-c61673e764ec","name":"9d66e71a-806a-4c69-8f85-c61673e764ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"745c819e-96d8-4c95-8b47-89ff41c247c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e838345a-58e0-4c27-8ac5-e0293dc62516","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ce1a5f9-812b-441a-a891-60860d9cf989","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31948616-30f8-49af-aac8-36578e149f6d","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"950fa642-1358-4e91-9b3a-13ecf677c112","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93a8b121-857c-436d-80f4-190f9e822d48","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55800409-f864-4c40-8ece-15d95fe2b7f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35b2b72f-a58f-46ae-8e6a-197c5a52dd2e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"638848fb-2f6c-4926-b759-4c43d0107f62","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b34a906-9e51-4d50-890e-c0464cf186c1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"728bd650-abfe-415c-aa44-542f4871435c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be48cb9e-c609-45fd-84ff-262941825380","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b084b89f-9863-4b53-836d-541d30ebdc52","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a90b8bb-d548-4a36-bb7c-22b8c72f389d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df70f45-6df1-4469-8cac-6c18c853c909","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"964f61ad-8913-4277-beaa-b1fb46e30794","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b5ae6b0-ecbd-464b-9098-6cba869713cc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be0cbcbd-3f06-4fbb-9186-97abc63b9765","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a39bba5-201e-4fa1-903e-c7e99bf6009a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76ddaa53-58cd-49a0-9fa4-6f61ae15d272","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a467f7e2-ccae-4747-90fc-73374b7159bf","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"427351d0-5d22-40b7-ba8b-f59e9f53a436","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d66e71a-806a-4c69-8f85-c61673e764ec","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d054efea-45a0-4dc8-8f13-a322cf8f72b8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a811970b-129e-4008-92dd-6302786efe29","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fb84d53-7b08-48b9-a504-7065fc374de4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ee9e33d-a006-4891-9cf5-a55783e3d01b","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19ce3321-9253-46f0-b4c0-d25848d837d9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d757e25b-b666-41be-854c-f7ba9dad9992","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15f3cb7e-0910-4c68-b1b7-cfe0b05b485b","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7af914d7-8869-4b94-9f92-0352412527d3","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c949337-3477-45c9-9edb-ce35f327e368","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15d6f074-c5d6-4261-b0b8-947b5447cce0","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"745c819e-96d8-4c95-8b47-89ff41c247c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e838345a-58e0-4c27-8ac5-e0293dc62516","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ce1a5f9-812b-441a-a891-60860d9cf989","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31948616-30f8-49af-aac8-36578e149f6d","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"950fa642-1358-4e91-9b3a-13ecf677c112","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93a8b121-857c-436d-80f4-190f9e822d48","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55800409-f864-4c40-8ece-15d95fe2b7f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35b2b72f-a58f-46ae-8e6a-197c5a52dd2e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"638848fb-2f6c-4926-b759-4c43d0107f62","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b34a906-9e51-4d50-890e-c0464cf186c1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"728bd650-abfe-415c-aa44-542f4871435c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be48cb9e-c609-45fd-84ff-262941825380","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b084b89f-9863-4b53-836d-541d30ebdc52","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a90b8bb-d548-4a36-bb7c-22b8c72f389d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df70f45-6df1-4469-8cac-6c18c853c909","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"964f61ad-8913-4277-beaa-b1fb46e30794","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b5ae6b0-ecbd-464b-9098-6cba869713cc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be0cbcbd-3f06-4fbb-9186-97abc63b9765","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a39bba5-201e-4fa1-903e-c7e99bf6009a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76ddaa53-58cd-49a0-9fa4-6f61ae15d272","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a467f7e2-ccae-4747-90fc-73374b7159bf","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"427351d0-5d22-40b7-ba8b-f59e9f53a436","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d66e71a-806a-4c69-8f85-c61673e764ec","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d054efea-45a0-4dc8-8f13-a322cf8f72b8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a811970b-129e-4008-92dd-6302786efe29","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fb84d53-7b08-48b9-a504-7065fc374de4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ee9e33d-a006-4891-9cf5-a55783e3d01b","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19ce3321-9253-46f0-b4c0-d25848d837d9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d757e25b-b666-41be-854c-f7ba9dad9992","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15f3cb7e-0910-4c68-b1b7-cfe0b05b485b","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7af914d7-8869-4b94-9f92-0352412527d3","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c949337-3477-45c9-9edb-ce35f327e368","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15d6f074-c5d6-4261-b0b8-947b5447cce0","IsCreationKey":false,"Key":25.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_happenings_purple/spr_happenings_purple.yy b/sprites/spr_happenings_purple/spr_happenings_purple.yy index dbf4174427..4aa0565da9 100644 --- a/sprites/spr_happenings_purple/spr_happenings_purple.yy +++ b/sprites/spr_happenings_purple/spr_happenings_purple.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_purple", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0e251917-274a-4022-aebe-7f1ef84f4d18","name":"0e251917-274a-4022-aebe-7f1ef84f4d18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8b1eadc-36d8-4f8d-8347-009726750698","name":"e8b1eadc-36d8-4f8d-8347-009726750698","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07c922be-6bc2-4f94-9727-696e167415e9","name":"07c922be-6bc2-4f94-9727-696e167415e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"787b9142-d318-460e-962e-ee9cd7be3812","name":"787b9142-d318-460e-962e-ee9cd7be3812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"007fc063-17cd-4e57-b579-c55acada2c3a","name":"007fc063-17cd-4e57-b579-c55acada2c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab63f795-03df-4b56-9112-2edb1303ade0","name":"ab63f795-03df-4b56-9112-2edb1303ade0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0bf10494-4d52-4155-a810-c7beeaad6556","name":"0bf10494-4d52-4155-a810-c7beeaad6556","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b07c48e3-7247-4d41-917e-25b96960603f","name":"b07c48e3-7247-4d41-917e-25b96960603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14b440f8-abee-438e-b5b0-d7740be4d023","name":"14b440f8-abee-438e-b5b0-d7740be4d023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1be2ebf-14c2-44c3-8198-02012b07b454","name":"d1be2ebf-14c2-44c3-8198-02012b07b454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3183bac8-7d63-4455-92df-f84c41a528e4","name":"3183bac8-7d63-4455-92df-f84c41a528e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e251917-274a-4022-aebe-7f1ef84f4d18","name":"0e251917-274a-4022-aebe-7f1ef84f4d18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8b1eadc-36d8-4f8d-8347-009726750698","name":"e8b1eadc-36d8-4f8d-8347-009726750698","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07c922be-6bc2-4f94-9727-696e167415e9","name":"07c922be-6bc2-4f94-9727-696e167415e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"787b9142-d318-460e-962e-ee9cd7be3812","name":"787b9142-d318-460e-962e-ee9cd7be3812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"007fc063-17cd-4e57-b579-c55acada2c3a","name":"007fc063-17cd-4e57-b579-c55acada2c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab63f795-03df-4b56-9112-2edb1303ade0","name":"ab63f795-03df-4b56-9112-2edb1303ade0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0bf10494-4d52-4155-a810-c7beeaad6556","name":"0bf10494-4d52-4155-a810-c7beeaad6556","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b07c48e3-7247-4d41-917e-25b96960603f","name":"b07c48e3-7247-4d41-917e-25b96960603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14b440f8-abee-438e-b5b0-d7740be4d023","name":"14b440f8-abee-438e-b5b0-d7740be4d023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1be2ebf-14c2-44c3-8198-02012b07b454","name":"d1be2ebf-14c2-44c3-8198-02012b07b454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3183bac8-7d63-4455-92df-f84c41a528e4","name":"3183bac8-7d63-4455-92df-f84c41a528e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e251917-274a-4022-aebe-7f1ef84f4d18","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99e28c59-beaf-400b-8431-9914197ed53f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1eadc-36d8-4f8d-8347-009726750698","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49a48d30-cfc2-4b5b-9d89-a7a7bd3192a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"803e093b-ea1e-44cf-ab17-556e227c97e7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f1ebd62-e696-4644-b6e4-0677a7062937","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07c922be-6bc2-4f94-9727-696e167415e9","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"216fa637-5887-438e-bc8d-7d8365ccc14c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fb83f23-e74d-4fe0-adf1-6d3e5f61da5d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2041d30a-4bac-42f2-88d8-a4ee5ba766f5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"222a9927-7e69-4a21-b86f-79dedd00b175","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"787b9142-d318-460e-962e-ee9cd7be3812","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e650480b-fc10-418b-94eb-555e2d95c1d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f049630-1fbe-4931-a67e-2790e6ca19bb","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3928b504-cf3f-4d64-8abb-d52cfa9ad8ac","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"007fc063-17cd-4e57-b579-c55acada2c3a","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8257ae86-ed7d-4c6c-b42b-623fd22d6cb3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab63f795-03df-4b56-9112-2edb1303ade0","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a853e2bd-258c-4792-81f0-0c2dd1fec278","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adac555f-9e31-45dc-b15e-d17f482548d2","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf10494-4d52-4155-a810-c7beeaad6556","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0385d9ab-58d6-4617-9b29-dc1ccc2e6d4c","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c89f3524-bf42-4eb9-809a-50843abe2909","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9623fc7a-9d63-4fd2-825d-11fe1b9abba5","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b07c48e3-7247-4d41-917e-25b96960603f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2b7a1dc-63d3-429b-92df-7668d84472b3","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14b440f8-abee-438e-b5b0-d7740be4d023","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f5726aa-d67c-4b40-ba42-c252d41af20a","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1be2ebf-14c2-44c3-8198-02012b07b454","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e6be25f-0897-420e-9f3e-b2c8fd213e00","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f1f49eaf-e95b-43ce-9729-dfc34380fed9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3183bac8-7d63-4455-92df-f84c41a528e4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"692aecbc-cacc-48fc-a477-be9a83c215c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cea7b002-c69b-4de4-995e-ff8f43fb02d5","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e5169dd-744c-4965-bbfd-0b681a9cee55","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"953c6f1d-faca-4f58-a533-a79734d78256","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43a591f8-5ad0-4222-bf9a-f71878d35e58","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e251917-274a-4022-aebe-7f1ef84f4d18","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99e28c59-beaf-400b-8431-9914197ed53f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1eadc-36d8-4f8d-8347-009726750698","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49a48d30-cfc2-4b5b-9d89-a7a7bd3192a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"803e093b-ea1e-44cf-ab17-556e227c97e7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f1ebd62-e696-4644-b6e4-0677a7062937","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07c922be-6bc2-4f94-9727-696e167415e9","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"216fa637-5887-438e-bc8d-7d8365ccc14c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fb83f23-e74d-4fe0-adf1-6d3e5f61da5d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2041d30a-4bac-42f2-88d8-a4ee5ba766f5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"222a9927-7e69-4a21-b86f-79dedd00b175","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"787b9142-d318-460e-962e-ee9cd7be3812","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e650480b-fc10-418b-94eb-555e2d95c1d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f049630-1fbe-4931-a67e-2790e6ca19bb","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3928b504-cf3f-4d64-8abb-d52cfa9ad8ac","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"007fc063-17cd-4e57-b579-c55acada2c3a","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8257ae86-ed7d-4c6c-b42b-623fd22d6cb3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab63f795-03df-4b56-9112-2edb1303ade0","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a853e2bd-258c-4792-81f0-0c2dd1fec278","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"adac555f-9e31-45dc-b15e-d17f482548d2","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf10494-4d52-4155-a810-c7beeaad6556","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0385d9ab-58d6-4617-9b29-dc1ccc2e6d4c","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c89f3524-bf42-4eb9-809a-50843abe2909","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9623fc7a-9d63-4fd2-825d-11fe1b9abba5","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b07c48e3-7247-4d41-917e-25b96960603f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2b7a1dc-63d3-429b-92df-7668d84472b3","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14b440f8-abee-438e-b5b0-d7740be4d023","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f5726aa-d67c-4b40-ba42-c252d41af20a","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1be2ebf-14c2-44c3-8198-02012b07b454","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e6be25f-0897-420e-9f3e-b2c8fd213e00","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f1f49eaf-e95b-43ce-9729-dfc34380fed9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3183bac8-7d63-4455-92df-f84c41a528e4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"692aecbc-cacc-48fc-a477-be9a83c215c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cea7b002-c69b-4de4-995e-ff8f43fb02d5","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e5169dd-744c-4965-bbfd-0b681a9cee55","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"953c6f1d-faca-4f58-a533-a79734d78256","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43a591f8-5ad0-4222-bf9a-f71878d35e58","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_happenings_red/spr_happenings_red.yy b/sprites/spr_happenings_red/spr_happenings_red.yy index 55e4506ab4..a4ef72e0df 100644 --- a/sprites/spr_happenings_red/spr_happenings_red.yy +++ b/sprites/spr_happenings_red/spr_happenings_red.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_red", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed375340-eb85-4e35-8853-8e2aee6158f7","name":"ed375340-eb85-4e35-8853-8e2aee6158f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ca89c50-74ea-439e-8523-e29bbee491be","name":"8ca89c50-74ea-439e-8523-e29bbee491be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce7c933c-d33d-4731-812f-ba20aa79c455","name":"ce7c933c-d33d-4731-812f-ba20aa79c455","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc58c4d0-0336-4946-9c6a-37233859677e","name":"fc58c4d0-0336-4946-9c6a-37233859677e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f30fa43-f771-4473-ae7f-8842fd842305","name":"7f30fa43-f771-4473-ae7f-8842fd842305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75defacc-6f38-4352-aef7-fc555ee4287b","name":"75defacc-6f38-4352-aef7-fc555ee4287b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d38e55da-771c-4f5d-9066-e2e293ca559f","name":"d38e55da-771c-4f5d-9066-e2e293ca559f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed375340-eb85-4e35-8853-8e2aee6158f7","name":"ed375340-eb85-4e35-8853-8e2aee6158f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ca89c50-74ea-439e-8523-e29bbee491be","name":"8ca89c50-74ea-439e-8523-e29bbee491be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce7c933c-d33d-4731-812f-ba20aa79c455","name":"ce7c933c-d33d-4731-812f-ba20aa79c455","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc58c4d0-0336-4946-9c6a-37233859677e","name":"fc58c4d0-0336-4946-9c6a-37233859677e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f30fa43-f771-4473-ae7f-8842fd842305","name":"7f30fa43-f771-4473-ae7f-8842fd842305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75defacc-6f38-4352-aef7-fc555ee4287b","name":"75defacc-6f38-4352-aef7-fc555ee4287b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d38e55da-771c-4f5d-9066-e2e293ca559f","name":"d38e55da-771c-4f5d-9066-e2e293ca559f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a609cf76-7e31-401e-9f69-864eeed79125","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f94f71d-4218-4c65-8562-932bc9aab55e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"336b123b-c603-4911-a5ac-a943e4ab1cde","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad31793a-0d2b-45df-8b1a-8111fa131e4a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed375340-eb85-4e35-8853-8e2aee6158f7","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f299a66-ecd2-437c-8a59-b6f1723872c9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48fa8cfc-885a-4522-bc2e-d06185e88936","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ca89c50-74ea-439e-8523-e29bbee491be","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"342fcc76-339b-4687-a07d-c180450f3c16","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b94f4dd1-b70c-4c68-b654-f81d679070ea","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce7c933c-d33d-4731-812f-ba20aa79c455","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e7ed7e3-9268-4b60-a425-08216d48ab45","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4401e08-0451-4eb1-82a2-49f251e73782","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28edf77c-81e6-41dc-aea5-ddbd45eedb24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7afe7900-0c18-412f-a0b9-99b09b4fc907","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc58c4d0-0336-4946-9c6a-37233859677e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0559484-0dcc-4929-be8b-030fda2cd9f4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f08c81b4-d642-465a-9bcc-ff978084d5e6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f30fa43-f771-4473-ae7f-8842fd842305","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b576b8c2-7730-49ba-b3af-8f041e6a7004","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44a1cae7-a20d-4769-b9d1-ff846d701be0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c9977911-186b-4bb2-b96d-1335acd7ca1a","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6334c8b2-d4ee-4d7e-9f68-b05ffa179c00","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da60249f-07d2-49f5-a278-a58f76072e9e","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2245027-c0c6-462a-999c-70f5cd819845","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75defacc-6f38-4352-aef7-fc555ee4287b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94169a22-41e2-4c11-84d6-e84a40d73fa1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69343e54-7967-430b-ac91-3f2947665045","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c32821f-2eb0-47bd-b28c-ec5ef91289af","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8def33c1-48c4-49ce-87b9-9b48767a4629","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d38e55da-771c-4f5d-9066-e2e293ca559f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30aeda48-f1b7-45e2-96ac-07343b38b05e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a970055-ff2f-4335-a20b-baa03e7a902e","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a609cf76-7e31-401e-9f69-864eeed79125","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f94f71d-4218-4c65-8562-932bc9aab55e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"336b123b-c603-4911-a5ac-a943e4ab1cde","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad31793a-0d2b-45df-8b1a-8111fa131e4a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed375340-eb85-4e35-8853-8e2aee6158f7","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f299a66-ecd2-437c-8a59-b6f1723872c9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48fa8cfc-885a-4522-bc2e-d06185e88936","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ca89c50-74ea-439e-8523-e29bbee491be","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"342fcc76-339b-4687-a07d-c180450f3c16","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b94f4dd1-b70c-4c68-b654-f81d679070ea","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce7c933c-d33d-4731-812f-ba20aa79c455","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e7ed7e3-9268-4b60-a425-08216d48ab45","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4401e08-0451-4eb1-82a2-49f251e73782","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28edf77c-81e6-41dc-aea5-ddbd45eedb24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7afe7900-0c18-412f-a0b9-99b09b4fc907","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc58c4d0-0336-4946-9c6a-37233859677e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0559484-0dcc-4929-be8b-030fda2cd9f4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f08c81b4-d642-465a-9bcc-ff978084d5e6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f30fa43-f771-4473-ae7f-8842fd842305","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b576b8c2-7730-49ba-b3af-8f041e6a7004","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44a1cae7-a20d-4769-b9d1-ff846d701be0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c9977911-186b-4bb2-b96d-1335acd7ca1a","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6334c8b2-d4ee-4d7e-9f68-b05ffa179c00","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da60249f-07d2-49f5-a278-a58f76072e9e","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2245027-c0c6-462a-999c-70f5cd819845","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75defacc-6f38-4352-aef7-fc555ee4287b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94169a22-41e2-4c11-84d6-e84a40d73fa1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69343e54-7967-430b-ac91-3f2947665045","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c32821f-2eb0-47bd-b28c-ec5ef91289af","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8def33c1-48c4-49ce-87b9-9b48767a4629","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d38e55da-771c-4f5d-9066-e2e293ca559f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30aeda48-f1b7-45e2-96ac-07343b38b05e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a970055-ff2f-4335-a20b-baa03e7a902e","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_happenings_white/spr_happenings_white.yy b/sprites/spr_happenings_white/spr_happenings_white.yy index 6eef554e3b..036e52f07e 100644 --- a/sprites/spr_happenings_white/spr_happenings_white.yy +++ b/sprites/spr_happenings_white/spr_happenings_white.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_white", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db366810-b7ef-4b06-a650-0ad031ea4030","name":"db366810-b7ef-4b06-a650-0ad031ea4030","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8771864d-ef78-4813-a122-52bdb867d7ac","name":"8771864d-ef78-4813-a122-52bdb867d7ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25f82305-5ae9-4cf2-a0f7-83004a916244","name":"25f82305-5ae9-4cf2-a0f7-83004a916244","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21f7e28a-eed5-4140-aecf-f05c28299a69","name":"21f7e28a-eed5-4140-aecf-f05c28299a69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"acc01f13-b505-469e-aade-3c7f016f5de6","name":"acc01f13-b505-469e-aade-3c7f016f5de6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3479f38-6d78-42c6-9775-655d05bbf083","name":"f3479f38-6d78-42c6-9775-655d05bbf083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3303b30-741b-4fa7-952e-523e5e783594","name":"f3303b30-741b-4fa7-952e-523e5e783594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"331973c7-e242-4724-bb8e-496be15657a5","name":"331973c7-e242-4724-bb8e-496be15657a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"91e65543-2959-472c-b83a-1a4fd488da97","name":"91e65543-2959-472c-b83a-1a4fd488da97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d8be2f75-eb75-411c-a410-b1198688b5ed","name":"d8be2f75-eb75-411c-a410-b1198688b5ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a3cda4e-3a07-4424-993c-184058b527f4","name":"3a3cda4e-3a07-4424-993c-184058b527f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db366810-b7ef-4b06-a650-0ad031ea4030","name":"db366810-b7ef-4b06-a650-0ad031ea4030","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8771864d-ef78-4813-a122-52bdb867d7ac","name":"8771864d-ef78-4813-a122-52bdb867d7ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25f82305-5ae9-4cf2-a0f7-83004a916244","name":"25f82305-5ae9-4cf2-a0f7-83004a916244","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21f7e28a-eed5-4140-aecf-f05c28299a69","name":"21f7e28a-eed5-4140-aecf-f05c28299a69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"acc01f13-b505-469e-aade-3c7f016f5de6","name":"acc01f13-b505-469e-aade-3c7f016f5de6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3479f38-6d78-42c6-9775-655d05bbf083","name":"f3479f38-6d78-42c6-9775-655d05bbf083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3303b30-741b-4fa7-952e-523e5e783594","name":"f3303b30-741b-4fa7-952e-523e5e783594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"331973c7-e242-4724-bb8e-496be15657a5","name":"331973c7-e242-4724-bb8e-496be15657a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"91e65543-2959-472c-b83a-1a4fd488da97","name":"91e65543-2959-472c-b83a-1a4fd488da97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d8be2f75-eb75-411c-a410-b1198688b5ed","name":"d8be2f75-eb75-411c-a410-b1198688b5ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a3cda4e-3a07-4424-993c-184058b527f4","name":"3a3cda4e-3a07-4424-993c-184058b527f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db366810-b7ef-4b06-a650-0ad031ea4030","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9cbeabb6-aaed-49a4-b008-a6ba9d93b0fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ca8f550-2f9c-4ffe-a890-cff8f343a6ff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ca19cbb-adb7-416c-921e-de5fcf67e097","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8771864d-ef78-4813-a122-52bdb867d7ac","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b1d1f6a-2654-4d3d-9cb4-2175b67be6cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f82305-5ae9-4cf2-a0f7-83004a916244","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24513b92-e2f4-406c-92a3-52623989e130","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91eab546-b11c-4839-a684-cfb240728268","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da8c2012-fa1a-47e0-98e8-39fbbcc4666b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"294b2f0b-cc43-48da-94b1-95dabb64ec4b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21f7e28a-eed5-4140-aecf-f05c28299a69","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e053276-a55a-4ec7-84ab-3f03c59eb876","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ac04e0b-0322-4ce5-8479-aa2b9f2298c1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7dc53e61-8cd1-42f9-bcd7-d8ff4a4b2664","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04ba7220-c090-48f1-b218-bc570efd422f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02350b0d-6f36-426e-a0b7-227bc38ed5f7","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"acc01f13-b505-469e-aade-3c7f016f5de6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6450e76b-1b9d-42ca-b486-fb40dbe96b6e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c5eb6695-00a5-41f8-99b0-09e4e6691c36","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3479f38-6d78-42c6-9775-655d05bbf083","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6ecc1b0-f532-4c2e-9686-348aee0c3eab","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3303b30-741b-4fa7-952e-523e5e783594","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a986ca6c-7ef4-4a1a-af74-c690f91294eb","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"331973c7-e242-4724-bb8e-496be15657a5","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5780f91e-608a-418f-951c-9b15d119cf10","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af3fcc7e-3102-4cdb-92a6-111103806493","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"91e65543-2959-472c-b83a-1a4fd488da97","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f2cba20-6809-4814-a71a-863fc204969e","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8be2f75-eb75-411c-a410-b1198688b5ed","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08a26015-f688-4ef0-ae06-d5ecf8f7229d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a3cda4e-3a07-4424-993c-184058b527f4","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a5a0bad-2ac5-42f2-8a58-b3b3e1198fda","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a4cae83-48f2-4369-84bb-86f419daed59","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf2fdd01-afe2-42fb-91cb-106d177a3348","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59fc8afd-1c93-4a1f-b5cf-77fa8a5cb735","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e71a3f77-80c6-46fa-947b-e77c44d1942f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db366810-b7ef-4b06-a650-0ad031ea4030","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9cbeabb6-aaed-49a4-b008-a6ba9d93b0fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ca8f550-2f9c-4ffe-a890-cff8f343a6ff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ca19cbb-adb7-416c-921e-de5fcf67e097","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8771864d-ef78-4813-a122-52bdb867d7ac","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b1d1f6a-2654-4d3d-9cb4-2175b67be6cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f82305-5ae9-4cf2-a0f7-83004a916244","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24513b92-e2f4-406c-92a3-52623989e130","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91eab546-b11c-4839-a684-cfb240728268","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da8c2012-fa1a-47e0-98e8-39fbbcc4666b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"294b2f0b-cc43-48da-94b1-95dabb64ec4b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21f7e28a-eed5-4140-aecf-f05c28299a69","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e053276-a55a-4ec7-84ab-3f03c59eb876","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ac04e0b-0322-4ce5-8479-aa2b9f2298c1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7dc53e61-8cd1-42f9-bcd7-d8ff4a4b2664","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04ba7220-c090-48f1-b218-bc570efd422f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02350b0d-6f36-426e-a0b7-227bc38ed5f7","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"acc01f13-b505-469e-aade-3c7f016f5de6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6450e76b-1b9d-42ca-b486-fb40dbe96b6e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c5eb6695-00a5-41f8-99b0-09e4e6691c36","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3479f38-6d78-42c6-9775-655d05bbf083","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6ecc1b0-f532-4c2e-9686-348aee0c3eab","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3303b30-741b-4fa7-952e-523e5e783594","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a986ca6c-7ef4-4a1a-af74-c690f91294eb","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"331973c7-e242-4724-bb8e-496be15657a5","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5780f91e-608a-418f-951c-9b15d119cf10","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af3fcc7e-3102-4cdb-92a6-111103806493","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"91e65543-2959-472c-b83a-1a4fd488da97","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f2cba20-6809-4814-a71a-863fc204969e","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8be2f75-eb75-411c-a410-b1198688b5ed","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08a26015-f688-4ef0-ae06-d5ecf8f7229d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a3cda4e-3a07-4424-993c-184058b527f4","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a5a0bad-2ac5-42f2-8a58-b3b3e1198fda","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a4cae83-48f2-4369-84bb-86f419daed59","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf2fdd01-afe2-42fb-91cb-106d177a3348","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59fc8afd-1c93-4a1f-b5cf-77fa8a5cb735","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e71a3f77-80c6-46fa-947b-e77c44d1942f","IsCreationKey":false,"Key":25.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":{ diff --git a/sprites/spr_hazzard_texture/spr_hazzard_texture.yy b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy index 30d3a06da5..a4d666beef 100644 --- a/sprites/spr_hazzard_texture/spr_hazzard_texture.yy +++ b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_hazzard_texture", "bboxMode":0, "bbox_bottom":179, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0091329d-a69b-44eb-84c6-f0a31350ebd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0091329d-a69b-44eb-84c6-f0a31350ebd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_helm_decorations/spr_helm_decorations.yy b/sprites/spr_helm_decorations/spr_helm_decorations.yy index 3000e7f7ba..be5026ea12 100644 --- a/sprites/spr_helm_decorations/spr_helm_decorations.yy +++ b/sprites/spr_helm_decorations/spr_helm_decorations.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_helm_decorations", "bboxMode":0, "bbox_bottom":78, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","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_helm_stripe/spr_helm_stripe.yy b/sprites/spr_helm_stripe/spr_helm_stripe.yy index 7ad442efe7..7bfd4f2a8d 100644 --- a/sprites/spr_helm_stripe/spr_helm_stripe.yy +++ b/sprites/spr_helm_stripe/spr_helm_stripe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_helm_stripe", "bboxMode":0, "bbox_bottom":231, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,15 +71,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26f4dee6-051e-44b1-8d1e-45ba7e50c7a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4df215c-c404-4a0e-8307-02db1fc14b69","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43761bf0-cda0-4e6b-b420-5e4d14aa3afc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26f4dee6-051e-44b1-8d1e-45ba7e50c7a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4df215c-c404-4a0e-8307-02db1fc14b69","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43761bf0-cda0-4e6b-b420-5e4d14aa3afc","IsCreationKey":false,"Key":2.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_helm_stripe_term/spr_helm_stripe_term.yy b/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy index ceb7790f38..ae1af94e1a 100644 --- a/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy +++ b/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_helm_stripe_term", "bboxMode":0, "bbox_bottom":63, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d62a43af-319b-4d46-8e60-6ad0bc3bb267","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7c65181-363a-4a1c-9a7e-30f58343e90f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d62a43af-319b-4d46-8e60-6ad0bc3bb267","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7c65181-363a-4a1c-9a7e-30f58343e90f","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_help_exit/spr_help_exit.yy b/sprites/spr_help_exit/spr_help_exit.yy index ac6e2c280b..28fc9cf024 100644 --- a/sprites/spr_help_exit/spr_help_exit.yy +++ b/sprites/spr_help_exit/spr_help_exit.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_help_exit", "bboxMode":0, "bbox_bottom":32, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de989a75-8166-4e04-9fc0-52e6a861158c","name":"de989a75-8166-4e04-9fc0-52e6a861158c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de989a75-8166-4e04-9fc0-52e6a861158c","name":"de989a75-8166-4e04-9fc0-52e6a861158c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de989a75-8166-4e04-9fc0-52e6a861158c","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc4106cf-31bb-4712-b9dc-24942e618f2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2fc7b99b-32a5-4343-8381-8fd66d7eb02e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de989a75-8166-4e04-9fc0-52e6a861158c","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc4106cf-31bb-4712-b9dc-24942e618f2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2fc7b99b-32a5-4343-8381-8fd66d7eb02e","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":{ diff --git a/sprites/spr_help_panel/spr_help_panel.yy b/sprites/spr_help_panel/spr_help_panel.yy index 6990e48d70..2d870889f9 100644 --- a/sprites/spr_help_panel/spr_help_panel.yy +++ b/sprites/spr_help_panel/spr_help_panel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_help_panel", "bboxMode":0, "bbox_bottom":833, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e1055a25-a03c-463a-884a-257874dac353","name":"e1055a25-a03c-463a-884a-257874dac353","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1055a25-a03c-463a-884a-257874dac353","name":"e1055a25-a03c-463a-884a-257874dac353","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1055a25-a03c-463a-884a-257874dac353","path":"sprites/spr_help_panel/spr_help_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49bddd04-a0a1-47fa-b516-17ec9434cf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1055a25-a03c-463a-884a-257874dac353","path":"sprites/spr_help_panel/spr_help_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49bddd04-a0a1-47fa-b516-17ec9434cf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_heresy_colors/spr_heresy_colors.yy b/sprites/spr_heresy_colors/spr_heresy_colors.yy index c83332bdf0..bf84655cd5 100644 --- a/sprites/spr_heresy_colors/spr_heresy_colors.yy +++ b/sprites/spr_heresy_colors/spr_heresy_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_heresy_colors", "bboxMode":0, "bbox_bottom":221, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8298aad2-b42d-4fac-be2a-e0225796cc6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92f17322-5cee-446a-9f52-d795abd1269b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24ee9754-534c-4a1b-a134-0f261e8671e1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f5633d0-4c0d-4b89-8384-14ae90b765de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cad6a3e4-90b4-4185-be91-04e126c0bc69","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"442bb12f-fd34-4feb-a3de-72114e1520dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e2969f2-69e9-4b4f-a20c-a6dca07aba49","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9542367-f514-4fef-a384-d649a4b8b12c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f42b48a-0df1-4671-8ee0-b2d1b3b33f85","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"948fb262-714f-4969-9b99-c288abed38cc","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"86a1471b-a052-465b-817d-27abe3c5e2f4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae72bc80-d47c-4ae1-adcd-318f9598633c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9df8149-3c9e-4887-b45a-8fb96a47f66d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8298aad2-b42d-4fac-be2a-e0225796cc6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92f17322-5cee-446a-9f52-d795abd1269b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24ee9754-534c-4a1b-a134-0f261e8671e1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f5633d0-4c0d-4b89-8384-14ae90b765de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cad6a3e4-90b4-4185-be91-04e126c0bc69","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"442bb12f-fd34-4feb-a3de-72114e1520dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e2969f2-69e9-4b4f-a20c-a6dca07aba49","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9542367-f514-4fef-a384-d649a4b8b12c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f42b48a-0df1-4671-8ee0-b2d1b3b33f85","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"948fb262-714f-4969-9b99-c288abed38cc","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"86a1471b-a052-465b-817d-27abe3c5e2f4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae72bc80-d47c-4ae1-adcd-318f9598633c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9df8149-3c9e-4887-b45a-8fb96a47f66d","IsCreationKey":false,"Key":12.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_hero/spr_hero.yy b/sprites/spr_hero/spr_hero.yy index af7f3fdbcb..171adee5cc 100644 --- a/sprites/spr_hero/spr_hero.yy +++ b/sprites/spr_hero/spr_hero.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_hero", "bboxMode":0, "bbox_bottom":49, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bfb8fda0-a02a-4869-8600-efb3715721cd","name":"bfb8fda0-a02a-4869-8600-efb3715721cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6039e82-d38e-4232-9f84-e648009998f7","name":"a6039e82-d38e-4232-9f84-e648009998f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef84ad8d-e32a-4e39-acdb-782789771b91","name":"ef84ad8d-e32a-4e39-acdb-782789771b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3153288-2f26-4f17-89b7-3f0dc6382715","name":"f3153288-2f26-4f17-89b7-3f0dc6382715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33e39f67-56a2-4e87-8cce-8521f581cef8","name":"33e39f67-56a2-4e87-8cce-8521f581cef8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfb8fda0-a02a-4869-8600-efb3715721cd","name":"bfb8fda0-a02a-4869-8600-efb3715721cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6039e82-d38e-4232-9f84-e648009998f7","name":"a6039e82-d38e-4232-9f84-e648009998f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef84ad8d-e32a-4e39-acdb-782789771b91","name":"ef84ad8d-e32a-4e39-acdb-782789771b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3153288-2f26-4f17-89b7-3f0dc6382715","name":"f3153288-2f26-4f17-89b7-3f0dc6382715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33e39f67-56a2-4e87-8cce-8521f581cef8","name":"33e39f67-56a2-4e87-8cce-8521f581cef8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,54 +83,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3523907d-d28e-4283-a733-03b5c9194a77","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c47069de-4072-4c93-9d57-473ef2d6cf59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88cc7d5b-bc75-4d9e-95b8-989f6ebdcc4d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58d58d17-ae35-490d-9140-c0d2adc14e98","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9a796042-5827-4be3-be91-1c8e3fb48730","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb8fda0-a02a-4869-8600-efb3715721cd","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0d735f8-345f-4dda-911f-8d9341527762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76e56d45-5bfa-4650-b87e-71b24d2f68fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6039e82-d38e-4232-9f84-e648009998f7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"173fdc0e-83df-438b-8697-5564514cb110","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d94a64b0-0a02-4d17-b422-9d502a2d8789","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef84ad8d-e32a-4e39-acdb-782789771b91","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28b0e95b-3c24-4731-ad5c-b7fb8b8187ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6a5440d-5323-432f-8f63-3b8b1ec024fb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3153288-2f26-4f17-89b7-3f0dc6382715","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9af01d7b-f7d9-4b10-8b7f-d6aab6fb6973","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68f73d20-60ec-4343-bff2-73f167268cf8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daf5720d-40c0-463a-8abb-33c3cd2aa169","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"920d1701-2603-47fe-82cc-dee84904a3a9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33e39f67-56a2-4e87-8cce-8521f581cef8","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45be5739-0ee5-467b-8704-9dadb4aaf2ec","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3523907d-d28e-4283-a733-03b5c9194a77","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c47069de-4072-4c93-9d57-473ef2d6cf59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88cc7d5b-bc75-4d9e-95b8-989f6ebdcc4d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58d58d17-ae35-490d-9140-c0d2adc14e98","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9a796042-5827-4be3-be91-1c8e3fb48730","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb8fda0-a02a-4869-8600-efb3715721cd","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0d735f8-345f-4dda-911f-8d9341527762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76e56d45-5bfa-4650-b87e-71b24d2f68fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6039e82-d38e-4232-9f84-e648009998f7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"173fdc0e-83df-438b-8697-5564514cb110","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d94a64b0-0a02-4d17-b422-9d502a2d8789","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef84ad8d-e32a-4e39-acdb-782789771b91","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28b0e95b-3c24-4731-ad5c-b7fb8b8187ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6a5440d-5323-432f-8f63-3b8b1ec024fb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3153288-2f26-4f17-89b7-3f0dc6382715","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9af01d7b-f7d9-4b10-8b7f-d6aab6fb6973","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68f73d20-60ec-4343-bff2-73f167268cf8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daf5720d-40c0-463a-8abb-33c3cd2aa169","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"920d1701-2603-47fe-82cc-dee84904a3a9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33e39f67-56a2-4e87-8cce-8521f581cef8","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45be5739-0ee5-467b-8704-9dadb4aaf2ec","IsCreationKey":false,"Key":15.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_hero_skull/spr_hero_skull.yy b/sprites/spr_hero_skull/spr_hero_skull.yy index 171a256c54..53d2aa1eaa 100644 --- a/sprites/spr_hero_skull/spr_hero_skull.yy +++ b/sprites/spr_hero_skull/spr_hero_skull.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_hero_skull", "bboxMode":0, "bbox_bottom":30, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4028fec9-b72f-46fc-bb33-779f5cc99798","name":"4028fec9-b72f-46fc-bb33-779f5cc99798","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4028fec9-b72f-46fc-bb33-779f5cc99798","name":"4028fec9-b72f-46fc-bb33-779f5cc99798","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4028fec9-b72f-46fc-bb33-779f5cc99798","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45265b93-e31f-4a46-834d-75c6b65d1994","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4028fec9-b72f-46fc-bb33-779f5cc99798","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45265b93-e31f-4a46-834d-75c6b65d1994","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_honor_helm/spr_honor_helm.yy b/sprites/spr_honor_helm/spr_honor_helm.yy index fb22b5e7d1..b9f60ea1fb 100644 --- a/sprites/spr_honor_helm/spr_honor_helm.yy +++ b/sprites/spr_honor_helm/spr_honor_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_honor_helm", "bboxMode":0, "bbox_bottom":57, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6d89f537-514e-4956-bd62-3d0e38852475","name":"6d89f537-514e-4956-bd62-3d0e38852475","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d89f537-514e-4956-bd62-3d0e38852475","name":"6d89f537-514e-4956-bd62-3d0e38852475","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ad7497e-3b41-4229-b8b5-b3a878b88839","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff207f62-e98a-4f92-b03a-5811e7159312","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc1beb56-9e35-4bd4-91d2-5891d9b8febe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d89f537-514e-4956-bd62-3d0e38852475","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed57c839-ea9e-4aee-b1eb-ae95029ab662","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce788ad0-56e7-4d23-be0f-ad858299a699","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ad7497e-3b41-4229-b8b5-b3a878b88839","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff207f62-e98a-4f92-b03a-5811e7159312","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc1beb56-9e35-4bd4-91d2-5891d9b8febe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d89f537-514e-4956-bd62-3d0e38852475","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed57c839-ea9e-4aee-b1eb-ae95029ab662","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce788ad0-56e7-4d23-be0f-ad858299a699","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy b/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy index dfaba6b634..5be1606b51 100644 --- a/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy +++ b/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_apothecarion", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c420298-afa1-4414-ae6e-dcdf955885f3","name":"8c420298-afa1-4414-ae6e-dcdf955885f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c420298-afa1-4414-ae6e-dcdf955885f3","name":"8c420298-afa1-4414-ae6e-dcdf955885f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c420298-afa1-4414-ae6e-dcdf955885f3","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2232c4f0-83bb-414e-b240-877fb4da7576","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c420298-afa1-4414-ae6e-dcdf955885f3","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2232c4f0-83bb-414e-b240-877fb4da7576","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy b/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy index 1b56469a46..221a32e636 100644 --- a/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy +++ b/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_ballistic_skill", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"175bd7b9-849b-46ce-8efe-940114991cfe","name":"175bd7b9-849b-46ce-8efe-940114991cfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"175bd7b9-849b-46ce-8efe-940114991cfe","name":"175bd7b9-849b-46ce-8efe-940114991cfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"175bd7b9-849b-46ce-8efe-940114991cfe","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79b5a674-3dee-46f0-9590-19df26ad27c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"175bd7b9-849b-46ce-8efe-940114991cfe","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79b5a674-3dee-46f0-9590-19df26ad27c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_bionics/spr_icon_bionics.yy b/sprites/spr_icon_bionics/spr_icon_bionics.yy index 312fd8c018..3206e750a9 100644 --- a/sprites/spr_icon_bionics/spr_icon_bionics.yy +++ b/sprites/spr_icon_bionics/spr_icon_bionics.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_bionics", "bboxMode":0, "bbox_bottom":123, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4847858a-0725-4a81-831e-e621066a51a0","name":"4847858a-0725-4a81-831e-e621066a51a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4847858a-0725-4a81-831e-e621066a51a0","name":"4847858a-0725-4a81-831e-e621066a51a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4847858a-0725-4a81-831e-e621066a51a0","path":"sprites/spr_icon_bionics/spr_icon_bionics.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bba9627e-71ba-49db-a8bb-02863d834290","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4847858a-0725-4a81-831e-e621066a51a0","path":"sprites/spr_icon_bionics/spr_icon_bionics.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bba9627e-71ba-49db-a8bb-02863d834290","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_change/spr_icon_change.yy b/sprites/spr_icon_change/spr_icon_change.yy index 4455982768..66a47febe1 100644 --- a/sprites/spr_icon_change/spr_icon_change.yy +++ b/sprites/spr_icon_change/spr_icon_change.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_change", "bboxMode":0, "bbox_bottom":77, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7f321054-1d52-47c4-a451-9447c52b8931","name":"7f321054-1d52-47c4-a451-9447c52b8931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f321054-1d52-47c4-a451-9447c52b8931","name":"7f321054-1d52-47c4-a451-9447c52b8931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f321054-1d52-47c4-a451-9447c52b8931","path":"sprites/spr_icon_change/spr_icon_change.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6ec8eee-1414-4a10-82fc-83027463d27d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f321054-1d52-47c4-a451-9447c52b8931","path":"sprites/spr_icon_change/spr_icon_change.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6ec8eee-1414-4a10-82fc-83027463d27d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_icon_health/spr_icon_health.yy b/sprites/spr_icon_health/spr_icon_health.yy index 0b5a7232d6..2129706acd 100644 --- a/sprites/spr_icon_health/spr_icon_health.yy +++ b/sprites/spr_icon_health/spr_icon_health.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_health", "bboxMode":0, "bbox_bottom":121, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bc87ff96-289a-4158-8d2e-07149fb4a405","name":"bc87ff96-289a-4158-8d2e-07149fb4a405","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc87ff96-289a-4158-8d2e-07149fb4a405","name":"bc87ff96-289a-4158-8d2e-07149fb4a405","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc87ff96-289a-4158-8d2e-07149fb4a405","path":"sprites/spr_icon_health/spr_icon_health.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2bd0248-1537-4bfe-8c66-33384bd00df6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc87ff96-289a-4158-8d2e-07149fb4a405","path":"sprites/spr_icon_health/spr_icon_health.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2bd0248-1537-4bfe-8c66-33384bd00df6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy b/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy index a9a7151dd3..89a2f008cf 100644 --- a/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy +++ b/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_halo", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"45765e6b-00d8-4316-988d-daca2372308f","name":"45765e6b-00d8-4316-988d-daca2372308f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45765e6b-00d8-4316-988d-daca2372308f","name":"45765e6b-00d8-4316-988d-daca2372308f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45765e6b-00d8-4316-988d-daca2372308f","path":"sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9993fbbb-7bcd-43e9-b367-1c5b57522dab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45765e6b-00d8-4316-988d-daca2372308f","path":"sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9993fbbb-7bcd-43e9-b367-1c5b57522dab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy b/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy index 5f27faa814..8c87163c27 100644 --- a/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy +++ b/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_hands", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"87ee8039-2984-40e8-bacb-57ff8740fd19","name":"87ee8039-2984-40e8-bacb-57ff8740fd19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87ee8039-2984-40e8-bacb-57ff8740fd19","name":"87ee8039-2984-40e8-bacb-57ff8740fd19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87ee8039-2984-40e8-bacb-57ff8740fd19","path":"sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c18301a-894e-4feb-942f-4e8cdbc700f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87ee8039-2984-40e8-bacb-57ff8740fd19","path":"sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c18301a-894e-4feb-942f-4e8cdbc700f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy b/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy index 363fa8d2b4..c58ae5bf2a 100644 --- a/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy +++ b/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_hands2", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3c24869b-4466-4bfe-9253-6ac5b898f203","name":"3c24869b-4466-4bfe-9253-6ac5b898f203","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c24869b-4466-4bfe-9253-6ac5b898f203","name":"3c24869b-4466-4bfe-9253-6ac5b898f203","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c24869b-4466-4bfe-9253-6ac5b898f203","path":"sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f40cabf-70e1-4e42-8746-6d9dd7255888","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c24869b-4466-4bfe-9253-6ac5b898f203","path":"sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f40cabf-70e1-4e42-8746-6d9dd7255888","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy b/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy index 1b04e2bc8f..b118f25ac2 100644 --- a/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy +++ b/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_hands3", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"372c9370-897b-4991-9628-fd531cc75d05","name":"372c9370-897b-4991-9628-fd531cc75d05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"372c9370-897b-4991-9628-fd531cc75d05","name":"372c9370-897b-4991-9628-fd531cc75d05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"372c9370-897b-4991-9628-fd531cc75d05","path":"sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39bf6dba-f4a6-490b-ba05-cf47f615a5f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"372c9370-897b-4991-9628-fd531cc75d05","path":"sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39bf6dba-f4a6-490b-ba05-cf47f615a5f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_librarius/spr_icon_librarius.yy b/sprites/spr_icon_librarius/spr_icon_librarius.yy index 5c1d838731..10e3b0c011 100644 --- a/sprites/spr_icon_librarius/spr_icon_librarius.yy +++ b/sprites/spr_icon_librarius/spr_icon_librarius.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_librarius", "bboxMode":0, "bbox_bottom":110, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","path":"sprites/spr_icon_librarius/spr_icon_librarius.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b274634c-f2d4-4dfc-9370-f0b342c2cd10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","path":"sprites/spr_icon_librarius/spr_icon_librarius.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b274634c-f2d4-4dfc-9370-f0b342c2cd10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_psyker/spr_icon_psyker.yy b/sprites/spr_icon_psyker/spr_icon_psyker.yy index c8a6b45ede..7bc9cfe4ce 100644 --- a/sprites/spr_icon_psyker/spr_icon_psyker.yy +++ b/sprites/spr_icon_psyker/spr_icon_psyker.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_psyker", "bboxMode":0, "bbox_bottom":124, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"100d817f-b993-4588-bcf6-a6db6c63e96d","name":"100d817f-b993-4588-bcf6-a6db6c63e96d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"100d817f-b993-4588-bcf6-a6db6c63e96d","name":"100d817f-b993-4588-bcf6-a6db6c63e96d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"100d817f-b993-4588-bcf6-a6db6c63e96d","path":"sprites/spr_icon_psyker/spr_icon_psyker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fb3e588-63d7-49a0-ab99-4bd52fdbb678","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"100d817f-b993-4588-bcf6-a6db6c63e96d","path":"sprites/spr_icon_psyker/spr_icon_psyker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fb3e588-63d7-49a0-ab99-4bd52fdbb678","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_shield/spr_icon_shield.yy b/sprites/spr_icon_shield/spr_icon_shield.yy index 3755ee5a2b..ed65d1a1d6 100644 --- a/sprites/spr_icon_shield/spr_icon_shield.yy +++ b/sprites/spr_icon_shield/spr_icon_shield.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_shield", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"52d29a79-1164-4e74-a115-73a3753c0552","name":"52d29a79-1164-4e74-a115-73a3753c0552","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d29a79-1164-4e74-a115-73a3753c0552","name":"52d29a79-1164-4e74-a115-73a3753c0552","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d29a79-1164-4e74-a115-73a3753c0552","path":"sprites/spr_icon_shield/spr_icon_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e5f8e2e-b061-4eca-86ba-6f413b5c413d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d29a79-1164-4e74-a115-73a3753c0552","path":"sprites/spr_icon_shield/spr_icon_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e5f8e2e-b061-4eca-86ba-6f413b5c413d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_shield2/spr_icon_shield2.yy b/sprites/spr_icon_shield2/spr_icon_shield2.yy index e493764145..af97d05f44 100644 --- a/sprites/spr_icon_shield2/spr_icon_shield2.yy +++ b/sprites/spr_icon_shield2/spr_icon_shield2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_shield2", "bboxMode":0, "bbox_bottom":124, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","path":"sprites/spr_icon_shield2/spr_icon_shield2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07012a80-3fb0-404b-8bad-c1b776cac4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","path":"sprites/spr_icon_shield2/spr_icon_shield2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07012a80-3fb0-404b-8bad-c1b776cac4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_telepatica/spr_icon_telepatica.yy b/sprites/spr_icon_telepatica/spr_icon_telepatica.yy index 05025bba3d..2f2ee4a519 100644 --- a/sprites/spr_icon_telepatica/spr_icon_telepatica.yy +++ b/sprites/spr_icon_telepatica/spr_icon_telepatica.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_telepatica", "bboxMode":0, "bbox_bottom":122, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","path":"sprites/spr_icon_telepatica/spr_icon_telepatica.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19274f90-7f8d-4764-9066-671a72532c31","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","path":"sprites/spr_icon_telepatica/spr_icon_telepatica.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19274f90-7f8d-4764-9066-671a72532c31","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy b/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy index e87ab0cf53..ae79d2aae5 100644 --- a/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy +++ b/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_telepatica2", "bboxMode":0, "bbox_bottom":126, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"38c9167a-ee5a-4729-8a71-6963ab98a018","name":"38c9167a-ee5a-4729-8a71-6963ab98a018","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38c9167a-ee5a-4729-8a71-6963ab98a018","name":"38c9167a-ee5a-4729-8a71-6963ab98a018","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38c9167a-ee5a-4729-8a71-6963ab98a018","path":"sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdc039bc-8374-4edc-83dd-446e17ebb408","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38c9167a-ee5a-4729-8a71-6963ab98a018","path":"sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdc039bc-8374-4edc-83dd-446e17ebb408","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_veteran/spr_icon_veteran.yy b/sprites/spr_icon_veteran/spr_icon_veteran.yy index eec01d2532..c2c4008ad6 100644 --- a/sprites/spr_icon_veteran/spr_icon_veteran.yy +++ b/sprites/spr_icon_veteran/spr_icon_veteran.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_veteran", "bboxMode":0, "bbox_bottom":113, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6d818433-1ab6-4818-aee1-badbac0b7712","name":"6d818433-1ab6-4818-aee1-badbac0b7712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d818433-1ab6-4818-aee1-badbac0b7712","name":"6d818433-1ab6-4818-aee1-badbac0b7712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d818433-1ab6-4818-aee1-badbac0b7712","path":"sprites/spr_icon_veteran/spr_icon_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"879e18a1-ac47-4a1f-9231-529f71b21cb0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d818433-1ab6-4818-aee1-badbac0b7712","path":"sprites/spr_icon_veteran/spr_icon_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"879e18a1-ac47-4a1f-9231-529f71b21cb0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy b/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy index 2bee3f4586..61091942e9 100644 --- a/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy +++ b/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_weapon_skill", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","path":"sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa7e868a-9b98-4831-94a0-d4135318d307","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","path":"sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa7e868a-9b98-4831-94a0-d4135318d307","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_weight/spr_icon_weight.yy b/sprites/spr_icon_weight/spr_icon_weight.yy index 7aff6fb136..0be996df06 100644 --- a/sprites/spr_icon_weight/spr_icon_weight.yy +++ b/sprites/spr_icon_weight/spr_icon_weight.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_weight", "bboxMode":0, "bbox_bottom":112, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9221b377-916e-498d-bc28-a2e999f17843","name":"9221b377-916e-498d-bc28-a2e999f17843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9221b377-916e-498d-bc28-a2e999f17843","name":"9221b377-916e-498d-bc28-a2e999f17843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9221b377-916e-498d-bc28-a2e999f17843","path":"sprites/spr_icon_weight/spr_icon_weight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a57d19e-374a-48c1-8955-53e45e4020ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9221b377-916e-498d-bc28-a2e999f17843","path":"sprites/spr_icon_weight/spr_icon_weight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a57d19e-374a-48c1-8955-53e45e4020ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_wounds/spr_icon_wounds.yy b/sprites/spr_icon_wounds/spr_icon_wounds.yy index 96e42abea0..54e1bcb00d 100644 --- a/sprites/spr_icon_wounds/spr_icon_wounds.yy +++ b/sprites/spr_icon_wounds/spr_icon_wounds.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_wounds", "bboxMode":0, "bbox_bottom":112, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"07486fe4-76e6-481f-9ca9-94952463ecb4","name":"07486fe4-76e6-481f-9ca9-94952463ecb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07486fe4-76e6-481f-9ca9-94952463ecb4","name":"07486fe4-76e6-481f-9ca9-94952463ecb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07486fe4-76e6-481f-9ca9-94952463ecb4","path":"sprites/spr_icon_wounds/spr_icon_wounds.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7833cd98-7681-4fe5-b5bb-8aeab0dba461","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07486fe4-76e6-481f-9ca9-94952463ecb4","path":"sprites/spr_icon_wounds/spr_icon_wounds.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7833cd98-7681-4fe5-b5bb-8aeab0dba461","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy b/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy index 879abb2185..72232aea25 100644 --- a/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy +++ b/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_if_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96d6ba50-844d-4b20-8660-44109a52e875","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"826222be-8f31-4261-bbc0-e1c6c119be12","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"959e4469-ff4a-434e-adcc-44625ee7e511","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96d6ba50-844d-4b20-8660-44109a52e875","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"826222be-8f31-4261-bbc0-e1c6c119be12","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"959e4469-ff4a-434e-adcc-44625ee7e511","IsCreationKey":false,"Key":2.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_if_mk6_helm/spr_if_mk6_helm.yy b/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy index 4442de907a..06bb2f4d82 100644 --- a/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy +++ b/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_if_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6691f594-8d96-4874-8c5e-9270b2729038","name":"6691f594-8d96-4874-8c5e-9270b2729038","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8654944b-42fa-4a32-9a49-f85da15cb64e","name":"8654944b-42fa-4a32-9a49-f85da15cb64e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"006476c9-63e2-4612-a92c-d99440071596","name":"006476c9-63e2-4612-a92c-d99440071596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce48e770-7a4c-4382-a312-495dea5bb37d","name":"ce48e770-7a4c-4382-a312-495dea5bb37d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6691f594-8d96-4874-8c5e-9270b2729038","name":"6691f594-8d96-4874-8c5e-9270b2729038","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8654944b-42fa-4a32-9a49-f85da15cb64e","name":"8654944b-42fa-4a32-9a49-f85da15cb64e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006476c9-63e2-4612-a92c-d99440071596","name":"006476c9-63e2-4612-a92c-d99440071596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce48e770-7a4c-4382-a312-495dea5bb37d","name":"ce48e770-7a4c-4382-a312-495dea5bb37d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ef3ccc4-520e-468a-bcaa-7428d87c6681","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6691f594-8d96-4874-8c5e-9270b2729038","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de5fdfc9-9f64-4c20-9c32-6d5e9f4f9fce","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8654944b-42fa-4a32-9a49-f85da15cb64e","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7897dfb-d9da-4108-ac0c-040c497b3433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006476c9-63e2-4612-a92c-d99440071596","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f03a9ffe-40ca-4513-8eff-af5d7acf2a4f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce48e770-7a4c-4382-a312-495dea5bb37d","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c2331b9-bec3-406a-92f2-206bec4c524f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ef3ccc4-520e-468a-bcaa-7428d87c6681","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6691f594-8d96-4874-8c5e-9270b2729038","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de5fdfc9-9f64-4c20-9c32-6d5e9f4f9fce","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8654944b-42fa-4a32-9a49-f85da15cb64e","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7897dfb-d9da-4108-ac0c-040c497b3433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006476c9-63e2-4612-a92c-d99440071596","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f03a9ffe-40ca-4513-8eff-af5d7acf2a4f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce48e770-7a4c-4382-a312-495dea5bb37d","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c2331b9-bec3-406a-92f2-206bec4c524f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy b/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy index eb81941e30..2699c9d6c3 100644 --- a/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy +++ b/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_if_mk7_helm", "bboxMode":0, "bbox_bottom":56, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e63e934-7709-480e-82cf-c16124eab733","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad0d33af-11ca-4a82-b468-8073458f806b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e63e934-7709-480e-82cf-c16124eab733","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad0d33af-11ca-4a82-b468-8073458f806b","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_ih_mk5_helm/spr_ih_mk5_helm.yy b/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy index 53946f9d81..8b87a16d91 100644 --- a/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy +++ b/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ih_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b642399d-d97e-40d8-adaf-2809088e730f","name":"b642399d-d97e-40d8-adaf-2809088e730f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f7e174c-865e-46f8-be78-69317b96de10","name":"1f7e174c-865e-46f8-be78-69317b96de10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b642399d-d97e-40d8-adaf-2809088e730f","name":"b642399d-d97e-40d8-adaf-2809088e730f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f7e174c-865e-46f8-be78-69317b96de10","name":"1f7e174c-865e-46f8-be78-69317b96de10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b642399d-d97e-40d8-adaf-2809088e730f","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d78dbd31-89bd-4267-a7f6-77dd4d6454d2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f7e174c-865e-46f8-be78-69317b96de10","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cbabb173-cfe5-490a-bbe2-901751188108","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b642399d-d97e-40d8-adaf-2809088e730f","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d78dbd31-89bd-4267-a7f6-77dd4d6454d2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f7e174c-865e-46f8-be78-69317b96de10","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cbabb173-cfe5-490a-bbe2-901751188108","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_ih_mk6_helm/spr_ih_mk6_helm.yy b/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy index 4176c0b2bf..1e18b0b424 100644 --- a/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy +++ b/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ih_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db85fc39-20f1-4c33-9214-04c64fea3140","name":"db85fc39-20f1-4c33-9214-04c64fea3140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db85fc39-20f1-4c33-9214-04c64fea3140","name":"db85fc39-20f1-4c33-9214-04c64fea3140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db85fc39-20f1-4c33-9214-04c64fea3140","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bb79bfe-987b-416b-a03f-4abdb1d8d14e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4b71391-715d-453c-aad9-a6af40cb2390","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db85fc39-20f1-4c33-9214-04c64fea3140","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bb79bfe-987b-416b-a03f-4abdb1d8d14e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4b71391-715d-453c-aad9-a6af40cb2390","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_ih_mk7_helm/spr_ih_mk7_helm.yy b/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy index 6aaa16557d..c4297aac28 100644 --- a/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy +++ b/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ih_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d61530e1-48e9-4f47-9420-ce41def4cf25","name":"d61530e1-48e9-4f47-9420-ce41def4cf25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d61530e1-48e9-4f47-9420-ce41def4cf25","name":"d61530e1-48e9-4f47-9420-ce41def4cf25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d61530e1-48e9-4f47-9420-ce41def4cf25","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a7da707-d0b3-4baa-9e51-0798160ef9d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ac8930c-7088-4d26-9666-4add4d91d775","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d61530e1-48e9-4f47-9420-ce41def4cf25","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a7da707-d0b3-4baa-9e51-0798160ef9d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ac8930c-7088-4d26-9666-4add4d91d775","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_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy index 327f13b0ae..b6975eedf3 100644 --- a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy +++ b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_backpack_variants", "bboxMode":0, "bbox_bottom":47, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26a48129-bbce-4502-98fa-bb1536100ae8","name":"26a48129-bbce-4502-98fa-bb1536100ae8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26a48129-bbce-4502-98fa-bb1536100ae8","name":"26a48129-bbce-4502-98fa-bb1536100ae8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"976d99d5-b8ca-4296-bfec-0428f709446a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26a48129-bbce-4502-98fa-bb1536100ae8","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e490a9e6-100a-4231-83ea-f81f970510d0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"103b9ed3-895b-4aaa-853a-46c40325bda5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"976d99d5-b8ca-4296-bfec-0428f709446a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26a48129-bbce-4502-98fa-bb1536100ae8","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e490a9e6-100a-4231-83ea-f81f970510d0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"103b9ed3-895b-4aaa-853a-46c40325bda5","IsCreationKey":false,"Key":2.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_indomitus_belt/spr_indomitus_belt.yy b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy index d117101fc6..b5f5831402 100644 --- a/sprites/spr_indomitus_belt/spr_indomitus_belt.yy +++ b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_belt", "bboxMode":0, "bbox_bottom":136, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"379a95d4-e686-4cd0-bae4-d6538fe00566","name":"379a95d4-e686-4cd0-bae4-d6538fe00566","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"379a95d4-e686-4cd0-bae4-d6538fe00566","name":"379a95d4-e686-4cd0-bae4-d6538fe00566","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ad9035b-9bda-4936-9f2e-2ce26793a018","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"379a95d4-e686-4cd0-bae4-d6538fe00566","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f184b9f-eef4-4a86-a538-61303e8cf300","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36d12149-c9ad-4f8b-9e33-e79eea03b9a1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ad9035b-9bda-4936-9f2e-2ce26793a018","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"379a95d4-e686-4cd0-bae4-d6538fe00566","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f184b9f-eef4-4a86-a538-61303e8cf300","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36d12149-c9ad-4f8b-9e33-e79eea03b9a1","IsCreationKey":false,"Key":2.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_indomitus_chest_variants/spr_indomitus_chest_variants.yy b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy index 30a3c35872..70eefdaa19 100644 --- a/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy +++ b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_chest_variants", "bboxMode":0, "bbox_bottom":111, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27d4c94a-6c66-4f0c-a0bc-26b973bcf167","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4e60b7e-673d-4732-a579-27be19e0db5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57d77f6f-9937-40c8-b693-bb5f79d81e9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27d4c94a-6c66-4f0c-a0bc-26b973bcf167","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4e60b7e-673d-4732-a579-27be19e0db5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57d77f6f-9937-40c8-b693-bb5f79d81e9f","IsCreationKey":false,"Key":2.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_indomitus_complex/spr_indomitus_complex.yy b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy index a9040d31e2..8cf0958e19 100644 --- a/sprites/spr_indomitus_complex/spr_indomitus_complex.yy +++ b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_complex", "bboxMode":0, "bbox_bottom":185, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy b/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy index 42acc9e30a..6acad6e83b 100644 --- a/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy +++ b/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_head_variants", "bboxMode":0, "bbox_bottom":88, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4562bd4-7167-4589-a834-2a10a6e5f760","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4562bd4-7167-4589-a834-2a10a6e5f760","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy index 5e2dfe806d..93cbdfc0b7 100644 --- a/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy +++ b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_knightly_robe", "bboxMode":0, "bbox_bottom":238, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"05afe988-9760-4afd-a9a3-082287887f4a","name":"05afe988-9760-4afd-a9a3-082287887f4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05afe988-9760-4afd-a9a3-082287887f4a","name":"05afe988-9760-4afd-a9a3-082287887f4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05afe988-9760-4afd-a9a3-082287887f4a","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e9b4aa7-44d1-4787-b28e-c7cd47428006","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05afe988-9760-4afd-a9a3-082287887f4a","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e9b4aa7-44d1-4787-b28e-c7cd47428006","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy index 1020555be3..c0f008b684 100644 --- a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy +++ b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_arm", "bboxMode":0, "bbox_bottom":170, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe3823bf-9117-481b-bdf0-d43733cc0e54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe3823bf-9117-481b-bdf0-d43733cc0e54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy index d187e1b196..e3c7f27e5a 100644 --- a/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy +++ b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_arm_bionic", "bboxMode":0, "bbox_bottom":183, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3bc2eae-f410-482e-92ff-a37c8899ad31","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3bc2eae-f410-482e-92ff-a37c8899ad31","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy b/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy index 773e40350c..fa39646b34 100644 --- a/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy +++ b/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_eye_bionic", "bboxMode":0, "bbox_bottom":75, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e165ea6-1ddf-40bb-a32d-fef77fd9555d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"936f44b7-0688-4ef8-ab24-68a532190ed6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2091eff0-d98c-4046-bc81-0b1e7f0364d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e450a15-0e35-401c-afff-0b2bc7c79c4f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e165ea6-1ddf-40bb-a32d-fef77fd9555d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"936f44b7-0688-4ef8-ab24-68a532190ed6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2091eff0-d98c-4046-bc81-0b1e7f0364d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e450a15-0e35-401c-afff-0b2bc7c79c4f","IsCreationKey":false,"Key":3.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_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy b/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy index 9b26a50863..9e6cc9cf5f 100644 --- a/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy +++ b/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_knee_crux", "bboxMode":0, "bbox_bottom":206, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d086015e-a6f4-4603-8d87-f9dc34671215","name":"d086015e-a6f4-4603-8d87-f9dc34671215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d086015e-a6f4-4603-8d87-f9dc34671215","name":"d086015e-a6f4-4603-8d87-f9dc34671215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d086015e-a6f4-4603-8d87-f9dc34671215","path":"sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf738b7d-36e3-4cdb-bf14-0edd5444950b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d086015e-a6f4-4603-8d87-f9dc34671215","path":"sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf738b7d-36e3-4cdb-bf14-0edd5444950b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy index bc377646d6..9af0d69d60 100644 --- a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy +++ b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_leg_bionic", "bboxMode":0, "bbox_bottom":260, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eac121b-3931-417e-870e-272025ef2a2e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eac121b-3931-417e-870e-272025ef2a2e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy b/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy index add50a6d22..21ac8b11f6 100644 --- a/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy +++ b/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_shin", "bboxMode":0, "bbox_bottom":248, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e60513c5-fcc3-459c-916e-8b19128ed541","name":"e60513c5-fcc3-459c-916e-8b19128ed541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb2de076-5af9-459a-b130-624bab24de74","name":"bb2de076-5af9-459a-b130-624bab24de74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e60513c5-fcc3-459c-916e-8b19128ed541","name":"e60513c5-fcc3-459c-916e-8b19128ed541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb2de076-5af9-459a-b130-624bab24de74","name":"bb2de076-5af9-459a-b130-624bab24de74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e60513c5-fcc3-459c-916e-8b19128ed541","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c9fab82-bd4c-4aaa-8995-50ee32141c65","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb2de076-5af9-459a-b130-624bab24de74","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67c33f4c-ee5a-4a87-99df-324d5f6e3d29","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cfeac81-ef68-4b7a-9463-ea132dcc12df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e60513c5-fcc3-459c-916e-8b19128ed541","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c9fab82-bd4c-4aaa-8995-50ee32141c65","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb2de076-5af9-459a-b130-624bab24de74","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67c33f4c-ee5a-4a87-99df-324d5f6e3d29","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cfeac81-ef68-4b7a-9463-ea132dcc12df","IsCreationKey":false,"Key":2.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_indomitus_leg_variants/spr_indomitus_leg_variants.yy b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy index c555c85b89..744c4e4c69 100644 --- a/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy +++ b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_leg_variants", "bboxMode":0, "bbox_bottom":259, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b1984530-db57-4951-bec4-a09cab003f1a","name":"b1984530-db57-4951-bec4-a09cab003f1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"220fdf6f-48b5-4de0-9576-27b046131605","name":"220fdf6f-48b5-4de0-9576-27b046131605","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1984530-db57-4951-bec4-a09cab003f1a","name":"b1984530-db57-4951-bec4-a09cab003f1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"220fdf6f-48b5-4de0-9576-27b046131605","name":"220fdf6f-48b5-4de0-9576-27b046131605","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"220fdf6f-48b5-4de0-9576-27b046131605","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"220fdf6f-48b5-4de0-9576-27b046131605","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","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_indomitus_right_arm/spr_indomitus_right_arm.yy b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy index 3a45cbdf10..ca3cf7ac40 100644 --- a/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy +++ b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_arm", "bboxMode":0, "bbox_bottom":170, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy b/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy index 19da8fb24e..9474f87e14 100644 --- a/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy +++ b/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_arm_bionic", "bboxMode":0, "bbox_bottom":183, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2d22107-2e4d-4737-813b-630e2f5e6019","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2d22107-2e4d-4737-813b-630e2f5e6019","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy b/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy index da659677d3..d609229bea 100644 --- a/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy +++ b/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_eye_bionic", "bboxMode":0, "bbox_bottom":75, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d35ba92d-862a-4a6b-9d8e-48ca228e92e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"351befce-72d1-4a78-83dd-ce6e61ecbc59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"963149ce-2d78-4541-a317-b6b7fd2005b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5d8f9c8-7c3a-4820-a284-cb7a62688cb4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d35ba92d-862a-4a6b-9d8e-48ca228e92e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"351befce-72d1-4a78-83dd-ce6e61ecbc59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"963149ce-2d78-4541-a317-b6b7fd2005b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5d8f9c8-7c3a-4820-a284-cb7a62688cb4","IsCreationKey":false,"Key":3.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_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy b/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy index 52d75c9847..7712947e5a 100644 --- a/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy +++ b/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_knee_crux", "bboxMode":0, "bbox_bottom":206, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"597aa984-87e8-4425-8954-56127319e962","name":"597aa984-87e8-4425-8954-56127319e962","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"597aa984-87e8-4425-8954-56127319e962","name":"597aa984-87e8-4425-8954-56127319e962","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"597aa984-87e8-4425-8954-56127319e962","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64416029-b6e6-4746-b1c7-2acf5e2ea462","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"597aa984-87e8-4425-8954-56127319e962","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64416029-b6e6-4746-b1c7-2acf5e2ea462","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy b/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy index 700ab2c6a6..644950b276 100644 --- a/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy +++ b/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_leg_bionic", "bboxMode":0, "bbox_bottom":260, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b971e5d-63dc-464f-a2a5-601dd3c60196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b971e5d-63dc-464f-a2a5-601dd3c60196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy b/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy index 04d57b9504..e7a1a3493a 100644 --- a/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy +++ b/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_shin", "bboxMode":0, "bbox_bottom":248, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b1bed381-dffb-49f9-b787-37a97bc22f95","name":"b1bed381-dffb-49f9-b787-37a97bc22f95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c47c8ef5-80d7-495f-aed4-2018547c6479","name":"c47c8ef5-80d7-495f-aed4-2018547c6479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1bed381-dffb-49f9-b787-37a97bc22f95","name":"b1bed381-dffb-49f9-b787-37a97bc22f95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c47c8ef5-80d7-495f-aed4-2018547c6479","name":"c47c8ef5-80d7-495f-aed4-2018547c6479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1bed381-dffb-49f9-b787-37a97bc22f95","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48a05983-ea7b-44c3-a992-de9cc1664717","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c47c8ef5-80d7-495f-aed4-2018547c6479","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21dded79-bee1-4a00-b8ed-516dcd97f1e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1bed381-dffb-49f9-b787-37a97bc22f95","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48a05983-ea7b-44c3-a992-de9cc1664717","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c47c8ef5-80d7-495f-aed4-2018547c6479","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21dded79-bee1-4a00-b8ed-516dcd97f1e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","IsCreationKey":false,"Key":2.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_ingame_menu/spr_ingame_menu.yy b/sprites/spr_ingame_menu/spr_ingame_menu.yy index dc8c531f01..5c4c96064f 100644 --- a/sprites/spr_ingame_menu/spr_ingame_menu.yy +++ b/sprites/spr_ingame_menu/spr_ingame_menu.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ingame_menu", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b65f6694-b366-414f-9654-e26918f980bb","name":"b65f6694-b366-414f-9654-e26918f980bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b65f6694-b366-414f-9654-e26918f980bb","name":"b65f6694-b366-414f-9654-e26918f980bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b65f6694-b366-414f-9654-e26918f980bb","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ba6d12f-8596-48c6-9521-69317197d1f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b65f6694-b366-414f-9654-e26918f980bb","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ba6d12f-8596-48c6-9521-69317197d1f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_inspect_small/spr_inspect_small.yy b/sprites/spr_inspect_small/spr_inspect_small.yy index 6933cb4f4a..aca5279750 100644 --- a/sprites/spr_inspect_small/spr_inspect_small.yy +++ b/sprites/spr_inspect_small/spr_inspect_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_inspect_small", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25439a65-c8e8-427a-99ad-76bb9aa6510a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25439a65-c8e8-427a-99ad-76bb9aa6510a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_intelligence_icon/spr_intelligence_icon.yy b/sprites/spr_intelligence_icon/spr_intelligence_icon.yy index 71abe2441b..b679c1b635 100644 --- a/sprites/spr_intelligence_icon/spr_intelligence_icon.yy +++ b/sprites/spr_intelligence_icon/spr_intelligence_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_intelligence_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","path":"sprites/spr_intelligence_icon/spr_intelligence_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee3d470c-76e2-4c4c-9673-2dfeb506bd71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","path":"sprites/spr_intelligence_icon/spr_intelligence_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3d470c-76e2-4c4c-9673-2dfeb506bd71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_iron2_colors/spr_iron2_colors.yy b/sprites/spr_iron2_colors/spr_iron2_colors.yy index 6c0a193c4b..4d734fb12b 100644 --- a/sprites/spr_iron2_colors/spr_iron2_colors.yy +++ b/sprites/spr_iron2_colors/spr_iron2_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_iron2_colors", "bboxMode":0, "bbox_bottom":226, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"68983a54-f464-439d-b9c3-e617744dbd38","name":"68983a54-f464-439d-b9c3-e617744dbd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de91054b-d131-4595-ae7a-cd693f216b00","name":"de91054b-d131-4595-ae7a-cd693f216b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"670d234d-0594-4987-944b-f6f6a18e90ce","name":"670d234d-0594-4987-944b-f6f6a18e90ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46188561-ca08-4852-a95c-89306ae2bc12","name":"46188561-ca08-4852-a95c-89306ae2bc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2458e4aa-898d-47f4-814f-bb35887f2116","name":"2458e4aa-898d-47f4-814f-bb35887f2116","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76f25edc-9000-449f-a06f-4223015d179e","name":"76f25edc-9000-449f-a06f-4223015d179e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7e40c88-2114-4621-b155-7159c72b39be","name":"a7e40c88-2114-4621-b155-7159c72b39be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70304c3b-0d04-4885-833a-b51390439de9","name":"70304c3b-0d04-4885-833a-b51390439de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68983a54-f464-439d-b9c3-e617744dbd38","name":"68983a54-f464-439d-b9c3-e617744dbd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de91054b-d131-4595-ae7a-cd693f216b00","name":"de91054b-d131-4595-ae7a-cd693f216b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"670d234d-0594-4987-944b-f6f6a18e90ce","name":"670d234d-0594-4987-944b-f6f6a18e90ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46188561-ca08-4852-a95c-89306ae2bc12","name":"46188561-ca08-4852-a95c-89306ae2bc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2458e4aa-898d-47f4-814f-bb35887f2116","name":"2458e4aa-898d-47f4-814f-bb35887f2116","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76f25edc-9000-449f-a06f-4223015d179e","name":"76f25edc-9000-449f-a06f-4223015d179e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7e40c88-2114-4621-b155-7159c72b39be","name":"a7e40c88-2114-4621-b155-7159c72b39be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70304c3b-0d04-4885-833a-b51390439de9","name":"70304c3b-0d04-4885-833a-b51390439de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68983a54-f464-439d-b9c3-e617744dbd38","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"103bbe7c-1edf-49cf-8311-e341df44c2e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de91054b-d131-4595-ae7a-cd693f216b00","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28c5461c-ff00-4e26-8433-1b02eef09c7f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"670d234d-0594-4987-944b-f6f6a18e90ce","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea1daba6-87de-458b-8cb9-b74ab92aad25","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6b4c153-dc7b-4187-a900-676798338321","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46188561-ca08-4852-a95c-89306ae2bc12","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87f26c9f-2bbb-4db8-a6fe-6ad91660582d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed57d5ed-21a4-4d56-928c-dbdf31e584b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"50993775-fb34-4a82-b68a-40598688813d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2458e4aa-898d-47f4-814f-bb35887f2116","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f0181e7-c0bf-44ec-949e-c32900e99071","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a220a7b1-219c-475e-ad5f-bc22aceb9088","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f25edc-9000-449f-a06f-4223015d179e","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef512294-e3dc-43c8-8ff7-316d2bd69f17","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7885f74f-4aa2-4a29-8b7d-2be898185fb2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e40c88-2114-4621-b155-7159c72b39be","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33d38726-0482-44de-b32f-e9c07b50f278","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4ee1628-f122-48f7-aabd-d275c0365f97","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70304c3b-0d04-4885-833a-b51390439de9","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64c9c53c-fddc-454c-ad27-08d260147a3e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68983a54-f464-439d-b9c3-e617744dbd38","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"103bbe7c-1edf-49cf-8311-e341df44c2e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de91054b-d131-4595-ae7a-cd693f216b00","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28c5461c-ff00-4e26-8433-1b02eef09c7f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"670d234d-0594-4987-944b-f6f6a18e90ce","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea1daba6-87de-458b-8cb9-b74ab92aad25","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6b4c153-dc7b-4187-a900-676798338321","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46188561-ca08-4852-a95c-89306ae2bc12","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87f26c9f-2bbb-4db8-a6fe-6ad91660582d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed57d5ed-21a4-4d56-928c-dbdf31e584b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"50993775-fb34-4a82-b68a-40598688813d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2458e4aa-898d-47f4-814f-bb35887f2116","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f0181e7-c0bf-44ec-949e-c32900e99071","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a220a7b1-219c-475e-ad5f-bc22aceb9088","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f25edc-9000-449f-a06f-4223015d179e","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef512294-e3dc-43c8-8ff7-316d2bd69f17","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7885f74f-4aa2-4a29-8b7d-2be898185fb2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e40c88-2114-4621-b155-7159c72b39be","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33d38726-0482-44de-b32f-e9c07b50f278","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4ee1628-f122-48f7-aabd-d275c0365f97","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70304c3b-0d04-4885-833a-b51390439de9","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64c9c53c-fddc-454c-ad27-08d260147a3e","IsCreationKey":false,"Key":13.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_iron_colors/spr_iron_colors.yy b/sprites/spr_iron_colors/spr_iron_colors.yy index 1af0c53a46..e488e59424 100644 --- a/sprites/spr_iron_colors/spr_iron_colors.yy +++ b/sprites/spr_iron_colors/spr_iron_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_iron_colors", "bboxMode":0, "bbox_bottom":226, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b65fe40-4fee-4efb-b9af-518409dbe823","name":"9b65fe40-4fee-4efb-b9af-518409dbe823","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5111476-ed12-41e7-9771-0363cd974204","name":"b5111476-ed12-41e7-9771-0363cd974204","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d395d946-9677-487c-9595-19b8c3e6c0a9","name":"d395d946-9677-487c-9595-19b8c3e6c0a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f08d183c-3981-4178-8bac-83424529f1fb","name":"f08d183c-3981-4178-8bac-83424529f1fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03ce65a0-467b-4267-a4ce-f89e37b34863","name":"03ce65a0-467b-4267-a4ce-f89e37b34863","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b65fe40-4fee-4efb-b9af-518409dbe823","name":"9b65fe40-4fee-4efb-b9af-518409dbe823","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5111476-ed12-41e7-9771-0363cd974204","name":"b5111476-ed12-41e7-9771-0363cd974204","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d395d946-9677-487c-9595-19b8c3e6c0a9","name":"d395d946-9677-487c-9595-19b8c3e6c0a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f08d183c-3981-4178-8bac-83424529f1fb","name":"f08d183c-3981-4178-8bac-83424529f1fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03ce65a0-467b-4267-a4ce-f89e37b34863","name":"03ce65a0-467b-4267-a4ce-f89e37b34863","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8dd35abf-58b8-4bee-a73e-b68108f3975a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b27058b-7088-4e05-927d-59513c2528c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b65fe40-4fee-4efb-b9af-518409dbe823","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"715c9c4d-e729-44c6-bc57-259d7aef64ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78d3327a-d1ab-4790-9cb1-c3e61a3625c5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5111476-ed12-41e7-9771-0363cd974204","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c25ac4b-3a8e-4a16-b7ab-77738e68309d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e5be4cf-f072-4bc7-9d27-27c97a7826de","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d395d946-9677-487c-9595-19b8c3e6c0a9","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"027b7011-7248-4b34-bf70-55e0061e160d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"252fbac2-7be8-4ab0-ad94-fc757078ca75","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7c46ff5-11b8-4bf2-aa16-50840e7fba23","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d5a480e-758f-4382-9d7c-b61b9bc36666","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f08d183c-3981-4178-8bac-83424529f1fb","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1036be0f-f3ba-422a-b7ff-f5b9e307e0a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03ce65a0-467b-4267-a4ce-f89e37b34863","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"776c41b8-f672-4a6d-8fa7-d5af0f3c0b7a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"645928a9-b88f-4cc4-acb3-3368a2ce1466","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c5ec09e-d333-4c77-a557-d55af9fe73d0","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8dd35abf-58b8-4bee-a73e-b68108f3975a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b27058b-7088-4e05-927d-59513c2528c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b65fe40-4fee-4efb-b9af-518409dbe823","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"715c9c4d-e729-44c6-bc57-259d7aef64ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78d3327a-d1ab-4790-9cb1-c3e61a3625c5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5111476-ed12-41e7-9771-0363cd974204","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c25ac4b-3a8e-4a16-b7ab-77738e68309d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e5be4cf-f072-4bc7-9d27-27c97a7826de","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d395d946-9677-487c-9595-19b8c3e6c0a9","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"027b7011-7248-4b34-bf70-55e0061e160d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"252fbac2-7be8-4ab0-ad94-fc757078ca75","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7c46ff5-11b8-4bf2-aa16-50840e7fba23","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d5a480e-758f-4382-9d7c-b61b9bc36666","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f08d183c-3981-4178-8bac-83424529f1fb","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1036be0f-f3ba-422a-b7ff-f5b9e307e0a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03ce65a0-467b-4267-a4ce-f89e37b34863","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"776c41b8-f672-4a6d-8fa7-d5af0f3c0b7a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"645928a9-b88f-4cc4-acb3-3368a2ce1466","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c5ec09e-d333-4c77-a557-d55af9fe73d0","IsCreationKey":false,"Key":13.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_jump_pack_complex/spr_jump_pack_complex.yy b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy index fb9279641b..76aa8a6fe6 100644 --- a/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy +++ b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_jump_pack_complex", "bboxMode":0, "bbox_bottom":77, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee2f8787-456f-461c-b7c9-774ea1070012","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee2f8787-456f-461c-b7c9-774ea1070012","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_knightly_belt/spr_knightly_belt.yy b/sprites/spr_knightly_belt/spr_knightly_belt.yy index 5d1add7640..c0e74a352c 100644 --- a/sprites/spr_knightly_belt/spr_knightly_belt.yy +++ b/sprites/spr_knightly_belt/spr_knightly_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_knightly_belt", "bboxMode":0, "bbox_bottom":114, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_knightly_belt/spr_knightly_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68badb9c-da79-4a80-b8c4-f9962a02da21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_knightly_belt/spr_knightly_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68badb9c-da79-4a80-b8c4-f9962a02da21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy b/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy index 62900585e0..99b64f495a 100644 --- a/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy +++ b/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_knightly_personal_livery", "bboxMode":0, "bbox_bottom":147, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"024f569c-a0dc-465d-a295-994d80ecdc72","name":"024f569c-a0dc-465d-a295-994d80ecdc72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"024f569c-a0dc-465d-a295-994d80ecdc72","name":"024f569c-a0dc-465d-a295-994d80ecdc72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98d44b30-9d1d-49f6-a2d8-9a187c5b55eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"024f569c-a0dc-465d-a295-994d80ecdc72","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0128610-1f4f-4c1f-8ff4-b347f2d3f35b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c39acfe9-3000-43ce-be3a-b1bb15a4f80a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43ef9db9-df65-4ceb-9a93-80c7a7f4cd9b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1474bec5-4278-4ec1-8ff2-9846b8eb8267","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98d44b30-9d1d-49f6-a2d8-9a187c5b55eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"024f569c-a0dc-465d-a295-994d80ecdc72","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0128610-1f4f-4c1f-8ff4-b347f2d3f35b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c39acfe9-3000-43ce-be3a-b1bb15a4f80a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43ef9db9-df65-4ceb-9a93-80c7a7f4cd9b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1474bec5-4278-4ec1-8ff2-9846b8eb8267","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_knightly_robes/spr_knightly_robes.yy b/sprites/spr_knightly_robes/spr_knightly_robes.yy index 0bf232cc4f..25dd2cc1fc 100644 --- a/sprites/spr_knightly_robes/spr_knightly_robes.yy +++ b/sprites/spr_knightly_robes/spr_knightly_robes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_knightly_robes", "bboxMode":0, "bbox_bottom":200, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a188b5e-581b-4e24-a278-56e5c336a324","name":"9a188b5e-581b-4e24-a278-56e5c336a324","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a188b5e-581b-4e24-a278-56e5c336a324","name":"9a188b5e-581b-4e24-a278-56e5c336a324","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"760e0b63-7d42-41be-ab4b-ea3807fb2c02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a188b5e-581b-4e24-a278-56e5c336a324","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f61c39e-e9b8-40cc-8f58-c42eb3501c63","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ef4e6ac-c7c0-4c77-88e2-b471a1031483","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"760e0b63-7d42-41be-ab4b-ea3807fb2c02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a188b5e-581b-4e24-a278-56e5c336a324","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f61c39e-e9b8-40cc-8f58-c42eb3501c63","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ef4e6ac-c7c0-4c77-88e2-b471a1031483","IsCreationKey":false,"Key":2.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_laurel/spr_laurel.yy b/sprites/spr_laurel/spr_laurel.yy index c313ad5e54..679ad729f4 100644 --- a/sprites/spr_laurel/spr_laurel.yy +++ b/sprites/spr_laurel/spr_laurel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_laurel", "bboxMode":0, "bbox_bottom":64, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_laurel/spr_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ff43a50-5175-4249-ac1a-a39557b93c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_laurel/spr_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ff43a50-5175-4249-ac1a-a39557b93c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy b/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy index a94626035c..10f9459f15 100644 --- a/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy +++ b/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_left_pauldron_chainmail", "bboxMode":0, "bbox_bottom":96, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -90,9 +84,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy b/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy index a3d9c504bc..6dd02992f7 100644 --- a/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy +++ b/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_left_pauldron_fur_hanging", "bboxMode":0, "bbox_bottom":117, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -38,13 +38,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -94,18 +88,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fac0f522-8b4a-4288-ad9c-70f373393e94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bd0f84a-fd4a-496b-9fd1-369d25bd45ec","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"168346db-67b1-47ac-b145-52da0b158996","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aba64abc-cd2b-43a1-8891-da658e78d283","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fac0f522-8b4a-4288-ad9c-70f373393e94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bd0f84a-fd4a-496b-9fd1-369d25bd45ec","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"168346db-67b1-47ac-b145-52da0b158996","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aba64abc-cd2b-43a1-8891-da658e78d283","IsCreationKey":false,"Key":3.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_left_shin_spikes/spr_left_shin_spikes.yy b/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy index 53694dcafc..da9d4b35ee 100644 --- a/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy +++ b/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_left_shin_spikes", "bboxMode":0, "bbox_bottom":199, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_leopard_sprite/spr_leopard_sprite.yy b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy index 611ba4f450..e1e33b8165 100644 --- a/sprites/spr_leopard_sprite/spr_leopard_sprite.yy +++ b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_leopard_sprite", "bboxMode":0, "bbox_bottom":1045, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"062dc391-a5c8-448f-ae78-77f49f609d50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"062dc391-a5c8-448f-ae78-77f49f609d50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_lib_area_pad/spr_lib_area_pad.yy b/sprites/spr_lib_area_pad/spr_lib_area_pad.yy index 56a13254bb..caa64fa184 100644 --- a/sprites/spr_lib_area_pad/spr_lib_area_pad.yy +++ b/sprites/spr_lib_area_pad/spr_lib_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_lib_area_pad", "bboxMode":0, "bbox_bottom":156, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"79a89cdc-8304-4ba7-85bc-216c6b783541","name":"79a89cdc-8304-4ba7-85bc-216c6b783541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79a89cdc-8304-4ba7-85bc-216c6b783541","name":"79a89cdc-8304-4ba7-85bc-216c6b783541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79a89cdc-8304-4ba7-85bc-216c6b783541","path":"sprites/spr_lib_area_pad/spr_lib_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"18b5f818-4948-4206-9e3b-991e27ceb176","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79a89cdc-8304-4ba7-85bc-216c6b783541","path":"sprites/spr_lib_area_pad/spr_lib_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"18b5f818-4948-4206-9e3b-991e27ceb176","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_lion_belt/spr_lion_belt.yy b/sprites/spr_lion_belt/spr_lion_belt.yy index 4ef9561af1..104e0121f5 100644 --- a/sprites/spr_lion_belt/spr_lion_belt.yy +++ b/sprites/spr_lion_belt/spr_lion_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_lion_belt", "bboxMode":0, "bbox_bottom":106, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_lion_belt/spr_lion_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83a8fffe-2541-46cc-9cd5-08e04842f492","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_lion_belt/spr_lion_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83a8fffe-2541-46cc-9cd5-08e04842f492","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_load_splash/spr_load_splash.yy b/sprites/spr_load_splash/spr_load_splash.yy index 4bb6e38af9..8e28f807ca 100644 --- a/sprites/spr_load_splash/spr_load_splash.yy +++ b/sprites/spr_load_splash/spr_load_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_load_splash", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f37f9ad-5acf-4749-b330-653b00bf1685","name":"9f37f9ad-5acf-4749-b330-653b00bf1685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f37f9ad-5acf-4749-b330-653b00bf1685","name":"9f37f9ad-5acf-4749-b330-653b00bf1685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f37f9ad-5acf-4749-b330-653b00bf1685","path":"sprites/spr_load_splash/spr_load_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4a62229-0821-40e8-ba11-6460df7dfcbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f37f9ad-5acf-4749-b330-653b00bf1685","path":"sprites/spr_load_splash/spr_load_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4a62229-0821-40e8-ba11-6460df7dfcbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_load_text/spr_load_text.yy b/sprites/spr_load_text/spr_load_text.yy index 1d2b8442d2..307254ed1f 100644 --- a/sprites/spr_load_text/spr_load_text.yy +++ b/sprites/spr_load_text/spr_load_text.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_load_text", "bboxMode":0, "bbox_bottom":52, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70d9d206-2244-4eb3-ab1e-db128d778083","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e3e5baa6-38ac-4bc8-874e-4765f803541f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6fb65d0-5839-486c-b262-bb90df98c9dd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70d9d206-2244-4eb3-ab1e-db128d778083","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e3e5baa6-38ac-4bc8-874e-4765f803541f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","path":"sprites/spr_load_text/spr_load_text.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6fb65d0-5839-486c-b262-bb90df98c9dd","IsCreationKey":false,"Key":2.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_loadbar/spr_loadbar.yy b/sprites/spr_loadbar/spr_loadbar.yy index f0e35ac0c6..2d45f1de76 100644 --- a/sprites/spr_loadbar/spr_loadbar.yy +++ b/sprites/spr_loadbar/spr_loadbar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loadbar", "bboxMode":0, "bbox_bottom":10, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90751334-decf-4a0b-8001-6657b1ffacce","name":"90751334-decf-4a0b-8001-6657b1ffacce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90751334-decf-4a0b-8001-6657b1ffacce","name":"90751334-decf-4a0b-8001-6657b1ffacce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90751334-decf-4a0b-8001-6657b1ffacce","path":"sprites/spr_loadbar/spr_loadbar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69fbbe7f-fe79-4fac-888c-f3b6a0794f2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90751334-decf-4a0b-8001-6657b1ffacce","path":"sprites/spr_loadbar/spr_loadbar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69fbbe7f-fe79-4fac-888c-f3b6a0794f2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_loadbar_cover/spr_loadbar_cover.yy b/sprites/spr_loadbar_cover/spr_loadbar_cover.yy index 850818832f..96e076bab2 100644 --- a/sprites/spr_loadbar_cover/spr_loadbar_cover.yy +++ b/sprites/spr_loadbar_cover/spr_loadbar_cover.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loadbar_cover", "bboxMode":0, "bbox_bottom":12, @@ -12,107 +12,107 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f270f2a7-106e-4206-b281-695e204d1fb5","name":"f270f2a7-106e-4206-b281-695e204d1fb5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd69f163-4f5d-498f-9626-78607c751537","name":"cd69f163-4f5d-498f-9626-78607c751537","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b8470f0-1f27-4104-b687-cb965c775614","name":"5b8470f0-1f27-4104-b687-cb965c775614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4d0f773-f488-4932-9aa3-265920a8f897","name":"b4d0f773-f488-4932-9aa3-265920a8f897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112e4e63-bd13-4011-8039-f279dadb602e","name":"112e4e63-bd13-4011-8039-f279dadb602e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16883075-4215-499b-8420-ae62da7885b3","name":"16883075-4215-499b-8420-ae62da7885b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"073c6354-9f1a-403c-af4c-9f7e11558113","name":"073c6354-9f1a-403c-af4c-9f7e11558113","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c50586b8-1616-46a7-ab52-621258e72d24","name":"c50586b8-1616-46a7-ab52-621258e72d24","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc92382f-39f4-4234-a7ec-9adff3753797","name":"bc92382f-39f4-4234-a7ec-9adff3753797","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"086ee7b7-2a83-46bd-801c-034bd3897145","name":"086ee7b7-2a83-46bd-801c-034bd3897145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"17186ae0-6f03-47a5-b79b-a745ced48618","name":"17186ae0-6f03-47a5-b79b-a745ced48618","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59b94851-05b4-424c-a678-d9df694da13f","name":"59b94851-05b4-424c-a678-d9df694da13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48e6e0df-250c-4313-9521-88fc5cee2be2","name":"48e6e0df-250c-4313-9521-88fc5cee2be2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82780114-bc2c-4080-95ea-0b3908914da6","name":"82780114-bc2c-4080-95ea-0b3908914da6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"425a2b21-1b7c-4060-9429-39cc3011d999","name":"425a2b21-1b7c-4060-9429-39cc3011d999","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aed5da4d-ea30-4654-a61f-16967414002e","name":"aed5da4d-ea30-4654-a61f-16967414002e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5bba97a-d671-49c8-84d2-f995712fc403","name":"c5bba97a-d671-49c8-84d2-f995712fc403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"daa9667b-a496-4f30-b167-6af80c119e30","name":"daa9667b-a496-4f30-b167-6af80c119e30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9cd073b-de37-49db-9f59-f6cd38490c52","name":"a9cd073b-de37-49db-9f59-f6cd38490c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f82e291-5fc6-45bc-a208-3647e5830f17","name":"4f82e291-5fc6-45bc-a208-3647e5830f17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c113a74f-504d-475b-8115-f90294743c81","name":"c113a74f-504d-475b-8115-f90294743c81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be762ab0-d12d-48d2-bb53-d4730721531b","name":"be762ab0-d12d-48d2-bb53-d4730721531b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af6c6100-804f-4c05-8d22-71e0211d277a","name":"af6c6100-804f-4c05-8d22-71e0211d277a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44daeebc-81f7-4a3e-9566-e297f548509d","name":"44daeebc-81f7-4a3e-9566-e297f548509d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76358f9c-44de-4773-bf94-08cfd0b706b7","name":"76358f9c-44de-4773-bf94-08cfd0b706b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"428c192f-e278-49f5-8d3b-74b07cd088b1","name":"428c192f-e278-49f5-8d3b-74b07cd088b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"51927562-4d2a-436b-adbb-62a690d6c661","name":"51927562-4d2a-436b-adbb-62a690d6c661","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8af43abe-2954-4429-a96e-5553ad6375c9","name":"8af43abe-2954-4429-a96e-5553ad6375c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16dfc277-8209-4c38-a4fa-acff85d6b150","name":"16dfc277-8209-4c38-a4fa-acff85d6b150","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43771aa1-f221-4485-9c32-0ca06344e04c","name":"43771aa1-f221-4485-9c32-0ca06344e04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e522eb85-b82f-4feb-b671-5108350cfb16","name":"e522eb85-b82f-4feb-b671-5108350cfb16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db054ef7-2537-41d7-bcaf-34b5f9073296","name":"db054ef7-2537-41d7-bcaf-34b5f9073296","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76cd8d8c-db17-401c-a660-84e8565440be","name":"76cd8d8c-db17-401c-a660-84e8565440be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"932663f3-9530-4c49-8d84-8c20a41549ef","name":"932663f3-9530-4c49-8d84-8c20a41549ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"13c95d20-70e5-4988-b859-c15ab08abd85","name":"13c95d20-70e5-4988-b859-c15ab08abd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b709ce77-9b28-4388-bd75-f096350846ff","name":"b709ce77-9b28-4388-bd75-f096350846ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"164fb034-c917-4aeb-8e30-0c4c989a3560","name":"164fb034-c917-4aeb-8e30-0c4c989a3560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bbe1b91b-58af-460f-abd5-80225a8dde77","name":"bbe1b91b-58af-460f-abd5-80225a8dde77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ef6c7d-b668-4ece-9607-822177143185","name":"b1ef6c7d-b668-4ece-9607-822177143185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f270f2a7-106e-4206-b281-695e204d1fb5","name":"f270f2a7-106e-4206-b281-695e204d1fb5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd69f163-4f5d-498f-9626-78607c751537","name":"cd69f163-4f5d-498f-9626-78607c751537","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b8470f0-1f27-4104-b687-cb965c775614","name":"5b8470f0-1f27-4104-b687-cb965c775614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4d0f773-f488-4932-9aa3-265920a8f897","name":"b4d0f773-f488-4932-9aa3-265920a8f897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112e4e63-bd13-4011-8039-f279dadb602e","name":"112e4e63-bd13-4011-8039-f279dadb602e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16883075-4215-499b-8420-ae62da7885b3","name":"16883075-4215-499b-8420-ae62da7885b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"073c6354-9f1a-403c-af4c-9f7e11558113","name":"073c6354-9f1a-403c-af4c-9f7e11558113","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c50586b8-1616-46a7-ab52-621258e72d24","name":"c50586b8-1616-46a7-ab52-621258e72d24","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc92382f-39f4-4234-a7ec-9adff3753797","name":"bc92382f-39f4-4234-a7ec-9adff3753797","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"086ee7b7-2a83-46bd-801c-034bd3897145","name":"086ee7b7-2a83-46bd-801c-034bd3897145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"17186ae0-6f03-47a5-b79b-a745ced48618","name":"17186ae0-6f03-47a5-b79b-a745ced48618","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59b94851-05b4-424c-a678-d9df694da13f","name":"59b94851-05b4-424c-a678-d9df694da13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48e6e0df-250c-4313-9521-88fc5cee2be2","name":"48e6e0df-250c-4313-9521-88fc5cee2be2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82780114-bc2c-4080-95ea-0b3908914da6","name":"82780114-bc2c-4080-95ea-0b3908914da6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"425a2b21-1b7c-4060-9429-39cc3011d999","name":"425a2b21-1b7c-4060-9429-39cc3011d999","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aed5da4d-ea30-4654-a61f-16967414002e","name":"aed5da4d-ea30-4654-a61f-16967414002e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5bba97a-d671-49c8-84d2-f995712fc403","name":"c5bba97a-d671-49c8-84d2-f995712fc403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daa9667b-a496-4f30-b167-6af80c119e30","name":"daa9667b-a496-4f30-b167-6af80c119e30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9cd073b-de37-49db-9f59-f6cd38490c52","name":"a9cd073b-de37-49db-9f59-f6cd38490c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f82e291-5fc6-45bc-a208-3647e5830f17","name":"4f82e291-5fc6-45bc-a208-3647e5830f17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c113a74f-504d-475b-8115-f90294743c81","name":"c113a74f-504d-475b-8115-f90294743c81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be762ab0-d12d-48d2-bb53-d4730721531b","name":"be762ab0-d12d-48d2-bb53-d4730721531b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af6c6100-804f-4c05-8d22-71e0211d277a","name":"af6c6100-804f-4c05-8d22-71e0211d277a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44daeebc-81f7-4a3e-9566-e297f548509d","name":"44daeebc-81f7-4a3e-9566-e297f548509d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76358f9c-44de-4773-bf94-08cfd0b706b7","name":"76358f9c-44de-4773-bf94-08cfd0b706b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"428c192f-e278-49f5-8d3b-74b07cd088b1","name":"428c192f-e278-49f5-8d3b-74b07cd088b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51927562-4d2a-436b-adbb-62a690d6c661","name":"51927562-4d2a-436b-adbb-62a690d6c661","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8af43abe-2954-4429-a96e-5553ad6375c9","name":"8af43abe-2954-4429-a96e-5553ad6375c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16dfc277-8209-4c38-a4fa-acff85d6b150","name":"16dfc277-8209-4c38-a4fa-acff85d6b150","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43771aa1-f221-4485-9c32-0ca06344e04c","name":"43771aa1-f221-4485-9c32-0ca06344e04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e522eb85-b82f-4feb-b671-5108350cfb16","name":"e522eb85-b82f-4feb-b671-5108350cfb16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db054ef7-2537-41d7-bcaf-34b5f9073296","name":"db054ef7-2537-41d7-bcaf-34b5f9073296","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76cd8d8c-db17-401c-a660-84e8565440be","name":"76cd8d8c-db17-401c-a660-84e8565440be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"932663f3-9530-4c49-8d84-8c20a41549ef","name":"932663f3-9530-4c49-8d84-8c20a41549ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13c95d20-70e5-4988-b859-c15ab08abd85","name":"13c95d20-70e5-4988-b859-c15ab08abd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b709ce77-9b28-4388-bd75-f096350846ff","name":"b709ce77-9b28-4388-bd75-f096350846ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"164fb034-c917-4aeb-8e30-0c4c989a3560","name":"164fb034-c917-4aeb-8e30-0c4c989a3560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbe1b91b-58af-460f-abd5-80225a8dde77","name":"bbe1b91b-58af-460f-abd5-80225a8dde77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ef6c7d-b668-4ece-9607-822177143185","name":"b1ef6c7d-b668-4ece-9607-822177143185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -168,309 +168,107 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b0b789b-4bdb-401e-96da-afd7c75c6210","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f270f2a7-106e-4206-b281-695e204d1fb5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bbdbe1e1-971b-4311-9cb1-02d712e9c45d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"739b10e1-22aa-4249-b5ef-46e7de8f01ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e7b972c-c86c-4927-9a87-3f5f42040f25","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"005472ef-931c-469f-9b69-bf219369c957","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8a29f74-64aa-4e66-a3ff-04705653ca26","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad0a45db-46f4-4610-af7e-61aad464033d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d278022c-ce16-41a7-8353-cdde545725cb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"03b3f0d0-dfbd-4da7-9d9b-c8af86b22b49","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c722e800-1cf3-4261-9f64-975857febd9f","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd69f163-4f5d-498f-9626-78607c751537","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24bc6109-dc30-4c93-961c-08deaecc686e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b8470f0-1f27-4104-b687-cb965c775614","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38a86e47-5cb0-4b12-80bd-64a52904c277","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d0f773-f488-4932-9aa3-265920a8f897","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"984d49d9-9992-46a5-bc95-9bdd882f1d74","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9431008b-0236-4d32-b6b9-d9b49ff2d1f9","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112e4e63-bd13-4011-8039-f279dadb602e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d975b258-346e-4e6e-ad69-749afe3437e1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44699ee4-d5f8-43ea-b53f-b0c8b6edf660","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16b61097-3845-4557-b2bf-d98cd8802e98","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24153104-6610-48e7-ae67-f3e70f6eddb9","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d6f6a2b-0fad-4e3e-8e22-ffebef9054c5","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16883075-4215-499b-8420-ae62da7885b3","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37dafa46-2c53-4558-b0bb-dd9fc36d7436","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37d06089-d4dc-4d9f-8610-eb87e097c6bb","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"073c6354-9f1a-403c-af4c-9f7e11558113","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf884d00-1749-4528-823d-3f8d181e6e01","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50586b8-1616-46a7-ab52-621258e72d24","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a159d481-4be3-4d4d-b7f7-ec8fd2c7c9d0","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b573560-5787-4e28-9679-1437b238717e","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"292929e6-f71b-4075-b1a8-09b429e1452a","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc92382f-39f4-4234-a7ec-9adff3753797","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53aaea6d-7fec-406d-9cd5-c4b3ffa4fdf9","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30b8af86-0f0c-456b-abfc-9ae65d1468b2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"086ee7b7-2a83-46bd-801c-034bd3897145","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cee99131-344c-47b4-a677-40fd26cc818c","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"17186ae0-6f03-47a5-b79b-a745ced48618","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf16cec1-c3ee-4125-a420-a75feffded91","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f9fead9-cae1-4f65-b3ed-b2b74007d2b6","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd6760f6-1268-414b-8766-6b54ef3dfb54","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac0acf35-3b64-4e58-a163-7fe24cea802e","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6724212-220c-49e5-b2d1-d5ca38544c0e","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b94851-05b4-424c-a678-d9df694da13f","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bebb4de-d816-40e6-a212-be02c23b7371","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e6e0df-250c-4313-9521-88fc5cee2be2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7faec82c-af74-4e1a-b2d4-4b26d90177e2","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9d4f482a-716b-4e29-bf35-eaf601939091","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9620a79-e6dd-4938-a234-5dc3801cf2b3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bc6d2e7-33fc-4e30-b3e7-aa4d0f97618c","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82780114-bc2c-4080-95ea-0b3908914da6","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c13ea8e-eefe-470c-bdf6-41c08f6ee95d","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d902a25-39e8-4a6c-aeb2-39658d78e27c","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"425a2b21-1b7c-4060-9429-39cc3011d999","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae86d625-c635-47ba-9df2-ffddc11d41cc","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8576f60e-16af-42f7-a350-ed6edb82f163","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d21af454-b326-4b54-b79d-4266b32b7f32","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79c3668c-6b4e-4f08-93ad-d241bffbfa8f","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0964d0e0-8720-49e0-b660-21d00d6afc67","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aed5da4d-ea30-4654-a61f-16967414002e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a539e36-19c9-4b11-bf0c-543c10ce9d5c","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bba97a-d671-49c8-84d2-f995712fc403","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a82a0bf8-2e6b-4d8e-b502-3bbaad4b3e1b","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa9667b-a496-4f30-b167-6af80c119e30","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1442d228-921c-44f3-8190-d495e0b40d7c","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64cb21de-5b8f-4c11-876d-84c96c118770","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9cd073b-de37-49db-9f59-f6cd38490c52","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"20e56132-6426-44ab-bd71-83a8e39e5e25","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6a4a33c-b0ee-4efa-a014-74cf6037c262","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f82e291-5fc6-45bc-a208-3647e5830f17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"414d5ad0-8dc3-445e-a5e1-3529223ce19e","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c113a74f-504d-475b-8115-f90294743c81","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0b3db1b-5491-4baf-a0e5-f2b5f75624e6","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be762ab0-d12d-48d2-bb53-d4730721531b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95e3bd3f-ca82-4058-8ceb-65f74e7a5c89","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd83a6b7-311f-4808-873c-c58f1b0db25f","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62d887ff-579d-4210-a7db-8129c8e81fde","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af6c6100-804f-4c05-8d22-71e0211d277a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7311716e-8bfc-494e-8c50-f96a90f80b50","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44daeebc-81f7-4a3e-9566-e297f548509d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e425231f-3a7e-4074-8576-7784f54854b5","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76358f9c-44de-4773-bf94-08cfd0b706b7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f29bee25-b9a9-414e-9f6f-af7368b6b2e3","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d29a2eb1-995f-416f-8d57-591692b16f8f","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78090b8e-e008-4abe-b9d9-cd85610ceb8b","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"428c192f-e278-49f5-8d3b-74b07cd088b1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce03e653-b78e-487d-8d27-d7c309147c31","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac0b54a5-db44-4308-96c3-c2ac0ed47b6d","IsCreationKey":false,"Key":62.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51927562-4d2a-436b-adbb-62a690d6c661","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de398855-c826-42e4-8362-bc3e291045b5","IsCreationKey":false,"Key":63.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de94934c-4ebf-44dd-b634-54132bf008b5","IsCreationKey":false,"Key":64.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c870f91-064e-48c8-8038-9edb0c837366","IsCreationKey":false,"Key":65.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8af43abe-2954-4429-a96e-5553ad6375c9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55054fbe-46a5-4879-acb7-40660cfdc7e5","IsCreationKey":false,"Key":66.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40b36087-ab89-4d97-8a24-749b87b03beb","IsCreationKey":false,"Key":67.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16dfc277-8209-4c38-a4fa-acff85d6b150","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58ab3ae2-4ba4-472d-88d7-451f6e5ca2eb","IsCreationKey":false,"Key":68.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ff78728-0939-4a0e-9b9c-9851d8047ffd","IsCreationKey":false,"Key":69.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43771aa1-f221-4485-9c32-0ca06344e04c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4857572-07c1-4a73-bf58-d9f8464fc2fb","IsCreationKey":false,"Key":70.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d58b775-994c-4ca0-a3bf-a8742b9c21de","IsCreationKey":false,"Key":71.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d993ee28-a89d-42cc-bef9-51c5caf584d8","IsCreationKey":false,"Key":72.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e522eb85-b82f-4feb-b671-5108350cfb16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97a668ce-c178-4d92-9e9b-dc4aff0cb736","IsCreationKey":false,"Key":73.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46a5df03-5cf0-4b89-a27c-ee7e2d3a2c80","IsCreationKey":false,"Key":74.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f8dc377-3aa1-4816-a121-6a259c18db36","IsCreationKey":false,"Key":75.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db054ef7-2537-41d7-bcaf-34b5f9073296","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f82652c-28d3-4186-b10c-c9109b2c55e8","IsCreationKey":false,"Key":76.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1492999b-1cb4-4c01-80f0-35941c4bf15d","IsCreationKey":false,"Key":77.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b5dee69b-eb3a-47a8-b11d-b76de78a9a28","IsCreationKey":false,"Key":78.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cd8d8c-db17-401c-a660-84e8565440be","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4f905d2-ad21-47e7-a476-1fb03417644f","IsCreationKey":false,"Key":79.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73da1b91-82d6-4fb1-9452-acad9f6d75fc","IsCreationKey":false,"Key":80.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a13fa07-b693-4d51-910f-92c8867be917","IsCreationKey":false,"Key":81.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62a6e637-eb9f-4f76-a6fa-ca9c1e6de9df","IsCreationKey":false,"Key":82.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a53e3b90-cf7f-47b2-9ad2-3105e0b2fc3c","IsCreationKey":false,"Key":83.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"932663f3-9530-4c49-8d84-8c20a41549ef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b82f6ff-199b-46dc-a0cd-f754e229ceb1","IsCreationKey":false,"Key":84.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13c95d20-70e5-4988-b859-c15ab08abd85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82405c83-797a-4506-bceb-490563a38732","IsCreationKey":false,"Key":85.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b709ce77-9b28-4388-bd75-f096350846ff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca72f368-e6aa-4854-87b0-a68da0221055","IsCreationKey":false,"Key":86.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ee0754e-dac4-4409-b340-891ed282fa74","IsCreationKey":false,"Key":87.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"164fb034-c917-4aeb-8e30-0c4c989a3560","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bd3efdd-0bc5-41af-af15-2795d790b5ad","IsCreationKey":false,"Key":88.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbe1b91b-58af-460f-abd5-80225a8dde77","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"707bed96-75aa-4dd0-81fd-c35afaab1262","IsCreationKey":false,"Key":89.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26e6d9d7-a200-4539-936f-c8b5aa45c97b","IsCreationKey":false,"Key":90.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"463084e1-f006-476e-82bb-0be3e235ae58","IsCreationKey":false,"Key":91.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a90247f4-f046-491d-8522-841702b91185","IsCreationKey":false,"Key":92.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa446947-631d-4127-8790-7011d8c63b45","IsCreationKey":false,"Key":93.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49be7cd9-0092-467a-b854-351a2c2d014a","IsCreationKey":false,"Key":94.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9a92718-eab9-4754-94f9-64c6c5907072","IsCreationKey":false,"Key":95.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f09d320d-b486-4965-849c-91ef3f2f5d7b","IsCreationKey":false,"Key":96.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ef6c7d-b668-4ece-9607-822177143185","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de182601-fc79-4a18-afa5-6ae0564ce725","IsCreationKey":false,"Key":97.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a40882-8686-40cd-98b5-60b337991b92","IsCreationKey":false,"Key":98.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ccf1f50-5300-4601-af65-e0d89fe4dd67","IsCreationKey":false,"Key":99.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63a97d6d-c248-471b-baff-5c341a6781d7","IsCreationKey":false,"Key":100.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b0b789b-4bdb-401e-96da-afd7c75c6210","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f270f2a7-106e-4206-b281-695e204d1fb5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bbdbe1e1-971b-4311-9cb1-02d712e9c45d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"739b10e1-22aa-4249-b5ef-46e7de8f01ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e7b972c-c86c-4927-9a87-3f5f42040f25","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"005472ef-931c-469f-9b69-bf219369c957","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8a29f74-64aa-4e66-a3ff-04705653ca26","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad0a45db-46f4-4610-af7e-61aad464033d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d278022c-ce16-41a7-8353-cdde545725cb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03b3f0d0-dfbd-4da7-9d9b-c8af86b22b49","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c722e800-1cf3-4261-9f64-975857febd9f","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd69f163-4f5d-498f-9626-78607c751537","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24bc6109-dc30-4c93-961c-08deaecc686e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b8470f0-1f27-4104-b687-cb965c775614","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38a86e47-5cb0-4b12-80bd-64a52904c277","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d0f773-f488-4932-9aa3-265920a8f897","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"984d49d9-9992-46a5-bc95-9bdd882f1d74","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9431008b-0236-4d32-b6b9-d9b49ff2d1f9","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112e4e63-bd13-4011-8039-f279dadb602e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d975b258-346e-4e6e-ad69-749afe3437e1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44699ee4-d5f8-43ea-b53f-b0c8b6edf660","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16b61097-3845-4557-b2bf-d98cd8802e98","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24153104-6610-48e7-ae67-f3e70f6eddb9","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d6f6a2b-0fad-4e3e-8e22-ffebef9054c5","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16883075-4215-499b-8420-ae62da7885b3","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37dafa46-2c53-4558-b0bb-dd9fc36d7436","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37d06089-d4dc-4d9f-8610-eb87e097c6bb","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"073c6354-9f1a-403c-af4c-9f7e11558113","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf884d00-1749-4528-823d-3f8d181e6e01","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50586b8-1616-46a7-ab52-621258e72d24","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a159d481-4be3-4d4d-b7f7-ec8fd2c7c9d0","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b573560-5787-4e28-9679-1437b238717e","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"292929e6-f71b-4075-b1a8-09b429e1452a","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc92382f-39f4-4234-a7ec-9adff3753797","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53aaea6d-7fec-406d-9cd5-c4b3ffa4fdf9","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30b8af86-0f0c-456b-abfc-9ae65d1468b2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"086ee7b7-2a83-46bd-801c-034bd3897145","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cee99131-344c-47b4-a677-40fd26cc818c","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"17186ae0-6f03-47a5-b79b-a745ced48618","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf16cec1-c3ee-4125-a420-a75feffded91","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f9fead9-cae1-4f65-b3ed-b2b74007d2b6","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd6760f6-1268-414b-8766-6b54ef3dfb54","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac0acf35-3b64-4e58-a163-7fe24cea802e","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6724212-220c-49e5-b2d1-d5ca38544c0e","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b94851-05b4-424c-a678-d9df694da13f","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bebb4de-d816-40e6-a212-be02c23b7371","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e6e0df-250c-4313-9521-88fc5cee2be2","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7faec82c-af74-4e1a-b2d4-4b26d90177e2","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9d4f482a-716b-4e29-bf35-eaf601939091","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9620a79-e6dd-4938-a234-5dc3801cf2b3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bc6d2e7-33fc-4e30-b3e7-aa4d0f97618c","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82780114-bc2c-4080-95ea-0b3908914da6","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c13ea8e-eefe-470c-bdf6-41c08f6ee95d","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d902a25-39e8-4a6c-aeb2-39658d78e27c","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"425a2b21-1b7c-4060-9429-39cc3011d999","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae86d625-c635-47ba-9df2-ffddc11d41cc","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8576f60e-16af-42f7-a350-ed6edb82f163","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d21af454-b326-4b54-b79d-4266b32b7f32","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79c3668c-6b4e-4f08-93ad-d241bffbfa8f","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0964d0e0-8720-49e0-b660-21d00d6afc67","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aed5da4d-ea30-4654-a61f-16967414002e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a539e36-19c9-4b11-bf0c-543c10ce9d5c","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bba97a-d671-49c8-84d2-f995712fc403","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a82a0bf8-2e6b-4d8e-b502-3bbaad4b3e1b","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa9667b-a496-4f30-b167-6af80c119e30","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1442d228-921c-44f3-8190-d495e0b40d7c","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64cb21de-5b8f-4c11-876d-84c96c118770","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9cd073b-de37-49db-9f59-f6cd38490c52","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"20e56132-6426-44ab-bd71-83a8e39e5e25","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6a4a33c-b0ee-4efa-a014-74cf6037c262","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f82e291-5fc6-45bc-a208-3647e5830f17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"414d5ad0-8dc3-445e-a5e1-3529223ce19e","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c113a74f-504d-475b-8115-f90294743c81","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0b3db1b-5491-4baf-a0e5-f2b5f75624e6","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be762ab0-d12d-48d2-bb53-d4730721531b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95e3bd3f-ca82-4058-8ceb-65f74e7a5c89","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd83a6b7-311f-4808-873c-c58f1b0db25f","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62d887ff-579d-4210-a7db-8129c8e81fde","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af6c6100-804f-4c05-8d22-71e0211d277a","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7311716e-8bfc-494e-8c50-f96a90f80b50","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44daeebc-81f7-4a3e-9566-e297f548509d","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e425231f-3a7e-4074-8576-7784f54854b5","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76358f9c-44de-4773-bf94-08cfd0b706b7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f29bee25-b9a9-414e-9f6f-af7368b6b2e3","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d29a2eb1-995f-416f-8d57-591692b16f8f","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78090b8e-e008-4abe-b9d9-cd85610ceb8b","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"428c192f-e278-49f5-8d3b-74b07cd088b1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce03e653-b78e-487d-8d27-d7c309147c31","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac0b54a5-db44-4308-96c3-c2ac0ed47b6d","IsCreationKey":false,"Key":62.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51927562-4d2a-436b-adbb-62a690d6c661","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de398855-c826-42e4-8362-bc3e291045b5","IsCreationKey":false,"Key":63.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de94934c-4ebf-44dd-b634-54132bf008b5","IsCreationKey":false,"Key":64.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c870f91-064e-48c8-8038-9edb0c837366","IsCreationKey":false,"Key":65.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8af43abe-2954-4429-a96e-5553ad6375c9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55054fbe-46a5-4879-acb7-40660cfdc7e5","IsCreationKey":false,"Key":66.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40b36087-ab89-4d97-8a24-749b87b03beb","IsCreationKey":false,"Key":67.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16dfc277-8209-4c38-a4fa-acff85d6b150","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58ab3ae2-4ba4-472d-88d7-451f6e5ca2eb","IsCreationKey":false,"Key":68.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ff78728-0939-4a0e-9b9c-9851d8047ffd","IsCreationKey":false,"Key":69.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43771aa1-f221-4485-9c32-0ca06344e04c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4857572-07c1-4a73-bf58-d9f8464fc2fb","IsCreationKey":false,"Key":70.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d58b775-994c-4ca0-a3bf-a8742b9c21de","IsCreationKey":false,"Key":71.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d993ee28-a89d-42cc-bef9-51c5caf584d8","IsCreationKey":false,"Key":72.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e522eb85-b82f-4feb-b671-5108350cfb16","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97a668ce-c178-4d92-9e9b-dc4aff0cb736","IsCreationKey":false,"Key":73.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46a5df03-5cf0-4b89-a27c-ee7e2d3a2c80","IsCreationKey":false,"Key":74.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f8dc377-3aa1-4816-a121-6a259c18db36","IsCreationKey":false,"Key":75.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db054ef7-2537-41d7-bcaf-34b5f9073296","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f82652c-28d3-4186-b10c-c9109b2c55e8","IsCreationKey":false,"Key":76.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1492999b-1cb4-4c01-80f0-35941c4bf15d","IsCreationKey":false,"Key":77.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b5dee69b-eb3a-47a8-b11d-b76de78a9a28","IsCreationKey":false,"Key":78.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cd8d8c-db17-401c-a660-84e8565440be","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4f905d2-ad21-47e7-a476-1fb03417644f","IsCreationKey":false,"Key":79.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73da1b91-82d6-4fb1-9452-acad9f6d75fc","IsCreationKey":false,"Key":80.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a13fa07-b693-4d51-910f-92c8867be917","IsCreationKey":false,"Key":81.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62a6e637-eb9f-4f76-a6fa-ca9c1e6de9df","IsCreationKey":false,"Key":82.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a53e3b90-cf7f-47b2-9ad2-3105e0b2fc3c","IsCreationKey":false,"Key":83.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"932663f3-9530-4c49-8d84-8c20a41549ef","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b82f6ff-199b-46dc-a0cd-f754e229ceb1","IsCreationKey":false,"Key":84.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13c95d20-70e5-4988-b859-c15ab08abd85","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82405c83-797a-4506-bceb-490563a38732","IsCreationKey":false,"Key":85.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b709ce77-9b28-4388-bd75-f096350846ff","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca72f368-e6aa-4854-87b0-a68da0221055","IsCreationKey":false,"Key":86.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ee0754e-dac4-4409-b340-891ed282fa74","IsCreationKey":false,"Key":87.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"164fb034-c917-4aeb-8e30-0c4c989a3560","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bd3efdd-0bc5-41af-af15-2795d790b5ad","IsCreationKey":false,"Key":88.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbe1b91b-58af-460f-abd5-80225a8dde77","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"707bed96-75aa-4dd0-81fd-c35afaab1262","IsCreationKey":false,"Key":89.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26e6d9d7-a200-4539-936f-c8b5aa45c97b","IsCreationKey":false,"Key":90.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"463084e1-f006-476e-82bb-0be3e235ae58","IsCreationKey":false,"Key":91.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a90247f4-f046-491d-8522-841702b91185","IsCreationKey":false,"Key":92.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa446947-631d-4127-8790-7011d8c63b45","IsCreationKey":false,"Key":93.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49be7cd9-0092-467a-b854-351a2c2d014a","IsCreationKey":false,"Key":94.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9a92718-eab9-4754-94f9-64c6c5907072","IsCreationKey":false,"Key":95.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f09d320d-b486-4965-849c-91ef3f2f5d7b","IsCreationKey":false,"Key":96.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ef6c7d-b668-4ece-9607-822177143185","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de182601-fc79-4a18-afa5-6ae0564ce725","IsCreationKey":false,"Key":97.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a40882-8686-40cd-98b5-60b337991b92","IsCreationKey":false,"Key":98.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ccf1f50-5300-4601-af65-e0d89fe4dd67","IsCreationKey":false,"Key":99.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63a97d6d-c248-471b-baff-5c341a6781d7","IsCreationKey":false,"Key":100.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_loadbar_empty/spr_loadbar_empty.yy b/sprites/spr_loadbar_empty/spr_loadbar_empty.yy index 37389b4e54..fb7fb75f26 100644 --- a/sprites/spr_loadbar_empty/spr_loadbar_empty.yy +++ b/sprites/spr_loadbar_empty/spr_loadbar_empty.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loadbar_empty", "bboxMode":0, "bbox_bottom":12, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c2994374-2a5e-4831-bc9e-33b033839c5c","name":"c2994374-2a5e-4831-bc9e-33b033839c5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2994374-2a5e-4831-bc9e-33b033839c5c","name":"c2994374-2a5e-4831-bc9e-33b033839c5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2994374-2a5e-4831-bc9e-33b033839c5c","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7068dcdf-b01a-46c2-a3ad-05538327613e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2994374-2a5e-4831-bc9e-33b033839c5c","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7068dcdf-b01a-46c2-a3ad-05538327613e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_loading/spr_loading.yy b/sprites/spr_loading/spr_loading.yy index 81fee7819a..7d0b2341ec 100644 --- a/sprites/spr_loading/spr_loading.yy +++ b/sprites/spr_loading/spr_loading.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loading", "bboxMode":0, "bbox_bottom":27, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b43abf4-eaa0-4558-a721-1a690a34c000","name":"3b43abf4-eaa0-4558-a721-1a690a34c000","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"30976229-98b3-46f2-a241-48171df83ad2","name":"30976229-98b3-46f2-a241-48171df83ad2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9bfa8ee6-df56-467c-b545-4d443c335479","name":"9bfa8ee6-df56-467c-b545-4d443c335479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d93fd483-f225-4990-bf6f-df877d244664","name":"d93fd483-f225-4990-bf6f-df877d244664","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38fdffdf-322e-409a-88d8-ae352474fde6","name":"38fdffdf-322e-409a-88d8-ae352474fde6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b43abf4-eaa0-4558-a721-1a690a34c000","name":"3b43abf4-eaa0-4558-a721-1a690a34c000","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30976229-98b3-46f2-a241-48171df83ad2","name":"30976229-98b3-46f2-a241-48171df83ad2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9bfa8ee6-df56-467c-b545-4d443c335479","name":"9bfa8ee6-df56-467c-b545-4d443c335479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d93fd483-f225-4990-bf6f-df877d244664","name":"d93fd483-f225-4990-bf6f-df877d244664","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38fdffdf-322e-409a-88d8-ae352474fde6","name":"38fdffdf-322e-409a-88d8-ae352474fde6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f5c82248-146e-4c1f-bb5a-5e0eb42dd21e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11e76469-4652-456e-b4ea-e8d3396bce4e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b43abf4-eaa0-4558-a721-1a690a34c000","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d8d8818-5383-49e9-8f18-f15e75ec6d3f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e20eaf16-b6f3-432f-8560-2875bdaaaffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d8728df-953a-4970-84d2-c0fad08b5f27","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30976229-98b3-46f2-a241-48171df83ad2","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c52796a-9504-42a5-b6de-e10fd3719d7f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"210aa3d9-0330-4726-954b-bdadbb88c61e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bfa8ee6-df56-467c-b545-4d443c335479","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68b1ed21-fda6-49ff-b716-78e6b898a509","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f99ee7-5163-4470-aad9-fac87b12da19","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00c9cad2-ecc5-438d-83a4-e38fa9441462","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d93fd483-f225-4990-bf6f-df877d244664","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"087a699e-17e0-4f78-b453-c65d84bc01f0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38fdffdf-322e-409a-88d8-ae352474fde6","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6ae7486-b8a8-4184-af83-46889b187aa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f5c82248-146e-4c1f-bb5a-5e0eb42dd21e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11e76469-4652-456e-b4ea-e8d3396bce4e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b43abf4-eaa0-4558-a721-1a690a34c000","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d8d8818-5383-49e9-8f18-f15e75ec6d3f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e20eaf16-b6f3-432f-8560-2875bdaaaffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0d8728df-953a-4970-84d2-c0fad08b5f27","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30976229-98b3-46f2-a241-48171df83ad2","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c52796a-9504-42a5-b6de-e10fd3719d7f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"210aa3d9-0330-4726-954b-bdadbb88c61e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bfa8ee6-df56-467c-b545-4d443c335479","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68b1ed21-fda6-49ff-b716-78e6b898a509","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f99ee7-5163-4470-aad9-fac87b12da19","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00c9cad2-ecc5-438d-83a4-e38fa9441462","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d93fd483-f225-4990-bf6f-df877d244664","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"087a699e-17e0-4f78-b453-c65d84bc01f0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38fdffdf-322e-409a-88d8-ae352474fde6","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6ae7486-b8a8-4184-af83-46889b187aa0","IsCreationKey":false,"Key":11.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_loading2/spr_loading2.yy b/sprites/spr_loading2/spr_loading2.yy index a8e2449c66..0d5c7e90f5 100644 --- a/sprites/spr_loading2/spr_loading2.yy +++ b/sprites/spr_loading2/spr_loading2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loading2", "bboxMode":0, "bbox_bottom":30, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b470910-b621-490a-a783-411ee078b812","name":"8b470910-b621-490a-a783-411ee078b812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41726c78-4d1d-46a5-9941-be0886823037","name":"41726c78-4d1d-46a5-9941-be0886823037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b470910-b621-490a-a783-411ee078b812","name":"8b470910-b621-490a-a783-411ee078b812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41726c78-4d1d-46a5-9941-be0886823037","name":"41726c78-4d1d-46a5-9941-be0886823037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b470910-b621-490a-a783-411ee078b812","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec783239-b271-4744-bb34-213183fb1a9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"736d229f-771c-4808-9b47-82ef5d3714cc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b15ab235-87fe-4537-8c07-baf077dc99db","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9384749d-c62a-421f-91b2-eab291a261f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41726c78-4d1d-46a5-9941-be0886823037","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e3389ee4-0d85-4801-9fd2-4a1a3975b2cf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2600ef86-25f5-4f17-8f93-e74a66748e6d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b470910-b621-490a-a783-411ee078b812","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec783239-b271-4744-bb34-213183fb1a9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"736d229f-771c-4808-9b47-82ef5d3714cc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b15ab235-87fe-4537-8c07-baf077dc99db","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9384749d-c62a-421f-91b2-eab291a261f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41726c78-4d1d-46a5-9941-be0886823037","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e3389ee4-0d85-4801-9fd2-4a1a3975b2cf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2600ef86-25f5-4f17-8f93-e74a66748e6d","IsCreationKey":false,"Key":7.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_loc_icon/spr_loc_icon.yy b/sprites/spr_loc_icon/spr_loc_icon.yy index de2ed727ea..b31b1b50ae 100644 --- a/sprites/spr_loc_icon/spr_loc_icon.yy +++ b/sprites/spr_loc_icon/spr_loc_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loc_icon", "bboxMode":0, "bbox_bottom":17, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"416b110b-43f5-4021-ac05-3f87227dc544","name":"416b110b-43f5-4021-ac05-3f87227dc544","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c3673468-8b19-4bac-9539-3ff7228b6921","name":"c3673468-8b19-4bac-9539-3ff7228b6921","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7c2d2df-3cab-474a-8058-96fa1b687654","name":"e7c2d2df-3cab-474a-8058-96fa1b687654","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"416b110b-43f5-4021-ac05-3f87227dc544","name":"416b110b-43f5-4021-ac05-3f87227dc544","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3673468-8b19-4bac-9539-3ff7228b6921","name":"c3673468-8b19-4bac-9539-3ff7228b6921","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7c2d2df-3cab-474a-8058-96fa1b687654","name":"e7c2d2df-3cab-474a-8058-96fa1b687654","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"416b110b-43f5-4021-ac05-3f87227dc544","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cbfc9e28-0682-4eeb-92dc-2455cf8e6fa8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab72642d-2755-4891-b086-f3538e23f1af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0011c1c-e1e5-4c3c-b96e-605c82ac9fe9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3673468-8b19-4bac-9539-3ff7228b6921","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ee84902-0ebb-4605-a786-50c295102bdb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7c2d2df-3cab-474a-8058-96fa1b687654","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7280c334-9fc8-44b0-ae02-aeeac20c963a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"416b110b-43f5-4021-ac05-3f87227dc544","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cbfc9e28-0682-4eeb-92dc-2455cf8e6fa8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab72642d-2755-4891-b086-f3538e23f1af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0011c1c-e1e5-4c3c-b96e-605c82ac9fe9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3673468-8b19-4bac-9539-3ff7228b6921","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ee84902-0ebb-4605-a786-50c295102bdb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7c2d2df-3cab-474a-8058-96fa1b687654","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7280c334-9fc8-44b0-ae02-aeeac20c963a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_luck_icon/spr_luck_icon.yy b/sprites/spr_luck_icon/spr_luck_icon.yy index 307a98485f..86481556bf 100644 --- a/sprites/spr_luck_icon/spr_luck_icon.yy +++ b/sprites/spr_luck_icon/spr_luck_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_luck_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","path":"sprites/spr_luck_icon/spr_luck_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d0e216b8-a255-4367-8128-437a22f3baa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","path":"sprites/spr_luck_icon/spr_luck_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d0e216b8-a255-4367-8128-437a22f3baa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mahreen/spr_mahreen.yy b/sprites/spr_mahreen/spr_mahreen.yy index 180007fdf6..6ef3101495 100644 --- a/sprites/spr_mahreen/spr_mahreen.yy +++ b/sprites/spr_mahreen/spr_mahreen.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen", "bboxMode":0, "bbox_bottom":52, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"14de9ffa-b488-44f9-afd3-fb4030398a09","name":"14de9ffa-b488-44f9-afd3-fb4030398a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d875b6df-8ffd-4a18-b575-19f871ab433e","name":"d875b6df-8ffd-4a18-b575-19f871ab433e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15368c39-27df-4dcb-b87b-94593dd25c57","name":"15368c39-27df-4dcb-b87b-94593dd25c57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"315144e4-36e5-4485-83ba-b61ec26febf9","name":"315144e4-36e5-4485-83ba-b61ec26febf9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b29d1b35-9e76-41f9-9970-17c607f6793f","name":"b29d1b35-9e76-41f9-9970-17c607f6793f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e081e164-ccf6-449f-9060-35f957ad22e5","name":"e081e164-ccf6-449f-9060-35f957ad22e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"063437d3-cd92-4e25-96f1-97ef985aa6db","name":"063437d3-cd92-4e25-96f1-97ef985aa6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14de9ffa-b488-44f9-afd3-fb4030398a09","name":"14de9ffa-b488-44f9-afd3-fb4030398a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d875b6df-8ffd-4a18-b575-19f871ab433e","name":"d875b6df-8ffd-4a18-b575-19f871ab433e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15368c39-27df-4dcb-b87b-94593dd25c57","name":"15368c39-27df-4dcb-b87b-94593dd25c57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"315144e4-36e5-4485-83ba-b61ec26febf9","name":"315144e4-36e5-4485-83ba-b61ec26febf9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b29d1b35-9e76-41f9-9970-17c607f6793f","name":"b29d1b35-9e76-41f9-9970-17c607f6793f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e081e164-ccf6-449f-9060-35f957ad22e5","name":"e081e164-ccf6-449f-9060-35f957ad22e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"063437d3-cd92-4e25-96f1-97ef985aa6db","name":"063437d3-cd92-4e25-96f1-97ef985aa6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14de9ffa-b488-44f9-afd3-fb4030398a09","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c32fc363-3fc0-4f92-a088-d7a8feb6c58b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19d2f518-dd6c-4879-a04e-2c7116330dff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44db714c-bea2-479b-a486-f98f439e81e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d875b6df-8ffd-4a18-b575-19f871ab433e","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73fcc85b-1be6-4763-ae2c-b7e76f75c5a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4940806-389e-4a3b-a400-6c4c24e42fc2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97da6424-ca4f-452a-9e65-de6d331da653","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15368c39-27df-4dcb-b87b-94593dd25c57","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1594b838-67b0-41f4-b1f5-15815e7ad64f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"315144e4-36e5-4485-83ba-b61ec26febf9","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"66c0d605-f696-47ff-8228-2ad92d4fe67b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b29d1b35-9e76-41f9-9970-17c607f6793f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c0339df-59a2-4224-b4ea-a5d6b57ea56c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"465d239f-2864-49ca-9501-11df5da0dd3b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e7a641f1-ab25-4635-a1e8-09f5cb4869a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e081e164-ccf6-449f-9060-35f957ad22e5","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7220668-2d49-4c83-b07d-8f55c99872df","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f81c49b-475d-4053-9122-2bc970556538","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1df1f1e3-1879-4906-af31-7645d8144a4a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"063437d3-cd92-4e25-96f1-97ef985aa6db","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be276b34-4e94-4a14-8bdf-af36af0f5c5a","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14de9ffa-b488-44f9-afd3-fb4030398a09","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c32fc363-3fc0-4f92-a088-d7a8feb6c58b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19d2f518-dd6c-4879-a04e-2c7116330dff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44db714c-bea2-479b-a486-f98f439e81e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d875b6df-8ffd-4a18-b575-19f871ab433e","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73fcc85b-1be6-4763-ae2c-b7e76f75c5a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4940806-389e-4a3b-a400-6c4c24e42fc2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97da6424-ca4f-452a-9e65-de6d331da653","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15368c39-27df-4dcb-b87b-94593dd25c57","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1594b838-67b0-41f4-b1f5-15815e7ad64f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"315144e4-36e5-4485-83ba-b61ec26febf9","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"66c0d605-f696-47ff-8228-2ad92d4fe67b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b29d1b35-9e76-41f9-9970-17c607f6793f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c0339df-59a2-4224-b4ea-a5d6b57ea56c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"465d239f-2864-49ca-9501-11df5da0dd3b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e7a641f1-ab25-4635-a1e8-09f5cb4869a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e081e164-ccf6-449f-9060-35f957ad22e5","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7220668-2d49-4c83-b07d-8f55c99872df","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f81c49b-475d-4053-9122-2bc970556538","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1df1f1e3-1879-4906-af31-7645d8144a4a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"063437d3-cd92-4e25-96f1-97ef985aa6db","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be276b34-4e94-4a14-8bdf-af36af0f5c5a","IsCreationKey":false,"Key":14.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_mahreen_gun/spr_mahreen_gun.yy b/sprites/spr_mahreen_gun/spr_mahreen_gun.yy index 3f7ff0a1be..cb09c8dfe4 100644 --- a/sprites/spr_mahreen_gun/spr_mahreen_gun.yy +++ b/sprites/spr_mahreen_gun/spr_mahreen_gun.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen_gun", "bboxMode":0, "bbox_bottom":51, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1503ec11-e9c9-4d29-8297-78bd0515a012","name":"1503ec11-e9c9-4d29-8297-78bd0515a012","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8455f93d-b9c8-4156-8956-56244747b171","name":"8455f93d-b9c8-4156-8956-56244747b171","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"742e6880-3cda-4cde-982f-60b8dafa6112","name":"742e6880-3cda-4cde-982f-60b8dafa6112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74ac2f73-28fb-479b-911c-7ca0384f9738","name":"74ac2f73-28fb-479b-911c-7ca0384f9738","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1503ec11-e9c9-4d29-8297-78bd0515a012","name":"1503ec11-e9c9-4d29-8297-78bd0515a012","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8455f93d-b9c8-4156-8956-56244747b171","name":"8455f93d-b9c8-4156-8956-56244747b171","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"742e6880-3cda-4cde-982f-60b8dafa6112","name":"742e6880-3cda-4cde-982f-60b8dafa6112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74ac2f73-28fb-479b-911c-7ca0384f9738","name":"74ac2f73-28fb-479b-911c-7ca0384f9738","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d080e80e-2e64-416c-ab86-a82df3a1d9fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4551645-6945-49a3-a74b-be127b7b90b6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c8a89b8-59a6-41fc-abcc-a25a329477c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2b8c888-4a78-4dd1-a5b9-3a51745509ef","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fcd727c-0b77-460c-9833-588b29c77fe3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1503ec11-e9c9-4d29-8297-78bd0515a012","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13eb5f60-95ed-497e-8fd6-d60bbed2b6f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fbffe1c-a902-49ad-a926-3d610aa4e63f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6065c582-12c0-41b6-8c28-3e6c752390ba","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39c463f5-38ac-4cfa-9357-ced874d14c67","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1670f0bc-0eaa-42b5-9e68-577b74371851","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0adb3fae-5b8e-4e06-ba18-f126862b1cf9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8455f93d-b9c8-4156-8956-56244747b171","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7cf4139-37f4-4875-b097-7aab1d8b2f41","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"742e6880-3cda-4cde-982f-60b8dafa6112","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23526fe7-d62c-4258-9aa9-ef5e9d498646","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d45104df-28dc-4ad9-8c58-2a723b8e0c09","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ac2f73-28fb-479b-911c-7ca0384f9738","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46fa195a-7db8-47e8-890c-3aa7c0fb18fd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d080e80e-2e64-416c-ab86-a82df3a1d9fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4551645-6945-49a3-a74b-be127b7b90b6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c8a89b8-59a6-41fc-abcc-a25a329477c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2b8c888-4a78-4dd1-a5b9-3a51745509ef","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fcd727c-0b77-460c-9833-588b29c77fe3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1503ec11-e9c9-4d29-8297-78bd0515a012","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13eb5f60-95ed-497e-8fd6-d60bbed2b6f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fbffe1c-a902-49ad-a926-3d610aa4e63f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6065c582-12c0-41b6-8c28-3e6c752390ba","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39c463f5-38ac-4cfa-9357-ced874d14c67","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1670f0bc-0eaa-42b5-9e68-577b74371851","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0adb3fae-5b8e-4e06-ba18-f126862b1cf9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8455f93d-b9c8-4156-8956-56244747b171","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7cf4139-37f4-4875-b097-7aab1d8b2f41","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"742e6880-3cda-4cde-982f-60b8dafa6112","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23526fe7-d62c-4258-9aa9-ef5e9d498646","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d45104df-28dc-4ad9-8c58-2a723b8e0c09","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ac2f73-28fb-479b-911c-7ca0384f9738","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46fa195a-7db8-47e8-890c-3aa7c0fb18fd","IsCreationKey":false,"Key":14.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":{ diff --git a/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy b/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy index 384c8a3d5c..084b9920ba 100644 --- a/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy +++ b/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen_secondary", "bboxMode":0, "bbox_bottom":34, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"39fa9316-112e-4905-81ed-5d32ece608d0","name":"39fa9316-112e-4905-81ed-5d32ece608d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"693e6ced-dbdf-4425-8848-f4ac590b520c","name":"693e6ced-dbdf-4425-8848-f4ac590b520c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c4599e38-a482-46a2-a468-ddb4e7214e34","name":"c4599e38-a482-46a2-a468-ddb4e7214e34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"13074c90-cc1a-433a-b435-cfdee44786bd","name":"13074c90-cc1a-433a-b435-cfdee44786bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7fa2715f-5a22-4174-9809-708623e4c6c1","name":"7fa2715f-5a22-4174-9809-708623e4c6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3d516822-d888-40f2-bae9-7a98c273c307","name":"3d516822-d888-40f2-bae9-7a98c273c307","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39fa9316-112e-4905-81ed-5d32ece608d0","name":"39fa9316-112e-4905-81ed-5d32ece608d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"693e6ced-dbdf-4425-8848-f4ac590b520c","name":"693e6ced-dbdf-4425-8848-f4ac590b520c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4599e38-a482-46a2-a468-ddb4e7214e34","name":"c4599e38-a482-46a2-a468-ddb4e7214e34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13074c90-cc1a-433a-b435-cfdee44786bd","name":"13074c90-cc1a-433a-b435-cfdee44786bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fa2715f-5a22-4174-9809-708623e4c6c1","name":"7fa2715f-5a22-4174-9809-708623e4c6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d516822-d888-40f2-bae9-7a98c273c307","name":"3d516822-d888-40f2-bae9-7a98c273c307","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39fa9316-112e-4905-81ed-5d32ece608d0","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c264cd4-4730-4a9b-bf9e-d764125b9bae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99691236-7ce3-4580-8c6e-2b186e45f54d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8fc769d-8830-4603-b31e-185623028d9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"693e6ced-dbdf-4425-8848-f4ac590b520c","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9a635ea-5d94-47ed-a5b3-e765b78aa4c2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4599e38-a482-46a2-a468-ddb4e7214e34","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6a52467-3838-49f8-81b7-0f5272fccef4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13074c90-cc1a-433a-b435-cfdee44786bd","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"32713d25-ecff-47b4-9da5-4e49e3f34ce2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d68ba8d1-3df2-4bdf-991b-c051db694ac8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31607eb0-41e8-406b-ae45-deb3bcc4c18d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9027993f-4420-4b89-8fb0-a138124e5528","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c8bc27d5-b80d-4b9b-a0f4-8ec7c0df980e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa2715f-5a22-4174-9809-708623e4c6c1","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af7ff51f-f2fb-46a7-bf03-db0e458197d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c2ba782-39ea-4de9-9300-da1fc687eb5b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d516822-d888-40f2-bae9-7a98c273c307","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2fcb8330-b75e-4c95-aa3c-9af440f6516d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06ff3a4a-9032-4c22-8fd7-6b3a169899ef","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"acec81cf-187f-4f3d-861e-f0c706ff2750","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39fa9316-112e-4905-81ed-5d32ece608d0","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c264cd4-4730-4a9b-bf9e-d764125b9bae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99691236-7ce3-4580-8c6e-2b186e45f54d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8fc769d-8830-4603-b31e-185623028d9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"693e6ced-dbdf-4425-8848-f4ac590b520c","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9a635ea-5d94-47ed-a5b3-e765b78aa4c2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4599e38-a482-46a2-a468-ddb4e7214e34","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6a52467-3838-49f8-81b7-0f5272fccef4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13074c90-cc1a-433a-b435-cfdee44786bd","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"32713d25-ecff-47b4-9da5-4e49e3f34ce2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d68ba8d1-3df2-4bdf-991b-c051db694ac8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31607eb0-41e8-406b-ae45-deb3bcc4c18d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9027993f-4420-4b89-8fb0-a138124e5528","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c8bc27d5-b80d-4b9b-a0f4-8ec7c0df980e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa2715f-5a22-4174-9809-708623e4c6c1","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af7ff51f-f2fb-46a7-bf03-db0e458197d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c2ba782-39ea-4de9-9300-da1fc687eb5b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d516822-d888-40f2-bae9-7a98c273c307","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2fcb8330-b75e-4c95-aa3c-9af440f6516d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06ff3a4a-9032-4c22-8fd7-6b3a169899ef","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"acec81cf-187f-4f3d-861e-f0c706ff2750","IsCreationKey":false,"Key":14.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":{ diff --git a/sprites/spr_mahreen_visor/spr_mahreen_visor.yy b/sprites/spr_mahreen_visor/spr_mahreen_visor.yy index 73a64b6503..216322791c 100644 --- a/sprites/spr_mahreen_visor/spr_mahreen_visor.yy +++ b/sprites/spr_mahreen_visor/spr_mahreen_visor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen_visor", "bboxMode":0, "bbox_bottom":12, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7af506e9-e6fb-4104-9837-15d29df97d09","name":"7af506e9-e6fb-4104-9837-15d29df97d09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b90c868-5420-425d-840d-218478167973","name":"3b90c868-5420-425d-840d-218478167973","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af80be5a-c8a3-4e11-b275-992a36db6482","name":"af80be5a-c8a3-4e11-b275-992a36db6482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789a0f32-fb81-43ee-8538-9edf934797a9","name":"789a0f32-fb81-43ee-8538-9edf934797a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d156d998-2521-4b7d-980a-5271ec8b3897","name":"d156d998-2521-4b7d-980a-5271ec8b3897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"804ae55c-6893-462b-a31b-d176381419fc","name":"804ae55c-6893-462b-a31b-d176381419fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5168cffa-a26b-444c-bc2a-61bf8674a560","name":"5168cffa-a26b-444c-bc2a-61bf8674a560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7af506e9-e6fb-4104-9837-15d29df97d09","name":"7af506e9-e6fb-4104-9837-15d29df97d09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b90c868-5420-425d-840d-218478167973","name":"3b90c868-5420-425d-840d-218478167973","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af80be5a-c8a3-4e11-b275-992a36db6482","name":"af80be5a-c8a3-4e11-b275-992a36db6482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789a0f32-fb81-43ee-8538-9edf934797a9","name":"789a0f32-fb81-43ee-8538-9edf934797a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d156d998-2521-4b7d-980a-5271ec8b3897","name":"d156d998-2521-4b7d-980a-5271ec8b3897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"804ae55c-6893-462b-a31b-d176381419fc","name":"804ae55c-6893-462b-a31b-d176381419fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5168cffa-a26b-444c-bc2a-61bf8674a560","name":"5168cffa-a26b-444c-bc2a-61bf8674a560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7af506e9-e6fb-4104-9837-15d29df97d09","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf6543f1-58b9-4b31-a36a-717dea5e6a7c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b90c868-5420-425d-840d-218478167973","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5cc113f7-867f-470e-b882-87e8d20b31bc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f2f1a8e-2da3-4a2e-9bdb-129d86c1241f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e25a334-4340-4c46-b0a8-5da549f782b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"691134e1-5fec-424c-a344-c6c8bf05aa21","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af80be5a-c8a3-4e11-b275-992a36db6482","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4bfe5bf8-b809-4cfb-84c6-995c59bb311c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a0f32-fb81-43ee-8538-9edf934797a9","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e3b95f8-639f-476f-ba9d-20860f96f499","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f565e5-70d2-491a-83d3-e1c579cee9a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"412eac1e-7d00-4ef9-acbe-61b7c1dedd1b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d156d998-2521-4b7d-980a-5271ec8b3897","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a9ebc85-4f8e-425b-94dc-7c8a4d09bbc3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"120a012d-0b78-490f-8e9b-0553b9d43f4b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"804ae55c-6893-462b-a31b-d176381419fc","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e7be5e7-79ac-4f35-a84c-2689e54b87a7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"923e7314-a879-42b5-bdd5-2b8e791ca784","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5168cffa-a26b-444c-bc2a-61bf8674a560","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c992c954-80e2-4c90-a649-238d976cff90","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c63d7c0-4a78-4d1c-a4d3-87781aae3f63","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7af506e9-e6fb-4104-9837-15d29df97d09","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf6543f1-58b9-4b31-a36a-717dea5e6a7c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b90c868-5420-425d-840d-218478167973","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5cc113f7-867f-470e-b882-87e8d20b31bc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f2f1a8e-2da3-4a2e-9bdb-129d86c1241f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e25a334-4340-4c46-b0a8-5da549f782b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"691134e1-5fec-424c-a344-c6c8bf05aa21","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af80be5a-c8a3-4e11-b275-992a36db6482","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bfe5bf8-b809-4cfb-84c6-995c59bb311c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a0f32-fb81-43ee-8538-9edf934797a9","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e3b95f8-639f-476f-ba9d-20860f96f499","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f565e5-70d2-491a-83d3-e1c579cee9a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"412eac1e-7d00-4ef9-acbe-61b7c1dedd1b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d156d998-2521-4b7d-980a-5271ec8b3897","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a9ebc85-4f8e-425b-94dc-7c8a4d09bbc3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"120a012d-0b78-490f-8e9b-0553b9d43f4b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"804ae55c-6893-462b-a31b-d176381419fc","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e7be5e7-79ac-4f35-a84c-2689e54b87a7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"923e7314-a879-42b5-bdd5-2b8e791ca784","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5168cffa-a26b-444c-bc2a-61bf8674a560","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c992c954-80e2-4c90-a649-238d976cff90","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c63d7c0-4a78-4d1c-a4d3-87781aae3f63","IsCreationKey":false,"Key":14.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":{ diff --git a/sprites/spr_manta/spr_manta.yy b/sprites/spr_manta/spr_manta.yy index 0c9fa27cf2..2851379efb 100644 --- a/sprites/spr_manta/spr_manta.yy +++ b/sprites/spr_manta/spr_manta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_manta", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5f787cb0-7e13-451c-890c-3ef5add27e66","name":"5f787cb0-7e13-451c-890c-3ef5add27e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f787cb0-7e13-451c-890c-3ef5add27e66","name":"5f787cb0-7e13-451c-890c-3ef5add27e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f787cb0-7e13-451c-890c-3ef5add27e66","path":"sprites/spr_manta/spr_manta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9ba13ab-74a9-4415-b636-70b079792bc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f787cb0-7e13-451c-890c-3ef5add27e66","path":"sprites/spr_manta/spr_manta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9ba13ab-74a9-4415-b636-70b079792bc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy b/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy index 89d4807e14..da4f406aa3 100644 --- a/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy +++ b/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mantis_warriors_icon", "bboxMode":0, "bbox_bottom":72, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f304484-8756-4ea1-800a-b54b710b175d","name":"8f304484-8756-4ea1-800a-b54b710b175d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f304484-8756-4ea1-800a-b54b710b175d","name":"8f304484-8756-4ea1-800a-b54b710b175d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a5d5c4a-4588-4129-9abb-f210090c169c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f304484-8756-4ea1-800a-b54b710b175d","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62e74cff-5357-4b1a-9049-84c4e78299a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a5d5c4a-4588-4129-9abb-f210090c169c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f304484-8756-4ea1-800a-b54b710b175d","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62e74cff-5357-4b1a-9049-84c4e78299a4","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_mar_collision/spr_mar_collision.yy b/sprites/spr_mar_collision/spr_mar_collision.yy index 81e7818bb0..d4e9fccf8f 100644 --- a/sprites/spr_mar_collision/spr_mar_collision.yy +++ b/sprites/spr_mar_collision/spr_mar_collision.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_collision", "bboxMode":2, "bbox_bottom":38, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1674be3c-5769-44c3-81e8-c574d1aada7e","name":"1674be3c-5769-44c3-81e8-c574d1aada7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73dfb102-c129-4c22-94b5-873f24246195","name":"73dfb102-c129-4c22-94b5-873f24246195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a106682-8b51-41e2-b785-e56933172957","name":"2a106682-8b51-41e2-b785-e56933172957","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f798c093-387b-4249-9e78-21c3cf42ab6a","name":"f798c093-387b-4249-9e78-21c3cf42ab6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6334a270-feae-41eb-bfcb-27bddb85fc08","name":"6334a270-feae-41eb-bfcb-27bddb85fc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2512b2a-a43d-4c58-b0c6-11431094a257","name":"f2512b2a-a43d-4c58-b0c6-11431094a257","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1674be3c-5769-44c3-81e8-c574d1aada7e","name":"1674be3c-5769-44c3-81e8-c574d1aada7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73dfb102-c129-4c22-94b5-873f24246195","name":"73dfb102-c129-4c22-94b5-873f24246195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a106682-8b51-41e2-b785-e56933172957","name":"2a106682-8b51-41e2-b785-e56933172957","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f798c093-387b-4249-9e78-21c3cf42ab6a","name":"f798c093-387b-4249-9e78-21c3cf42ab6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6334a270-feae-41eb-bfcb-27bddb85fc08","name":"6334a270-feae-41eb-bfcb-27bddb85fc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2512b2a-a43d-4c58-b0c6-11431094a257","name":"f2512b2a-a43d-4c58-b0c6-11431094a257","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -86,57 +86,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef388b7f-ba09-4d17-a004-a92fcdb86fbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1674be3c-5769-44c3-81e8-c574d1aada7e","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"344d8112-ce2c-434d-8738-3f0b8c8b01fd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91d37893-4565-49d2-a9a7-3db7befd7eda","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5047741-bf2a-419e-a4f4-56ab24e09b01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73dfb102-c129-4c22-94b5-873f24246195","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53f64345-c8a5-445e-830a-b9e5bdd8cfac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"303eef0a-81fd-4e4f-981b-e1e710e6f662","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7985c880-8351-4466-b139-e36ebf2d647d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a106682-8b51-41e2-b785-e56933172957","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d2ca48f5-06fa-4dea-9913-90f27af95398","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c433fd3-2fd0-4d7a-acf7-0e422f71be5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f604799-de6e-4458-8af2-294213d98556","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f798c093-387b-4249-9e78-21c3cf42ab6a","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96b94c6e-13fe-4a6e-86ba-9f2cbad8ab00","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6334a270-feae-41eb-bfcb-27bddb85fc08","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0142ec8-d841-48cb-936e-82a13956511f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ebeff04f-5606-4d71-993e-558cbedac30b","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2512b2a-a43d-4c58-b0c6-11431094a257","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9505c8f1-0494-4159-ac5d-da5869ecc711","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"71124f4a-45df-4a75-b534-7cbedb524849","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfa989b8-a09a-4f2a-8a74-d5dcbdb904a5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00599ad0-601a-4cb3-9583-e321154407ec","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef388b7f-ba09-4d17-a004-a92fcdb86fbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1674be3c-5769-44c3-81e8-c574d1aada7e","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"344d8112-ce2c-434d-8738-3f0b8c8b01fd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91d37893-4565-49d2-a9a7-3db7befd7eda","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5047741-bf2a-419e-a4f4-56ab24e09b01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73dfb102-c129-4c22-94b5-873f24246195","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53f64345-c8a5-445e-830a-b9e5bdd8cfac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"303eef0a-81fd-4e4f-981b-e1e710e6f662","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7985c880-8351-4466-b139-e36ebf2d647d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a106682-8b51-41e2-b785-e56933172957","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d2ca48f5-06fa-4dea-9913-90f27af95398","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c433fd3-2fd0-4d7a-acf7-0e422f71be5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f604799-de6e-4458-8af2-294213d98556","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f798c093-387b-4249-9e78-21c3cf42ab6a","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96b94c6e-13fe-4a6e-86ba-9f2cbad8ab00","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6334a270-feae-41eb-bfcb-27bddb85fc08","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0142ec8-d841-48cb-936e-82a13956511f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ebeff04f-5606-4d71-993e-558cbedac30b","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2512b2a-a43d-4c58-b0c6-11431094a257","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9505c8f1-0494-4159-ac5d-da5869ecc711","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"71124f4a-45df-4a75-b534-7cbedb524849","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfa989b8-a09a-4f2a-8a74-d5dcbdb904a5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00599ad0-601a-4cb3-9583-e321154407ec","IsCreationKey":false,"Key":16.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_mar_fire_body1/spr_mar_fire_body1.yy b/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy index a5d2f2defb..e4bd9e51aa 100644 --- a/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy +++ b/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_body1", "bboxMode":0, "bbox_bottom":21, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"01affcad-7536-4bf5-b69f-c617ef77ee73","name":"01affcad-7536-4bf5-b69f-c617ef77ee73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df131e14-4494-465a-8c50-27ba2e8f8e85","name":"df131e14-4494-465a-8c50-27ba2e8f8e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28560d18-6336-4c17-b74a-90012673caf8","name":"28560d18-6336-4c17-b74a-90012673caf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01affcad-7536-4bf5-b69f-c617ef77ee73","name":"01affcad-7536-4bf5-b69f-c617ef77ee73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df131e14-4494-465a-8c50-27ba2e8f8e85","name":"df131e14-4494-465a-8c50-27ba2e8f8e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28560d18-6336-4c17-b74a-90012673caf8","name":"28560d18-6336-4c17-b74a-90012673caf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01affcad-7536-4bf5-b69f-c617ef77ee73","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea94f0b1-bd27-4e6e-8da4-b55352effd08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df131e14-4494-465a-8c50-27ba2e8f8e85","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2cbd5256-4d85-4a0c-9612-a24c946faa34","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd3eda7e-1232-4176-b9b0-ba25bcbb3c68","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28560d18-6336-4c17-b74a-90012673caf8","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"150b7f86-89d2-44f7-b072-e0a61d54d8d4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01affcad-7536-4bf5-b69f-c617ef77ee73","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea94f0b1-bd27-4e6e-8da4-b55352effd08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df131e14-4494-465a-8c50-27ba2e8f8e85","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2cbd5256-4d85-4a0c-9612-a24c946faa34","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd3eda7e-1232-4176-b9b0-ba25bcbb3c68","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28560d18-6336-4c17-b74a-90012673caf8","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"150b7f86-89d2-44f7-b072-e0a61d54d8d4","IsCreationKey":false,"Key":3.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":{ diff --git a/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy b/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy index 863019f48d..1db99b3123 100644 --- a/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy +++ b/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_body2", "bboxMode":0, "bbox_bottom":21, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43151143-33ae-4b30-b675-230f6d4b65c3","name":"43151143-33ae-4b30-b675-230f6d4b65c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43151143-33ae-4b30-b675-230f6d4b65c3","name":"43151143-33ae-4b30-b675-230f6d4b65c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07897a39-2fbd-409b-87f4-1cd3904179c1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"224c5f12-1b61-43fa-bef0-898d61d48471","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3637fc5-96d0-40da-974a-6a478148f4bd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43151143-33ae-4b30-b675-230f6d4b65c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c415e46f-1c71-4842-9cf3-0191411cba7a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07897a39-2fbd-409b-87f4-1cd3904179c1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"224c5f12-1b61-43fa-bef0-898d61d48471","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3637fc5-96d0-40da-974a-6a478148f4bd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43151143-33ae-4b30-b675-230f6d4b65c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c415e46f-1c71-4842-9cf3-0191411cba7a","IsCreationKey":false,"Key":3.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":{ diff --git a/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy b/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy index 304c0067d2..00e5ad146e 100644 --- a/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy +++ b/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_body3", "bboxMode":0, "bbox_bottom":21, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"047ad514-4829-45b0-b1e3-4df5ec519c30","name":"047ad514-4829-45b0-b1e3-4df5ec519c30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a15141a-5786-4c79-9fde-b10c457a32e8","name":"8a15141a-5786-4c79-9fde-b10c457a32e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"047ad514-4829-45b0-b1e3-4df5ec519c30","name":"047ad514-4829-45b0-b1e3-4df5ec519c30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a15141a-5786-4c79-9fde-b10c457a32e8","name":"8a15141a-5786-4c79-9fde-b10c457a32e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ba287f0-053e-46d5-a151-03d599b06430","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"047ad514-4829-45b0-b1e3-4df5ec519c30","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b35e38a-df41-43e4-8738-49c0596d86a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a15141a-5786-4c79-9fde-b10c457a32e8","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26713e1c-51b7-458c-aa43-e7621843eb88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3f3c26e-0b7a-4e8a-8f75-067fb1384a68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ba287f0-053e-46d5-a151-03d599b06430","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"047ad514-4829-45b0-b1e3-4df5ec519c30","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b35e38a-df41-43e4-8738-49c0596d86a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a15141a-5786-4c79-9fde-b10c457a32e8","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26713e1c-51b7-458c-aa43-e7621843eb88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3f3c26e-0b7a-4e8a-8f75-067fb1384a68","IsCreationKey":false,"Key":3.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":{ diff --git a/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy b/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy index 3ccc4d77a4..af173ce4a3 100644 --- a/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy +++ b/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_pauldron1", "bboxMode":0, "bbox_bottom":12, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"44561e3e-695b-42b6-a9cb-05df7b491263","name":"44561e3e-695b-42b6-a9cb-05df7b491263","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0fb87477-e686-4d73-9109-792d5902591b","name":"0fb87477-e686-4d73-9109-792d5902591b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44561e3e-695b-42b6-a9cb-05df7b491263","name":"44561e3e-695b-42b6-a9cb-05df7b491263","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0fb87477-e686-4d73-9109-792d5902591b","name":"0fb87477-e686-4d73-9109-792d5902591b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44561e3e-695b-42b6-a9cb-05df7b491263","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9837af83-5d30-4704-83f5-4237d2aa22f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fb87477-e686-4d73-9109-792d5902591b","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fa1abe3-4d15-47ab-bf7b-87858dcd3a03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d998a60-9a9c-4668-acdf-6a912756b3d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8188cdf-b45d-4742-8d5b-2d124a5dc1ce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44561e3e-695b-42b6-a9cb-05df7b491263","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9837af83-5d30-4704-83f5-4237d2aa22f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fb87477-e686-4d73-9109-792d5902591b","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fa1abe3-4d15-47ab-bf7b-87858dcd3a03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d998a60-9a9c-4668-acdf-6a912756b3d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8188cdf-b45d-4742-8d5b-2d124a5dc1ce","IsCreationKey":false,"Key":3.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":{ diff --git a/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy b/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy index b5e2481570..0ef765296c 100644 --- a/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy +++ b/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_pauldron2", "bboxMode":0, "bbox_bottom":12, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38bc760b-cb19-45ae-b9db-808873773b0d","name":"38bc760b-cb19-45ae-b9db-808873773b0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38bc760b-cb19-45ae-b9db-808873773b0d","name":"38bc760b-cb19-45ae-b9db-808873773b0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a47727c0-b49a-4dce-bcd4-8d0a92a7b96e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"130b5dd0-bbb1-4dab-9cf6-0dd46d30e73e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38bc760b-cb19-45ae-b9db-808873773b0d","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46768cec-37de-4e55-9143-ceb57239d74a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a12232-13cf-430e-8a54-4e19517033eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a47727c0-b49a-4dce-bcd4-8d0a92a7b96e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"130b5dd0-bbb1-4dab-9cf6-0dd46d30e73e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38bc760b-cb19-45ae-b9db-808873773b0d","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46768cec-37de-4e55-9143-ceb57239d74a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a12232-13cf-430e-8a54-4e19517033eb","IsCreationKey":false,"Key":3.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":{ diff --git a/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy b/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy index 6af9cb58e3..cf71eeaece 100644 --- a/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy +++ b/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_body1", "bboxMode":0, "bbox_bottom":23, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2654f12c-02e1-44c3-9902-4fea338cc91d","name":"2654f12c-02e1-44c3-9902-4fea338cc91d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f952ea3-eaaa-4446-935d-8de3733d898f","name":"1f952ea3-eaaa-4446-935d-8de3733d898f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"045820a2-27c8-4a17-9860-ed379673f5f8","name":"045820a2-27c8-4a17-9860-ed379673f5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2654f12c-02e1-44c3-9902-4fea338cc91d","name":"2654f12c-02e1-44c3-9902-4fea338cc91d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f952ea3-eaaa-4446-935d-8de3733d898f","name":"1f952ea3-eaaa-4446-935d-8de3733d898f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"045820a2-27c8-4a17-9860-ed379673f5f8","name":"045820a2-27c8-4a17-9860-ed379673f5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"791b0399-0529-41db-837e-2956828ca90b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c0b9fa42-7067-4a16-81cc-3f210c3c2676","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd5ff78c-1e07-4b5a-8732-b18dffba7d50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f39d291-581a-4340-9f54-230ecdf3c0bd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2654f12c-02e1-44c3-9902-4fea338cc91d","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"255720a5-147d-4039-b072-2c4e4b4d0b32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d771123e-76c3-4acf-aac8-cc7b6409a83d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59118366-e90b-41ca-91af-b8618a336f0b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41220da6-5d68-484c-8b2a-a0388b76c77f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0abe53ee-c1c9-4253-8978-f1d051c031b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f952ea3-eaaa-4446-935d-8de3733d898f","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcf64e1d-590e-41bb-87b2-4c79d4a9f895","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1841081d-3a92-4307-9db8-fb088ed65cc0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"045820a2-27c8-4a17-9860-ed379673f5f8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bf2917b-f8eb-4fd8-934b-9f8a1abc5f7b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"becb79e7-b8c1-4d16-94a5-89ac8fe8979c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cfdabb68-ba40-430e-8592-c01b9cad91aa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ab92e60-55c3-4950-b118-8083482f48c9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"873c8618-4057-4d64-bbee-574285f38f6a","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a302f0b2-b45a-46cc-93ed-04b24e2a1c90","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"791b0399-0529-41db-837e-2956828ca90b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c0b9fa42-7067-4a16-81cc-3f210c3c2676","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd5ff78c-1e07-4b5a-8732-b18dffba7d50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f39d291-581a-4340-9f54-230ecdf3c0bd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2654f12c-02e1-44c3-9902-4fea338cc91d","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"255720a5-147d-4039-b072-2c4e4b4d0b32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d771123e-76c3-4acf-aac8-cc7b6409a83d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59118366-e90b-41ca-91af-b8618a336f0b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41220da6-5d68-484c-8b2a-a0388b76c77f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0abe53ee-c1c9-4253-8978-f1d051c031b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f952ea3-eaaa-4446-935d-8de3733d898f","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcf64e1d-590e-41bb-87b2-4c79d4a9f895","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1841081d-3a92-4307-9db8-fb088ed65cc0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"045820a2-27c8-4a17-9860-ed379673f5f8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bf2917b-f8eb-4fd8-934b-9f8a1abc5f7b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"becb79e7-b8c1-4d16-94a5-89ac8fe8979c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cfdabb68-ba40-430e-8592-c01b9cad91aa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ab92e60-55c3-4950-b118-8083482f48c9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"873c8618-4057-4d64-bbee-574285f38f6a","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a302f0b2-b45a-46cc-93ed-04b24e2a1c90","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy b/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy index 3effa2e49f..5fd0bf7a17 100644 --- a/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy +++ b/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_body2", "bboxMode":0, "bbox_bottom":23, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"467523c5-1041-45cb-8d64-8e6050ce3f09","name":"467523c5-1041-45cb-8d64-8e6050ce3f09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4c963d0-b475-4267-a887-fc3e016a2222","name":"b4c963d0-b475-4267-a887-fc3e016a2222","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ad6b9726-05d8-443a-a232-84859891d411","name":"ad6b9726-05d8-443a-a232-84859891d411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1e481ea8-380e-441c-a6fa-d59987014d25","name":"1e481ea8-380e-441c-a6fa-d59987014d25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07e2c5b6-a398-42be-8d89-87492926392c","name":"07e2c5b6-a398-42be-8d89-87492926392c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03f517fd-fe76-4a54-9034-88e734e84398","name":"03f517fd-fe76-4a54-9034-88e734e84398","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"467523c5-1041-45cb-8d64-8e6050ce3f09","name":"467523c5-1041-45cb-8d64-8e6050ce3f09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4c963d0-b475-4267-a887-fc3e016a2222","name":"b4c963d0-b475-4267-a887-fc3e016a2222","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ad6b9726-05d8-443a-a232-84859891d411","name":"ad6b9726-05d8-443a-a232-84859891d411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1e481ea8-380e-441c-a6fa-d59987014d25","name":"1e481ea8-380e-441c-a6fa-d59987014d25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07e2c5b6-a398-42be-8d89-87492926392c","name":"07e2c5b6-a398-42be-8d89-87492926392c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03f517fd-fe76-4a54-9034-88e734e84398","name":"03f517fd-fe76-4a54-9034-88e734e84398","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"467523c5-1041-45cb-8d64-8e6050ce3f09","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0262acb-01f2-4d60-8e20-519e5aa4ce08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1ae5075-5aa6-4bb0-bbde-3ce85ea507b0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afbce28b-935f-4730-bbaf-f35fb81bb939","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e825447b-2c95-4607-961b-fdbd4a7ae13a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fba64b1a-a025-46ec-b972-94378c3f43e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4c963d0-b475-4267-a887-fc3e016a2222","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8911da3b-6ace-4ff9-989d-29ea04ef059b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69b19c6c-3dd2-4e84-ad02-d854a1f0e1fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f440ed57-94c4-434c-9d3a-6b0dadef08c1","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad6b9726-05d8-443a-a232-84859891d411","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"456edfe0-ed8d-478f-bb52-350f549f5092","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e481ea8-380e-441c-a6fa-d59987014d25","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38444669-8149-410f-a484-ee6ad3f63841","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d666dea7-f511-4d8f-bb0f-2db6629ea19d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8b0c450-d879-435f-a9c5-f36600252da2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2577d053-353b-45c4-970a-4b9598c0e571","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f90e72f-15e1-441b-a3f4-ec59294cf95c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"274498ff-9483-4279-a711-6486069cabf3","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07e2c5b6-a398-42be-8d89-87492926392c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90e0ce56-5b21-478f-810a-e1dc998b0a80","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03f517fd-fe76-4a54-9034-88e734e84398","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"098a5439-72b0-4a86-a7e2-83a6aa6b7031","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"467523c5-1041-45cb-8d64-8e6050ce3f09","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0262acb-01f2-4d60-8e20-519e5aa4ce08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1ae5075-5aa6-4bb0-bbde-3ce85ea507b0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afbce28b-935f-4730-bbaf-f35fb81bb939","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e825447b-2c95-4607-961b-fdbd4a7ae13a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fba64b1a-a025-46ec-b972-94378c3f43e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4c963d0-b475-4267-a887-fc3e016a2222","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8911da3b-6ace-4ff9-989d-29ea04ef059b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69b19c6c-3dd2-4e84-ad02-d854a1f0e1fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f440ed57-94c4-434c-9d3a-6b0dadef08c1","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad6b9726-05d8-443a-a232-84859891d411","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"456edfe0-ed8d-478f-bb52-350f549f5092","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e481ea8-380e-441c-a6fa-d59987014d25","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38444669-8149-410f-a484-ee6ad3f63841","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d666dea7-f511-4d8f-bb0f-2db6629ea19d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8b0c450-d879-435f-a9c5-f36600252da2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2577d053-353b-45c4-970a-4b9598c0e571","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f90e72f-15e1-441b-a3f4-ec59294cf95c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"274498ff-9483-4279-a711-6486069cabf3","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07e2c5b6-a398-42be-8d89-87492926392c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90e0ce56-5b21-478f-810a-e1dc998b0a80","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03f517fd-fe76-4a54-9034-88e734e84398","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"098a5439-72b0-4a86-a7e2-83a6aa6b7031","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy b/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy index c3ddbf4c5e..14260bc3b3 100644 --- a/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy +++ b/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_body3", "bboxMode":0, "bbox_bottom":23, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"236377e1-ced1-4636-91b5-c4af681da3ea","name":"236377e1-ced1-4636-91b5-c4af681da3ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"154a1029-63af-4304-a7b4-37deec6d4299","name":"154a1029-63af-4304-a7b4-37deec6d4299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e819277b-fad6-4235-8163-e3845f10510b","name":"e819277b-fad6-4235-8163-e3845f10510b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1096a6c5-b038-4de2-89c2-433a93cc549c","name":"1096a6c5-b038-4de2-89c2-433a93cc549c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2d5e6037-56eb-4229-be25-821d2746541b","name":"2d5e6037-56eb-4229-be25-821d2746541b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab22c645-65eb-4850-92bb-4dc1efd37598","name":"ab22c645-65eb-4850-92bb-4dc1efd37598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef994322-3af5-469a-a31a-e766754c6852","name":"ef994322-3af5-469a-a31a-e766754c6852","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"236377e1-ced1-4636-91b5-c4af681da3ea","name":"236377e1-ced1-4636-91b5-c4af681da3ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"154a1029-63af-4304-a7b4-37deec6d4299","name":"154a1029-63af-4304-a7b4-37deec6d4299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e819277b-fad6-4235-8163-e3845f10510b","name":"e819277b-fad6-4235-8163-e3845f10510b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1096a6c5-b038-4de2-89c2-433a93cc549c","name":"1096a6c5-b038-4de2-89c2-433a93cc549c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d5e6037-56eb-4229-be25-821d2746541b","name":"2d5e6037-56eb-4229-be25-821d2746541b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab22c645-65eb-4850-92bb-4dc1efd37598","name":"ab22c645-65eb-4850-92bb-4dc1efd37598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef994322-3af5-469a-a31a-e766754c6852","name":"ef994322-3af5-469a-a31a-e766754c6852","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e91e7fb6-71d4-42ae-b53d-a55af28ded7a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1cb9cdb0-422f-4a9f-a3d1-77ec0ed9ca5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"236377e1-ced1-4636-91b5-c4af681da3ea","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffcc3b7f-e557-43b8-9e97-6b72dae68ce9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2274549d-7845-451b-b683-65c8ef433e34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a1029-63af-4304-a7b4-37deec6d4299","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b9b332c-bb9d-401e-a3d5-57368a0eeadc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7705b38b-35a6-4a6a-834b-074c782ee423","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99448237-30a9-4675-85b1-ce634aac94b3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e819277b-fad6-4235-8163-e3845f10510b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d2f2819-906e-4896-9c2c-e74970a820fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1096a6c5-b038-4de2-89c2-433a93cc549c","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf60c901-315c-4470-acb5-022272e954b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7586d567-a3e5-40f3-9306-8ae1475893c4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec7fa86f-5973-4c36-a6cc-3e59b4319c59","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d5e6037-56eb-4229-be25-821d2746541b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d45813a0-3a85-4499-9846-85b5bf859820","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7cfab11f-c45c-4333-b5f0-24e3ecd0b7ee","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab22c645-65eb-4850-92bb-4dc1efd37598","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9243bd4-5d21-4b7c-b38e-eb6c1dce5a9b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0335e729-472f-4df9-9359-371794cf03cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1379ab9e-d061-40dc-8ad0-8e6b21df5fa5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef994322-3af5-469a-a31a-e766754c6852","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83adbcc0-9d56-40f3-8993-2f72d1940009","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e91e7fb6-71d4-42ae-b53d-a55af28ded7a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1cb9cdb0-422f-4a9f-a3d1-77ec0ed9ca5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"236377e1-ced1-4636-91b5-c4af681da3ea","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffcc3b7f-e557-43b8-9e97-6b72dae68ce9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2274549d-7845-451b-b683-65c8ef433e34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a1029-63af-4304-a7b4-37deec6d4299","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b9b332c-bb9d-401e-a3d5-57368a0eeadc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7705b38b-35a6-4a6a-834b-074c782ee423","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99448237-30a9-4675-85b1-ce634aac94b3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e819277b-fad6-4235-8163-e3845f10510b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0d2f2819-906e-4896-9c2c-e74970a820fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1096a6c5-b038-4de2-89c2-433a93cc549c","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf60c901-315c-4470-acb5-022272e954b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7586d567-a3e5-40f3-9306-8ae1475893c4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec7fa86f-5973-4c36-a6cc-3e59b4319c59","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d5e6037-56eb-4229-be25-821d2746541b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d45813a0-3a85-4499-9846-85b5bf859820","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7cfab11f-c45c-4333-b5f0-24e3ecd0b7ee","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab22c645-65eb-4850-92bb-4dc1efd37598","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9243bd4-5d21-4b7c-b38e-eb6c1dce5a9b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0335e729-472f-4df9-9359-371794cf03cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1379ab9e-d061-40dc-8ad0-8e6b21df5fa5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef994322-3af5-469a-a31a-e766754c6852","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83adbcc0-9d56-40f3-8993-2f72d1940009","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy b/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy index bd0e0ccad0..12e353fd7a 100644 --- a/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy +++ b/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_legs1", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c2f036ba-6dfb-46d7-a569-361317d930eb","name":"c2f036ba-6dfb-46d7-a569-361317d930eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb2af642-9022-4f21-9660-2703755609ea","name":"eb2af642-9022-4f21-9660-2703755609ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"965fff3f-1783-457c-9393-a03c1931ae10","name":"965fff3f-1783-457c-9393-a03c1931ae10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbee7f5e-5160-403d-8567-5df73e765eeb","name":"dbee7f5e-5160-403d-8567-5df73e765eeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8744b640-716d-4d4e-9513-00e317357df6","name":"8744b640-716d-4d4e-9513-00e317357df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"645ae09e-fcf3-446f-b807-fb00205d8f87","name":"645ae09e-fcf3-446f-b807-fb00205d8f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"997f6c7b-e898-4e66-b59b-772d60f0c829","name":"997f6c7b-e898-4e66-b59b-772d60f0c829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce1449fa-495c-4d39-8e55-6cacd176f505","name":"ce1449fa-495c-4d39-8e55-6cacd176f505","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2f036ba-6dfb-46d7-a569-361317d930eb","name":"c2f036ba-6dfb-46d7-a569-361317d930eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb2af642-9022-4f21-9660-2703755609ea","name":"eb2af642-9022-4f21-9660-2703755609ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"965fff3f-1783-457c-9393-a03c1931ae10","name":"965fff3f-1783-457c-9393-a03c1931ae10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbee7f5e-5160-403d-8567-5df73e765eeb","name":"dbee7f5e-5160-403d-8567-5df73e765eeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8744b640-716d-4d4e-9513-00e317357df6","name":"8744b640-716d-4d4e-9513-00e317357df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"645ae09e-fcf3-446f-b807-fb00205d8f87","name":"645ae09e-fcf3-446f-b807-fb00205d8f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"997f6c7b-e898-4e66-b59b-772d60f0c829","name":"997f6c7b-e898-4e66-b59b-772d60f0c829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce1449fa-495c-4d39-8e55-6cacd176f505","name":"ce1449fa-495c-4d39-8e55-6cacd176f505","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2f036ba-6dfb-46d7-a569-361317d930eb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d86851b-e1a3-4ea1-bfe8-0919044ab423","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48ae85a6-c68a-48bb-9db1-c096d55ba89c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb2af642-9022-4f21-9660-2703755609ea","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2d2c23a-91ed-42db-a4bb-f16713dbfa78","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"965fff3f-1783-457c-9393-a03c1931ae10","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a474b0a-54b5-45c3-a003-d6f081a47d7b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5db78d0d-8574-4432-832c-6955a66a38ee","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbee7f5e-5160-403d-8567-5df73e765eeb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4659ea85-ef68-4926-9b35-467ce96ac92a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6127d529-6bda-4910-b02e-f81da044e691","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8744b640-716d-4d4e-9513-00e317357df6","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a31b1a1-1c0d-45f8-aee5-0dcb5e172678","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"645ae09e-fcf3-446f-b807-fb00205d8f87","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3de86e30-d61f-4d67-a64f-eb2735ecd72b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"997f6c7b-e898-4e66-b59b-772d60f0c829","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f3b7675-e2b5-4c75-b351-755181189d6d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f70e9054-b6a8-4239-be1e-6f151eb25910","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72666edf-3d1a-4a45-be71-ab09a846bc90","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce1449fa-495c-4d39-8e55-6cacd176f505","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5876e088-9df4-4a21-a80b-5d3ddf9f62d2","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21965edc-adc9-4724-9bf6-af11c62d9522","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75f5f4a1-d044-4b4b-889f-0d3c3d031d51","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73127f5d-2f5d-498b-a7d0-e8c19a17c2ed","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54d73ba7-6b05-4f08-9a32-204eb788ec2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2f036ba-6dfb-46d7-a569-361317d930eb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d86851b-e1a3-4ea1-bfe8-0919044ab423","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48ae85a6-c68a-48bb-9db1-c096d55ba89c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb2af642-9022-4f21-9660-2703755609ea","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2d2c23a-91ed-42db-a4bb-f16713dbfa78","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"965fff3f-1783-457c-9393-a03c1931ae10","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a474b0a-54b5-45c3-a003-d6f081a47d7b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5db78d0d-8574-4432-832c-6955a66a38ee","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbee7f5e-5160-403d-8567-5df73e765eeb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4659ea85-ef68-4926-9b35-467ce96ac92a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6127d529-6bda-4910-b02e-f81da044e691","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8744b640-716d-4d4e-9513-00e317357df6","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a31b1a1-1c0d-45f8-aee5-0dcb5e172678","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"645ae09e-fcf3-446f-b807-fb00205d8f87","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3de86e30-d61f-4d67-a64f-eb2735ecd72b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"997f6c7b-e898-4e66-b59b-772d60f0c829","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f3b7675-e2b5-4c75-b351-755181189d6d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f70e9054-b6a8-4239-be1e-6f151eb25910","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72666edf-3d1a-4a45-be71-ab09a846bc90","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce1449fa-495c-4d39-8e55-6cacd176f505","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5876e088-9df4-4a21-a80b-5d3ddf9f62d2","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21965edc-adc9-4724-9bf6-af11c62d9522","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75f5f4a1-d044-4b4b-889f-0d3c3d031d51","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73127f5d-2f5d-498b-a7d0-e8c19a17c2ed","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54d73ba7-6b05-4f08-9a32-204eb788ec2c","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy b/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy index 5d4aa560fa..45a6cf6a08 100644 --- a/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy +++ b/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_legs3", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"77638842-d819-4373-8f3b-3d002b35dc20","name":"77638842-d819-4373-8f3b-3d002b35dc20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b58c877-3ee4-4b95-b654-75568d548ab6","name":"3b58c877-3ee4-4b95-b654-75568d548ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfaa01bc-0674-449b-9218-7f7b08913781","name":"dfaa01bc-0674-449b-9218-7f7b08913781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f7cd542-f922-43ab-b933-251126717e95","name":"6f7cd542-f922-43ab-b933-251126717e95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84e60c23-9d89-4831-b241-c08e4a5e6526","name":"84e60c23-9d89-4831-b241-c08e4a5e6526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0dae561-f13a-4ead-8783-f71e946a49cc","name":"b0dae561-f13a-4ead-8783-f71e946a49cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77638842-d819-4373-8f3b-3d002b35dc20","name":"77638842-d819-4373-8f3b-3d002b35dc20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b58c877-3ee4-4b95-b654-75568d548ab6","name":"3b58c877-3ee4-4b95-b654-75568d548ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfaa01bc-0674-449b-9218-7f7b08913781","name":"dfaa01bc-0674-449b-9218-7f7b08913781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f7cd542-f922-43ab-b933-251126717e95","name":"6f7cd542-f922-43ab-b933-251126717e95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84e60c23-9d89-4831-b241-c08e4a5e6526","name":"84e60c23-9d89-4831-b241-c08e4a5e6526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0dae561-f13a-4ead-8783-f71e946a49cc","name":"b0dae561-f13a-4ead-8783-f71e946a49cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1a483ed-5e77-43a9-96ce-4b62b867f7f1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9d70c72-6e46-4b96-af44-be960316171f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2413b45c-cde3-45de-8133-b20d1f554433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d84cb2c-0ef8-4dc3-9125-45b73b65ee86","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2ee9969-cd0d-45e5-a275-763e221414bd","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77638842-d819-4373-8f3b-3d002b35dc20","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c795c091-a988-4ee9-a846-6caf8690562b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24f9becf-c663-4005-a926-e0012f014c7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b58c877-3ee4-4b95-b654-75568d548ab6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3fbe6f0d-3484-4c62-92f7-d83878f4c6e5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfaa01bc-0674-449b-9218-7f7b08913781","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d940cea-52b4-44e4-bd3d-884bd56cef01","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"42a0ac23-afdf-4805-93b2-51e900bb2b8a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f7cd542-f922-43ab-b933-251126717e95","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e146ecd-2e8e-48de-b68c-0111dd0f1eab","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef155006-a64a-478f-a369-5a54bfaac69f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7894ac22-7768-481b-a050-2080121b1dc4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8b147c8-8847-4a5d-838a-7c1135823e8b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e60c23-9d89-4831-b241-c08e4a5e6526","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0983887-af1d-4bc2-b1f4-cefc411c69c0","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5925805b-4db1-4b6e-a59a-6a21bfbaf0b1","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0dae561-f13a-4ead-8783-f71e946a49cc","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be39ee89-f754-490c-b725-3b6a703116e4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1a483ed-5e77-43a9-96ce-4b62b867f7f1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9d70c72-6e46-4b96-af44-be960316171f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2413b45c-cde3-45de-8133-b20d1f554433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d84cb2c-0ef8-4dc3-9125-45b73b65ee86","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2ee9969-cd0d-45e5-a275-763e221414bd","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"77638842-d819-4373-8f3b-3d002b35dc20","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c795c091-a988-4ee9-a846-6caf8690562b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24f9becf-c663-4005-a926-e0012f014c7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b58c877-3ee4-4b95-b654-75568d548ab6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3fbe6f0d-3484-4c62-92f7-d83878f4c6e5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfaa01bc-0674-449b-9218-7f7b08913781","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d940cea-52b4-44e4-bd3d-884bd56cef01","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"42a0ac23-afdf-4805-93b2-51e900bb2b8a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f7cd542-f922-43ab-b933-251126717e95","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e146ecd-2e8e-48de-b68c-0111dd0f1eab","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef155006-a64a-478f-a369-5a54bfaac69f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7894ac22-7768-481b-a050-2080121b1dc4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8b147c8-8847-4a5d-838a-7c1135823e8b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e60c23-9d89-4831-b241-c08e4a5e6526","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0983887-af1d-4bc2-b1f4-cefc411c69c0","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5925805b-4db1-4b6e-a59a-6a21bfbaf0b1","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0dae561-f13a-4ead-8783-f71e946a49cc","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be39ee89-f754-490c-b725-3b6a703116e4","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy b/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy index ceb25b5514..c3c0f105f7 100644 --- a/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy +++ b/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_legs4", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"caa00d1c-443e-49d6-941c-29529df71739","name":"caa00d1c-443e-49d6-941c-29529df71739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55e96122-72ec-459e-aca9-db53e3c08f8d","name":"55e96122-72ec-459e-aca9-db53e3c08f8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6607f421-d530-4ab4-b20d-ef4240becd9c","name":"6607f421-d530-4ab4-b20d-ef4240becd9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"17a776e8-c3ab-4411-ac50-0f2033957381","name":"17a776e8-c3ab-4411-ac50-0f2033957381","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bbf95248-3480-4c61-8898-4ddc75a49628","name":"bbf95248-3480-4c61-8898-4ddc75a49628","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"877c1656-505c-4ca1-9c43-057e4cd76346","name":"877c1656-505c-4ca1-9c43-057e4cd76346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09745b8e-9657-451a-8ce4-456d2eef61ac","name":"09745b8e-9657-451a-8ce4-456d2eef61ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36361e69-53b7-40cf-905d-95b15eaf953b","name":"36361e69-53b7-40cf-905d-95b15eaf953b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"caa00d1c-443e-49d6-941c-29529df71739","name":"caa00d1c-443e-49d6-941c-29529df71739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55e96122-72ec-459e-aca9-db53e3c08f8d","name":"55e96122-72ec-459e-aca9-db53e3c08f8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6607f421-d530-4ab4-b20d-ef4240becd9c","name":"6607f421-d530-4ab4-b20d-ef4240becd9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"17a776e8-c3ab-4411-ac50-0f2033957381","name":"17a776e8-c3ab-4411-ac50-0f2033957381","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbf95248-3480-4c61-8898-4ddc75a49628","name":"bbf95248-3480-4c61-8898-4ddc75a49628","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"877c1656-505c-4ca1-9c43-057e4cd76346","name":"877c1656-505c-4ca1-9c43-057e4cd76346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09745b8e-9657-451a-8ce4-456d2eef61ac","name":"09745b8e-9657-451a-8ce4-456d2eef61ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36361e69-53b7-40cf-905d-95b15eaf953b","name":"36361e69-53b7-40cf-905d-95b15eaf953b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"caa00d1c-443e-49d6-941c-29529df71739","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4432def1-2c16-4762-a486-98859e253902","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e96122-72ec-459e-aca9-db53e3c08f8d","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc6fb347-fee6-4420-88cf-4473e511fd32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d2ef441-b40a-4681-bcc1-62ce6ec9f565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0335310-0f37-4143-8405-75861681e88a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40357d02-75cc-4ae8-a8ba-c4bdf0227a04","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607f421-d530-4ab4-b20d-ef4240becd9c","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a7bafff-bcf9-44d7-96b6-844c22fab10d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5219354d-bb8f-4a30-b2dd-9af0362869eb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"17a776e8-c3ab-4411-ac50-0f2033957381","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7608aa62-d2f6-40c0-90c5-f65811df1022","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69ec8aab-f5b0-42eb-8952-8443d056ce26","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54bc4f58-03ef-4a00-8048-f979196e28db","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbf95248-3480-4c61-8898-4ddc75a49628","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"127dc9bf-f4d6-42a2-bbaf-a6f8f010deba","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"877c1656-505c-4ca1-9c43-057e4cd76346","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc060b96-fe48-4cc0-aeb0-e87e725ece2e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"50f8a3f1-435b-4339-ac14-d99f7dea4cef","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09745b8e-9657-451a-8ce4-456d2eef61ac","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"334edbbe-8c21-467c-a914-e51e3e06b91a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"131de9ef-1e27-4f50-bbee-22319b25d980","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36361e69-53b7-40cf-905d-95b15eaf953b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27b33854-917d-421d-bd55-81f716db4900","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e323067-52fa-45a5-9a9f-cf5c93962d78","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"caa00d1c-443e-49d6-941c-29529df71739","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4432def1-2c16-4762-a486-98859e253902","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e96122-72ec-459e-aca9-db53e3c08f8d","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc6fb347-fee6-4420-88cf-4473e511fd32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d2ef441-b40a-4681-bcc1-62ce6ec9f565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0335310-0f37-4143-8405-75861681e88a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40357d02-75cc-4ae8-a8ba-c4bdf0227a04","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607f421-d530-4ab4-b20d-ef4240becd9c","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a7bafff-bcf9-44d7-96b6-844c22fab10d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5219354d-bb8f-4a30-b2dd-9af0362869eb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"17a776e8-c3ab-4411-ac50-0f2033957381","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7608aa62-d2f6-40c0-90c5-f65811df1022","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69ec8aab-f5b0-42eb-8952-8443d056ce26","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54bc4f58-03ef-4a00-8048-f979196e28db","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbf95248-3480-4c61-8898-4ddc75a49628","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"127dc9bf-f4d6-42a2-bbaf-a6f8f010deba","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"877c1656-505c-4ca1-9c43-057e4cd76346","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc060b96-fe48-4cc0-aeb0-e87e725ece2e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"50f8a3f1-435b-4339-ac14-d99f7dea4cef","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09745b8e-9657-451a-8ce4-456d2eef61ac","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"334edbbe-8c21-467c-a914-e51e3e06b91a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131de9ef-1e27-4f50-bbee-22319b25d980","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36361e69-53b7-40cf-905d-95b15eaf953b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27b33854-917d-421d-bd55-81f716db4900","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e323067-52fa-45a5-9a9f-cf5c93962d78","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy b/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy index 5d8c897a75..6c8463d5d3 100644 --- a/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy +++ b/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_pauldron1", "bboxMode":0, "bbox_bottom":14, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"661b3802-8624-40e2-930f-6474feb5b781","name":"661b3802-8624-40e2-930f-6474feb5b781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc56116f-9cdf-4989-bc05-5791009049da","name":"dc56116f-9cdf-4989-bc05-5791009049da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b35eb062-430f-4247-8a95-80ade92fd13d","name":"b35eb062-430f-4247-8a95-80ade92fd13d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c62e46c-d633-472c-aeac-28c65405201d","name":"3c62e46c-d633-472c-aeac-28c65405201d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b270eba5-87f5-4299-b055-42d8650a1049","name":"b270eba5-87f5-4299-b055-42d8650a1049","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70433f03-e533-40ef-ac04-b6699f39f2db","name":"70433f03-e533-40ef-ac04-b6699f39f2db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4dca56da-691f-43b2-ae74-94e7269fad99","name":"4dca56da-691f-43b2-ae74-94e7269fad99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"661b3802-8624-40e2-930f-6474feb5b781","name":"661b3802-8624-40e2-930f-6474feb5b781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc56116f-9cdf-4989-bc05-5791009049da","name":"dc56116f-9cdf-4989-bc05-5791009049da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b35eb062-430f-4247-8a95-80ade92fd13d","name":"b35eb062-430f-4247-8a95-80ade92fd13d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c62e46c-d633-472c-aeac-28c65405201d","name":"3c62e46c-d633-472c-aeac-28c65405201d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b270eba5-87f5-4299-b055-42d8650a1049","name":"b270eba5-87f5-4299-b055-42d8650a1049","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70433f03-e533-40ef-ac04-b6699f39f2db","name":"70433f03-e533-40ef-ac04-b6699f39f2db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dca56da-691f-43b2-ae74-94e7269fad99","name":"4dca56da-691f-43b2-ae74-94e7269fad99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44b617f3-0fae-4f1e-9d44-4bd1a2a38ede","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ba20f51-d770-4609-bffa-c007416ec912","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"661b3802-8624-40e2-930f-6474feb5b781","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b1a8513-11a8-4cd8-b846-abdab255f0d8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4efd5d7-a6f0-4326-bf31-46c5860043e4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b60564e1-8ac0-4bcc-b78a-ac25a2d6b7d6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc56116f-9cdf-4989-bc05-5791009049da","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1ff97f3-c2cc-406a-8ec9-2a9273cd41c1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46417154-91f6-4286-b4de-a96a1af577de","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e93be9a4-d28e-468a-ada5-220892e8cf69","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b35eb062-430f-4247-8a95-80ade92fd13d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81f2b4a3-305a-43b6-812b-16eb48e67471","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9c00d12-87e7-42c5-bfbe-dd82b99de1fd","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c62e46c-d633-472c-aeac-28c65405201d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0103e129-31f7-45f2-bccc-d00ff0397e54","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b270eba5-87f5-4299-b055-42d8650a1049","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ee15558-9b1d-4350-b6fb-3467f6b5abc4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70433f03-e533-40ef-ac04-b6699f39f2db","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ea104f0-10b6-4952-8432-593d54520fa0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc15da12-5abf-49a1-ad9f-e38dc97899b6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2a15112-e84b-4528-9935-6df7471bdf81","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dca56da-691f-43b2-ae74-94e7269fad99","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1997871-4810-42a7-8396-cb9bbe0f4966","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16ff5483-4c3a-47f5-9b5a-d64b19bc16fa","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44b617f3-0fae-4f1e-9d44-4bd1a2a38ede","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ba20f51-d770-4609-bffa-c007416ec912","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"661b3802-8624-40e2-930f-6474feb5b781","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b1a8513-11a8-4cd8-b846-abdab255f0d8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4efd5d7-a6f0-4326-bf31-46c5860043e4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b60564e1-8ac0-4bcc-b78a-ac25a2d6b7d6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc56116f-9cdf-4989-bc05-5791009049da","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1ff97f3-c2cc-406a-8ec9-2a9273cd41c1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46417154-91f6-4286-b4de-a96a1af577de","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e93be9a4-d28e-468a-ada5-220892e8cf69","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b35eb062-430f-4247-8a95-80ade92fd13d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81f2b4a3-305a-43b6-812b-16eb48e67471","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9c00d12-87e7-42c5-bfbe-dd82b99de1fd","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c62e46c-d633-472c-aeac-28c65405201d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0103e129-31f7-45f2-bccc-d00ff0397e54","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b270eba5-87f5-4299-b055-42d8650a1049","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ee15558-9b1d-4350-b6fb-3467f6b5abc4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70433f03-e533-40ef-ac04-b6699f39f2db","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ea104f0-10b6-4952-8432-593d54520fa0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc15da12-5abf-49a1-ad9f-e38dc97899b6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2a15112-e84b-4528-9935-6df7471bdf81","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dca56da-691f-43b2-ae74-94e7269fad99","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1997871-4810-42a7-8396-cb9bbe0f4966","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16ff5483-4c3a-47f5-9b5a-d64b19bc16fa","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy b/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy index 438dc91fb0..e1ccb6ea51 100644 --- a/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy +++ b/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_pauldron2", "bboxMode":0, "bbox_bottom":14, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8df28315-269d-432b-a708-23820aeaab77","name":"8df28315-269d-432b-a708-23820aeaab77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c776f495-65b2-40a3-90c3-63df559ac482","name":"c776f495-65b2-40a3-90c3-63df559ac482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2047e9d2-d217-4970-a624-317dd6ce677b","name":"2047e9d2-d217-4970-a624-317dd6ce677b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5339ce2b-6d13-475f-adab-993098883b65","name":"5339ce2b-6d13-475f-adab-993098883b65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2eb2b517-510c-475d-bc56-17f25895492c","name":"2eb2b517-510c-475d-bc56-17f25895492c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dac8105e-f730-4b45-ab32-3878728c1cde","name":"dac8105e-f730-4b45-ab32-3878728c1cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75d57217-083f-495c-993f-4ab3e009a5a6","name":"75d57217-083f-495c-993f-4ab3e009a5a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8df28315-269d-432b-a708-23820aeaab77","name":"8df28315-269d-432b-a708-23820aeaab77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c776f495-65b2-40a3-90c3-63df559ac482","name":"c776f495-65b2-40a3-90c3-63df559ac482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2047e9d2-d217-4970-a624-317dd6ce677b","name":"2047e9d2-d217-4970-a624-317dd6ce677b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5339ce2b-6d13-475f-adab-993098883b65","name":"5339ce2b-6d13-475f-adab-993098883b65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2eb2b517-510c-475d-bc56-17f25895492c","name":"2eb2b517-510c-475d-bc56-17f25895492c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dac8105e-f730-4b45-ab32-3878728c1cde","name":"dac8105e-f730-4b45-ab32-3878728c1cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75d57217-083f-495c-993f-4ab3e009a5a6","name":"75d57217-083f-495c-993f-4ab3e009a5a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bd342cc-a552-4293-a730-5614fdb518f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37de31b9-d304-47e6-9ea5-d44e3feb0e05","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df28315-269d-432b-a708-23820aeaab77","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62a71675-6595-465d-8862-b2d823563ea4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fec6f7d8-56ca-443c-b686-3031f116090c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c776f495-65b2-40a3-90c3-63df559ac482","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"073660be-f7d1-4170-a21e-a2915b533139","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2047e9d2-d217-4970-a624-317dd6ce677b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65e2d395-3aa7-4301-abb3-cf59ee4e21ae","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc68a23c-7e6c-4f74-8469-b5c198d165d5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7551fa3-53f0-4852-89b6-9e1fcf36997a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5339ce2b-6d13-475f-adab-993098883b65","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15845535-7a76-468f-9060-74c53736dd99","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8ef8f55e-93f7-487a-b48d-1e942f3493b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb2b517-510c-475d-bc56-17f25895492c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06b2d985-f6df-4005-81cc-18bc9aeeb94e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f040df1-e58d-4b78-8dbd-1fa774633ec4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dac8105e-f730-4b45-ab32-3878728c1cde","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2618a44-f935-4039-9723-38995ec0f345","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef3169c9-2bde-4dc5-8bc0-b593d55b0f76","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75d57217-083f-495c-993f-4ab3e009a5a6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"614bc5ed-c6b8-46e6-ae81-4dd34ebfef6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b554dfe4-317b-489f-b422-929b11e52eb2","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec1f66aa-c7e9-47b4-a662-669c521aa7a8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bd342cc-a552-4293-a730-5614fdb518f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37de31b9-d304-47e6-9ea5-d44e3feb0e05","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df28315-269d-432b-a708-23820aeaab77","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62a71675-6595-465d-8862-b2d823563ea4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fec6f7d8-56ca-443c-b686-3031f116090c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c776f495-65b2-40a3-90c3-63df559ac482","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"073660be-f7d1-4170-a21e-a2915b533139","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2047e9d2-d217-4970-a624-317dd6ce677b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65e2d395-3aa7-4301-abb3-cf59ee4e21ae","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc68a23c-7e6c-4f74-8469-b5c198d165d5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7551fa3-53f0-4852-89b6-9e1fcf36997a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5339ce2b-6d13-475f-adab-993098883b65","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15845535-7a76-468f-9060-74c53736dd99","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8ef8f55e-93f7-487a-b48d-1e942f3493b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb2b517-510c-475d-bc56-17f25895492c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06b2d985-f6df-4005-81cc-18bc9aeeb94e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f040df1-e58d-4b78-8dbd-1fa774633ec4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dac8105e-f730-4b45-ab32-3878728c1cde","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2618a44-f935-4039-9723-38995ec0f345","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef3169c9-2bde-4dc5-8bc0-b593d55b0f76","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75d57217-083f-495c-993f-4ab3e009a5a6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"614bc5ed-c6b8-46e6-ae81-4dd34ebfef6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b554dfe4-317b-489f-b422-929b11e52eb2","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec1f66aa-c7e9-47b4-a662-669c521aa7a8","IsCreationKey":false,"Key":16.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":{ diff --git a/sprites/spr_marine_base/spr_marine_base.yy b/sprites/spr_marine_base/spr_marine_base.yy index 89b62c4e77..0a2f24af04 100644 --- a/sprites/spr_marine_base/spr_marine_base.yy +++ b/sprites/spr_marine_base/spr_marine_base.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_base", "bboxMode":0, "bbox_bottom":223, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e6adee3-2036-475d-9a6f-d99dc9e6e50c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40fc45f9-b0d9-411a-a4b0-64633b87398d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4353a96-ea37-4bc1-8e30-3748a110a3f5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3357145b-4829-48c8-9e70-363ecb8cccb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88f5ae33-5381-4147-899c-feaae6733f32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e686c46d-d3e4-42ad-b4d8-bc5c53313237","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be715bb4-0b5e-490b-a3a1-2a4dceef2e44","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e6adee3-2036-475d-9a6f-d99dc9e6e50c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40fc45f9-b0d9-411a-a4b0-64633b87398d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4353a96-ea37-4bc1-8e30-3748a110a3f5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3357145b-4829-48c8-9e70-363ecb8cccb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88f5ae33-5381-4147-899c-feaae6733f32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e686c46d-d3e4-42ad-b4d8-bc5c53313237","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be715bb4-0b5e-490b-a3a1-2a4dceef2e44","IsCreationKey":false,"Key":6.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_marine_cloth_hood/spr_marine_cloth_hood.yy b/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy index 6b1393e071..437d1ac2a5 100644 --- a/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy +++ b/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_cloth_hood", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","path":"sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bde58bd2-638c-4eb2-a908-97a4fde54b39","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","path":"sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bde58bd2-638c-4eb2-a908-97a4fde54b39","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_marine_head/spr_marine_head.yy b/sprites/spr_marine_head/spr_marine_head.yy index e7b599ad17..b648dcd902 100644 --- a/sprites/spr_marine_head/spr_marine_head.yy +++ b/sprites/spr_marine_head/spr_marine_head.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_head", "bboxMode":0, "bbox_bottom":61, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9baab639-23b7-4d59-88d7-494e2931e56c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"997fb703-58ef-440f-9c7a-44f62882543f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc9a2629-0444-42e0-9f6d-cf2661d1b364","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7bfc88a-66d4-467a-9544-8ef7d91d3cae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"709b1f01-0ae6-42a7-8c57-5676c50b7cb0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f63c763-7e25-4e4b-8dc2-c61e0dffca39","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9baab639-23b7-4d59-88d7-494e2931e56c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"997fb703-58ef-440f-9c7a-44f62882543f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc9a2629-0444-42e0-9f6d-cf2661d1b364","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7bfc88a-66d4-467a-9544-8ef7d91d3cae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"709b1f01-0ae6-42a7-8c57-5676c50b7cb0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f63c763-7e25-4e4b-8dc2-c61e0dffca39","IsCreationKey":false,"Key":5.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_marine_robes/spr_marine_robes.yy b/sprites/spr_marine_robes/spr_marine_robes.yy index bd26238f1d..836ea1ed21 100644 --- a/sprites/spr_marine_robes/spr_marine_robes.yy +++ b/sprites/spr_marine_robes/spr_marine_robes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_robes", "bboxMode":0, "bbox_bottom":198, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"465410e8-8c66-4937-9939-84339eb58dc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8880f29c-fb69-4fe1-bcdf-d56db7fd4d89","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"465410e8-8c66-4937-9939-84339eb58dc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","path":"sprites/spr_marine_robes/spr_marine_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8880f29c-fb69-4fe1-bcdf-d56db7fd4d89","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_marksmans_honor/spr_marksmans_honor.yy b/sprites/spr_marksmans_honor/spr_marksmans_honor.yy index 4302733979..fb9c7c8138 100644 --- a/sprites/spr_marksmans_honor/spr_marksmans_honor.yy +++ b/sprites/spr_marksmans_honor/spr_marksmans_honor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marksmans_honor", "bboxMode":0, "bbox_bottom":26, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ccb9b2a6-2d8d-4fe5-8d85-f4cf871046a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"399cb25a-d0c4-4928-b1ba-0f988b480254","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ccb9b2a6-2d8d-4fe5-8d85-f4cf871046a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"399cb25a-d0c4-4928-b1ba-0f988b480254","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_master_splash/spr_master_splash.yy b/sprites/spr_master_splash/spr_master_splash.yy index 896c339055..431f0e9700 100644 --- a/sprites/spr_master_splash/spr_master_splash.yy +++ b/sprites/spr_master_splash/spr_master_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_master_splash", "bboxMode":0, "bbox_bottom":479, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","path":"sprites/spr_master_splash/spr_master_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ff8d8db-ce0f-44a4-b676-62c6aa9da21d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","path":"sprites/spr_master_splash/spr_master_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ff8d8db-ce0f-44a4-b676-62c6aa9da21d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_master_title/spr_master_title.yy b/sprites/spr_master_title/spr_master_title.yy index d0dc2036ca..c10f643174 100644 --- a/sprites/spr_master_title/spr_master_title.yy +++ b/sprites/spr_master_title/spr_master_title.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_master_title", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"79c91420-f39c-4f56-9743-270274c42515","name":"79c91420-f39c-4f56-9743-270274c42515","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79c91420-f39c-4f56-9743-270274c42515","name":"79c91420-f39c-4f56-9743-270274c42515","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79c91420-f39c-4f56-9743-270274c42515","path":"sprites/spr_master_title/spr_master_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94770730-06c8-4e1f-a4c7-7c71948ab98d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79c91420-f39c-4f56-9743-270274c42515","path":"sprites/spr_master_title/spr_master_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94770730-06c8-4e1f-a4c7-7c71948ab98d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_maximus_colors/spr_maximus_colors.yy b/sprites/spr_maximus_colors/spr_maximus_colors.yy index 0054d33192..95f95f1541 100644 --- a/sprites/spr_maximus_colors/spr_maximus_colors.yy +++ b/sprites/spr_maximus_colors/spr_maximus_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_maximus_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a0f4334-9529-4cd6-ac67-1a3eab5a387a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eeb4850a-8933-4f8f-a87f-20c23dc42ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"722ee4dd-b531-47a5-b37d-272d3b2d7ad8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3242b5b3-24bd-4175-9af2-5f379b44305a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5777af28-cf29-43d2-8092-8738a2c12b5d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c79176e4-18d4-4833-8f13-1b06c19e9150","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09b73112-ad1d-4019-a20b-07a5b569d4d8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02aa1cdf-ecda-4511-94a3-57c8940e29ee","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddcb749d-0a9a-4f7d-a298-147aa3d94b71","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b55c5033-5687-4c72-ad54-a614a228de1a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"136412ca-466d-4197-b145-ac8f364356e8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f7bf925-c4c9-4a97-be0b-4d59812b39ff","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"839d2136-94be-4b64-b5bc-2340a2227577","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a0f4334-9529-4cd6-ac67-1a3eab5a387a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eeb4850a-8933-4f8f-a87f-20c23dc42ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"722ee4dd-b531-47a5-b37d-272d3b2d7ad8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3242b5b3-24bd-4175-9af2-5f379b44305a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5777af28-cf29-43d2-8092-8738a2c12b5d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c79176e4-18d4-4833-8f13-1b06c19e9150","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09b73112-ad1d-4019-a20b-07a5b569d4d8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02aa1cdf-ecda-4511-94a3-57c8940e29ee","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddcb749d-0a9a-4f7d-a298-147aa3d94b71","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b55c5033-5687-4c72-ad54-a614a228de1a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"136412ca-466d-4197-b145-ac8f364356e8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f7bf925-c4c9-4a97-be0b-4d59812b39ff","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"839d2136-94be-4b64-b5bc-2340a2227577","IsCreationKey":false,"Key":12.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_maximus_colors2/spr_maximus_colors2.yy b/sprites/spr_maximus_colors2/spr_maximus_colors2.yy index e8c18a718c..93539fb16f 100644 --- a/sprites/spr_maximus_colors2/spr_maximus_colors2.yy +++ b/sprites/spr_maximus_colors2/spr_maximus_colors2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_maximus_colors2", "bboxMode":0, "bbox_bottom":227, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8fecf39d-c055-449d-bec6-eba091676059","name":"8fecf39d-c055-449d-bec6-eba091676059","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"318341de-fa3b-4c86-a354-c490f5ac3a28","name":"318341de-fa3b-4c86-a354-c490f5ac3a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c50ba520-6850-41ff-98b0-def6581631a5","name":"c50ba520-6850-41ff-98b0-def6581631a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"476657fe-2ada-41a7-8162-775ffa4b1576","name":"476657fe-2ada-41a7-8162-775ffa4b1576","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fecf39d-c055-449d-bec6-eba091676059","name":"8fecf39d-c055-449d-bec6-eba091676059","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"318341de-fa3b-4c86-a354-c490f5ac3a28","name":"318341de-fa3b-4c86-a354-c490f5ac3a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c50ba520-6850-41ff-98b0-def6581631a5","name":"c50ba520-6850-41ff-98b0-def6581631a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"476657fe-2ada-41a7-8162-775ffa4b1576","name":"476657fe-2ada-41a7-8162-775ffa4b1576","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"275f7692-e3c9-4c5a-862c-cfcda559f1d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c01ace79-390d-4c4b-b80a-c17d379254b7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e1b8ef5-df11-4a9b-a79d-e986f294c399","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ef6c561-6e91-43ab-871d-3b8bfbb90bce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fecf39d-c055-449d-bec6-eba091676059","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89f7e359-08d5-46aa-9b97-a9c0fff83b08","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3c7ea15-503e-4e33-8e26-5dc230326770","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ae99b10-6856-47e2-bc24-32f924978e77","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a21311c7-e30f-4457-afe2-4eba5441d834","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c403f8cf-a7cb-4253-946d-b3e7cf5f9be7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"318341de-fa3b-4c86-a354-c490f5ac3a28","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90342c3a-c5e7-4c30-b02e-055b74b415ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fd98488-1dcd-42c5-874d-748e424b7bcc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8298b0ca-d94a-4e7d-93b5-843f9e8c70ae","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50ba520-6850-41ff-98b0-def6581631a5","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25845d32-a357-44c9-9fb4-5ee87128531e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"476657fe-2ada-41a7-8162-775ffa4b1576","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"71e2989a-48fc-49e1-b7ca-5dcc46f18d6b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"275f7692-e3c9-4c5a-862c-cfcda559f1d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c01ace79-390d-4c4b-b80a-c17d379254b7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e1b8ef5-df11-4a9b-a79d-e986f294c399","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ef6c561-6e91-43ab-871d-3b8bfbb90bce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fecf39d-c055-449d-bec6-eba091676059","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89f7e359-08d5-46aa-9b97-a9c0fff83b08","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3c7ea15-503e-4e33-8e26-5dc230326770","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ae99b10-6856-47e2-bc24-32f924978e77","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a21311c7-e30f-4457-afe2-4eba5441d834","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c403f8cf-a7cb-4253-946d-b3e7cf5f9be7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"318341de-fa3b-4c86-a354-c490f5ac3a28","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90342c3a-c5e7-4c30-b02e-055b74b415ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7fd98488-1dcd-42c5-874d-748e424b7bcc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8298b0ca-d94a-4e7d-93b5-843f9e8c70ae","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50ba520-6850-41ff-98b0-def6581631a5","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25845d32-a357-44c9-9fb4-5ee87128531e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"476657fe-2ada-41a7-8162-775ffa4b1576","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"71e2989a-48fc-49e1-b7ca-5dcc46f18d6b","IsCreationKey":false,"Key":13.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_medicine_icon/spr_medicine_icon.yy b/sprites/spr_medicine_icon/spr_medicine_icon.yy index 1facd441ce..08ffa42b61 100644 --- a/sprites/spr_medicine_icon/spr_medicine_icon.yy +++ b/sprites/spr_medicine_icon/spr_medicine_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_medicine_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0fbf6532-6be4-43b1-9c15-8bf354357241","name":"0fbf6532-6be4-43b1-9c15-8bf354357241","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0fbf6532-6be4-43b1-9c15-8bf354357241","name":"0fbf6532-6be4-43b1-9c15-8bf354357241","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fbf6532-6be4-43b1-9c15-8bf354357241","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78528be8-8310-462c-a5df-9390de9368f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fbf6532-6be4-43b1-9c15-8bf354357241","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78528be8-8310-462c-a5df-9390de9368f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_melta/spr_melta.yy b/sprites/spr_melta/spr_melta.yy index d83529a0c5..3eb43b6ae8 100644 --- a/sprites/spr_melta/spr_melta.yy +++ b/sprites/spr_melta/spr_melta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_melta", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b57cafa-76c3-40cc-90ee-d3356794051b","name":"9b57cafa-76c3-40cc-90ee-d3356794051b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75264f28-3821-4997-930c-60e09ac121bd","name":"75264f28-3821-4997-930c-60e09ac121bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"549538a6-1b70-4144-88ce-8ae66206eed9","name":"549538a6-1b70-4144-88ce-8ae66206eed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba709feb-d1d2-432a-b1ba-72bccf507015","name":"ba709feb-d1d2-432a-b1ba-72bccf507015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b57cafa-76c3-40cc-90ee-d3356794051b","name":"9b57cafa-76c3-40cc-90ee-d3356794051b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75264f28-3821-4997-930c-60e09ac121bd","name":"75264f28-3821-4997-930c-60e09ac121bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"549538a6-1b70-4144-88ce-8ae66206eed9","name":"549538a6-1b70-4144-88ce-8ae66206eed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba709feb-d1d2-432a-b1ba-72bccf507015","name":"ba709feb-d1d2-432a-b1ba-72bccf507015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b57cafa-76c3-40cc-90ee-d3356794051b","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01320803-609a-4af2-bea2-6042e6d1c093","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6dad15c-c679-46f9-af64-f168b51b1029","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75264f28-3821-4997-930c-60e09ac121bd","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9aecd644-8450-4c87-a6e6-2f3e8310a5fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"587bd5b6-a72a-48e5-a2e3-a4042e58c53d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"549538a6-1b70-4144-88ce-8ae66206eed9","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d65d15c8-88d7-493a-9ad0-d187c873732e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b205325-4ab1-4ecc-8807-a86c94717e8d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6eb84ca-ea7c-4bf8-8635-219af404dd5f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba709feb-d1d2-432a-b1ba-72bccf507015","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"525c863e-ef29-4744-bf9f-0f69d713c150","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b57cafa-76c3-40cc-90ee-d3356794051b","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01320803-609a-4af2-bea2-6042e6d1c093","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6dad15c-c679-46f9-af64-f168b51b1029","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75264f28-3821-4997-930c-60e09ac121bd","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9aecd644-8450-4c87-a6e6-2f3e8310a5fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"587bd5b6-a72a-48e5-a2e3-a4042e58c53d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"549538a6-1b70-4144-88ce-8ae66206eed9","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d65d15c8-88d7-493a-9ad0-d187c873732e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b205325-4ab1-4ecc-8807-a86c94717e8d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6eb84ca-ea7c-4bf8-8635-219af404dd5f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba709feb-d1d2-432a-b1ba-72bccf507015","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"525c863e-ef29-4744-bf9f-0f69d713c150","IsCreationKey":false,"Key":7.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":{ diff --git a/sprites/spr_metal_tabbard/spr_metal_tabbard.yy b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy index 5f3f896479..804fa35cf6 100644 --- a/sprites/spr_metal_tabbard/spr_metal_tabbard.yy +++ b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_metal_tabbard", "bboxMode":0, "bbox_bottom":226, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_metal_tabbard/spr_metal_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"181eb698-17b4-48e0-bf60-e786cc8baaa7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_metal_tabbard/spr_metal_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"181eb698-17b4-48e0-bf60-e786cc8baaa7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_belt/spr_mk3_belt.yy b/sprites/spr_mk3_belt/spr_mk3_belt.yy index 1d0a44bd03..b9140cf5a4 100644 --- a/sprites/spr_mk3_belt/spr_mk3_belt.yy +++ b/sprites/spr_mk3_belt/spr_mk3_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_belt", "bboxMode":0, "bbox_bottom":133, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_belt/spr_mk3_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47d7ef7d-b3f5-48e5-9ee6-d99a5f3de6a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_belt/spr_mk3_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47d7ef7d-b3f5-48e5-9ee6-d99a5f3de6a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_chest/spr_mk3_chest.yy b/sprites/spr_mk3_chest/spr_mk3_chest.yy index df685b8560..243a5f82e1 100644 --- a/sprites/spr_mk3_chest/spr_mk3_chest.yy +++ b/sprites/spr_mk3_chest/spr_mk3_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_chest", "bboxMode":0, "bbox_bottom":96, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_chest/spr_mk3_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25a5823d-7e46-458c-b93f-082194e2e4a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_chest/spr_mk3_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25a5823d-7e46-458c-b93f-082194e2e4a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_colors/spr_mk3_colors.yy b/sprites/spr_mk3_colors/spr_mk3_colors.yy index 430e2f0321..838df707c8 100644 --- a/sprites/spr_mk3_colors/spr_mk3_colors.yy +++ b/sprites/spr_mk3_colors/spr_mk3_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f629c04e-891c-45a9-875c-fc3c820221d8","name":"f629c04e-891c-45a9-875c-fc3c820221d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b36a256-1a8f-46fe-927a-b454edbe5676","name":"1b36a256-1a8f-46fe-927a-b454edbe5676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa21a8ce-25e3-4660-882c-23194594a657","name":"fa21a8ce-25e3-4660-882c-23194594a657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f61ff89f-9503-40ee-913a-097280eb3137","name":"f61ff89f-9503-40ee-913a-097280eb3137","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f629c04e-891c-45a9-875c-fc3c820221d8","name":"f629c04e-891c-45a9-875c-fc3c820221d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b36a256-1a8f-46fe-927a-b454edbe5676","name":"1b36a256-1a8f-46fe-927a-b454edbe5676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa21a8ce-25e3-4660-882c-23194594a657","name":"fa21a8ce-25e3-4660-882c-23194594a657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f61ff89f-9503-40ee-913a-097280eb3137","name":"f61ff89f-9503-40ee-913a-097280eb3137","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -48,13 +48,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -102,54 +96,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7003538-a699-4f02-b362-f91da46eb0a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f629c04e-891c-45a9-875c-fc3c820221d8","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ab6dc1f-9ab3-4a92-8089-400b97c96e5d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b36a256-1a8f-46fe-927a-b454edbe5676","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bc7f1ed-5f9f-4390-9845-56c133191e3b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baac790b-075b-4417-8789-39fdacd38ffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8402d7f-6718-45fb-b930-773c521d0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ab6712b-9dbd-4c52-88fd-33f36c07dc71","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a828e63-dae2-4ebe-ab0f-991630962412","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1641eaf-a69a-4419-a527-7b74994854a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a07c98c1-b6f9-4df3-ab1e-6f92c81786b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82a312a8-35ce-409f-b1b9-2fe0d02f973c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc422c9a-fe9b-4a49-a96b-4d773f2526e4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa21a8ce-25e3-4660-882c-23194594a657","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f6f6f8f-713c-4a7d-b44d-86ca9d3b1d45","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a527c0b3-df5a-40a5-8c70-6ef4de2d6500","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f61ff89f-9503-40ee-913a-097280eb3137","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b29ea8f-8c30-484e-9eaa-186bbb796b0f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b986f7b-7e21-48e5-9a1d-1bf9d81bf873","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39956189-0400-4262-b523-9c96d90ba130","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7003538-a699-4f02-b362-f91da46eb0a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f629c04e-891c-45a9-875c-fc3c820221d8","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ab6dc1f-9ab3-4a92-8089-400b97c96e5d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b36a256-1a8f-46fe-927a-b454edbe5676","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bc7f1ed-5f9f-4390-9845-56c133191e3b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baac790b-075b-4417-8789-39fdacd38ffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8402d7f-6718-45fb-b930-773c521d0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ab6712b-9dbd-4c52-88fd-33f36c07dc71","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a828e63-dae2-4ebe-ab0f-991630962412","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1641eaf-a69a-4419-a527-7b74994854a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a07c98c1-b6f9-4df3-ab1e-6f92c81786b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82a312a8-35ce-409f-b1b9-2fe0d02f973c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc422c9a-fe9b-4a49-a96b-4d773f2526e4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa21a8ce-25e3-4660-882c-23194594a657","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f6f6f8f-713c-4a7d-b44d-86ca9d3b1d45","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a527c0b3-df5a-40a5-8c70-6ef4de2d6500","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f61ff89f-9503-40ee-913a-097280eb3137","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b29ea8f-8c30-484e-9eaa-186bbb796b0f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b986f7b-7e21-48e5-9a1d-1bf9d81bf873","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39956189-0400-4262-b523-9c96d90ba130","IsCreationKey":false,"Key":15.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_mk3_complex/spr_mk3_complex.yy b/sprites/spr_mk3_complex/spr_mk3_complex.yy index c4d625e5b7..1f1eb012c7 100644 --- a/sprites/spr_mk3_complex/spr_mk3_complex.yy +++ b/sprites/spr_mk3_complex/spr_mk3_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,9 +71,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec45e7d5-2e29-4440-965b-2b5e148ec8a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec45e7d5-2e29-4440-965b-2b5e148ec8a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy index 82830d778b..e7acffe5a7 100644 --- a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy +++ b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_complex_backpack", "bboxMode":0, "bbox_bottom":36, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e7c62a0-7429-45f3-88c0-0aa6dc2ae3a2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e7c62a0-7429-45f3-88c0-0aa6dc2ae3a2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy index 8c7d687e9a..804223e69f 100644 --- a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy +++ b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_forehead_variants", "bboxMode":0, "bbox_bottom":29, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37c11dd3-1414-4c8d-8d71-e00098819009","name":"37c11dd3-1414-4c8d-8d71-e00098819009","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37c11dd3-1414-4c8d-8d71-e00098819009","name":"37c11dd3-1414-4c8d-8d71-e00098819009","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9347642e-46b3-4195-9d03-d2a761f92bc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d57cb6f-4cdd-457e-a37f-9df410e5ea56","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3093b5a7-e27d-48c5-b58b-dc513e7b8e2c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70daa5bd-729f-4641-a567-78e6da5b3720","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8732fa6e-e469-4750-af0f-1e60cd6e2654","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"946cb3e6-0dc3-45d2-8897-5093b94d1de2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37c11dd3-1414-4c8d-8d71-e00098819009","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fb25342-066e-479c-8282-263f7dff3763","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9347642e-46b3-4195-9d03-d2a761f92bc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d57cb6f-4cdd-457e-a37f-9df410e5ea56","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3093b5a7-e27d-48c5-b58b-dc513e7b8e2c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70daa5bd-729f-4641-a567-78e6da5b3720","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8732fa6e-e469-4750-af0f-1e60cd6e2654","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"946cb3e6-0dc3-45d2-8897-5093b94d1de2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37c11dd3-1414-4c8d-8d71-e00098819009","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fb25342-066e-479c-8282-263f7dff3763","IsCreationKey":false,"Key":6.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_mk3_head_variants/spr_mk3_head_variants.yy b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy index 891dd3a5b8..940e013e98 100644 --- a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy +++ b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_head_variants", "bboxMode":0, "bbox_bottom":37, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3815daad-43a5-4bb4-bec9-9760cbddeaff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0eb1a70a-6aba-4101-a2a0-89b4b569a337","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3815daad-43a5-4bb4-bec9-9760cbddeaff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0eb1a70a-6aba-4101-a2a0-89b4b569a337","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_mk3_left_arm/spr_mk3_left_arm.yy b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy index 61bcc45399..b8a251d175 100644 --- a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy +++ b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy b/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy index 1331889720..43eaa91a21 100644 --- a/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy +++ b/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_left_leg_variants", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd674911-3574-4213-b332-57af50579a99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e0625e6-7cca-4fb6-9a2e-a33cabfbe0a2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c70ed6c-7032-4848-8556-ff826065b08e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd674911-3574-4213-b332-57af50579a99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e0625e6-7cca-4fb6-9a2e-a33cabfbe0a2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c70ed6c-7032-4848-8556-ff826065b08e","IsCreationKey":false,"Key":2.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_mk3_left_trim/spr_mk3_left_trim.yy b/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy index 66536409a8..0645edda45 100644 --- a/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy +++ b/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_left_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d01d6cf-461d-456e-9332-abf118aaaad7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"319c9c02-ebc4-458c-aa5f-b95f2e64fb44","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1ca8578-2345-4f88-9c55-fdf39bfa917a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81050e27-d210-414e-a369-43b4bc7e99af","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d01d6cf-461d-456e-9332-abf118aaaad7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"319c9c02-ebc4-458c-aa5f-b95f2e64fb44","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1ca8578-2345-4f88-9c55-fdf39bfa917a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81050e27-d210-414e-a369-43b4bc7e99af","IsCreationKey":false,"Key":3.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_mk3_mouth/spr_mk3_mouth.yy b/sprites/spr_mk3_mouth/spr_mk3_mouth.yy index 9b93205259..1bc783cc0a 100644 --- a/sprites/spr_mk3_mouth/spr_mk3_mouth.yy +++ b/sprites/spr_mk3_mouth/spr_mk3_mouth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_mouth", "bboxMode":0, "bbox_bottom":50, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,15 +71,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abb8135b-2d67-4017-b74b-93be2b04f4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40eb5fb9-2992-48c1-b2be-29e23cb4bd0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c99907f3-988a-4e03-8c62-43e4520f2e1d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abb8135b-2d67-4017-b74b-93be2b04f4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40eb5fb9-2992-48c1-b2be-29e23cb4bd0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c99907f3-988a-4e03-8c62-43e4520f2e1d","IsCreationKey":false,"Key":2.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_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy b/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy index 0415cde918..def5a6f178 100644 --- a/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy +++ b/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_mouth_flame_cult", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dafbefe7-5ef7-4c6e-bf41-74e0fc0edf26","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dafbefe7-5ef7-4c6e-bf41-74e0fc0edf26","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy b/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy index 156afba267..9485c29772 100644 --- a/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy +++ b/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_mouth_prussian", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"254cb1c4-26aa-429c-8253-fafc878744e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"254cb1c4-26aa-429c-8253-fafc878744e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy b/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy index a7c433a8a7..8ac587699c 100644 --- a/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy +++ b/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb663579-f17d-4461-829e-36f5f9b87989","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb663579-f17d-4461-829e-36f5f9b87989","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy b/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy index 240933b5a8..fe7f865ec2 100644 --- a/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy +++ b/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_right_leg_variants", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb1bc77b-386e-404a-84af-e5941220ad0c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d485ac5-c0cd-4580-a56b-a873feaf2900","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ee4fbca-f448-4cd3-b4a5-259657157ff5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb1bc77b-386e-404a-84af-e5941220ad0c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d485ac5-c0cd-4580-a56b-a873feaf2900","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ee4fbca-f448-4cd3-b4a5-259657157ff5","IsCreationKey":false,"Key":2.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_mk3_right_trim/spr_mk3_right_trim.yy b/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy index e82663c276..bd189343d2 100644 --- a/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy +++ b/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"42c93ebb-31a5-4529-add7-5c4ada48da57","name":"42c93ebb-31a5-4529-add7-5c4ada48da57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8f2b623-db31-44d0-a510-ff212dd3f269","name":"e8f2b623-db31-44d0-a510-ff212dd3f269","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3046bd80-d3fb-4878-b070-c42a135928aa","name":"3046bd80-d3fb-4878-b070-c42a135928aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42c93ebb-31a5-4529-add7-5c4ada48da57","name":"42c93ebb-31a5-4529-add7-5c4ada48da57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8f2b623-db31-44d0-a510-ff212dd3f269","name":"e8f2b623-db31-44d0-a510-ff212dd3f269","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3046bd80-d3fb-4878-b070-c42a135928aa","name":"3046bd80-d3fb-4878-b070-c42a135928aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c93ebb-31a5-4529-add7-5c4ada48da57","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a1a6de8-928a-4b5a-9b92-1eaa80fc4171","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8f2b623-db31-44d0-a510-ff212dd3f269","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7301961-da67-453e-a396-070fac8dfbe4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3046bd80-d3fb-4878-b070-c42a135928aa","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f71392e9-e16c-4d5b-836f-daa455a41de5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4ab6e5b-4e60-4125-ad0e-f195ed660e71","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c93ebb-31a5-4529-add7-5c4ada48da57","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a1a6de8-928a-4b5a-9b92-1eaa80fc4171","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8f2b623-db31-44d0-a510-ff212dd3f269","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7301961-da67-453e-a396-070fac8dfbe4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3046bd80-d3fb-4878-b070-c42a135928aa","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f71392e9-e16c-4d5b-836f-daa455a41de5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4ab6e5b-4e60-4125-ad0e-f195ed660e71","IsCreationKey":false,"Key":3.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_mk3_runic_chest/spr_mk3_runic_chest.yy b/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy index 0c29273b65..7ada504a64 100644 --- a/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy +++ b/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_runic_chest", "bboxMode":0, "bbox_bottom":96, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,9 +71,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a61bcf7-973c-45fd-8623-cd2e2aa417c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a61bcf7-973c-45fd-8623-cd2e2aa417c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy b/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy index 49f2fb8653..e9ec6f688f 100644 --- a/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy +++ b/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_chest_fastenings", "bboxMode":0, "bbox_bottom":86, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40c77a23-0d91-41c3-865e-885ca7f6df03","name":"40c77a23-0d91-41c3-865e-885ca7f6df03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f99c987b-7a91-4dc7-b79f-d53299f70551","name":"f99c987b-7a91-4dc7-b79f-d53299f70551","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0de91ff0-be17-4fd1-9a82-01f42330261b","name":"0de91ff0-be17-4fd1-9a82-01f42330261b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40c77a23-0d91-41c3-865e-885ca7f6df03","name":"40c77a23-0d91-41c3-865e-885ca7f6df03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f99c987b-7a91-4dc7-b79f-d53299f70551","name":"f99c987b-7a91-4dc7-b79f-d53299f70551","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0de91ff0-be17-4fd1-9a82-01f42330261b","name":"0de91ff0-be17-4fd1-9a82-01f42330261b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40c77a23-0d91-41c3-865e-885ca7f6df03","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a66f3f85-cd83-4651-aa90-f25bca60da0e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02831958-f299-4f70-8116-3a658fe588dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99c987b-7a91-4dc7-b79f-d53299f70551","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fecadf85-a338-45ac-b302-0176bfbe27c0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0de91ff0-be17-4fd1-9a82-01f42330261b","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2871da1-9fb5-4779-b942-07e5460892a5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40c77a23-0d91-41c3-865e-885ca7f6df03","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a66f3f85-cd83-4651-aa90-f25bca60da0e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02831958-f299-4f70-8116-3a658fe588dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99c987b-7a91-4dc7-b79f-d53299f70551","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fecadf85-a338-45ac-b302-0176bfbe27c0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0de91ff0-be17-4fd1-9a82-01f42330261b","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2871da1-9fb5-4779-b942-07e5460892a5","IsCreationKey":false,"Key":3.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_mk4_chest_variants/spr_mk4_chest_variants.yy b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy index 87cc444d39..21ec0fa38b 100644 --- a/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy +++ b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_chest_variants", "bboxMode":0, "bbox_bottom":209, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d25b0580-a514-4932-b9cf-76ae2aa29221","name":"d25b0580-a514-4932-b9cf-76ae2aa29221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d25b0580-a514-4932-b9cf-76ae2aa29221","name":"d25b0580-a514-4932-b9cf-76ae2aa29221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2036e56-f8b6-467a-aef9-1d6ca203ba9e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d25b0580-a514-4932-b9cf-76ae2aa29221","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d411f29-8d00-43d6-8673-d7432df20309","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2036e56-f8b6-467a-aef9-1d6ca203ba9e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d25b0580-a514-4932-b9cf-76ae2aa29221","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d411f29-8d00-43d6-8673-d7432df20309","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_mk4_colors/spr_mk4_colors.yy b/sprites/spr_mk4_colors/spr_mk4_colors.yy index ceb0ce685c..345737a2a3 100644 --- a/sprites/spr_mk4_colors/spr_mk4_colors.yy +++ b/sprites/spr_mk4_colors/spr_mk4_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"287f6d48-afc4-4934-99e3-6a793feaea68","name":"287f6d48-afc4-4934-99e3-6a793feaea68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3059d51d-11a6-4332-933f-f0d0fb58181e","name":"3059d51d-11a6-4332-933f-f0d0fb58181e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0e01d65-f432-411b-b673-239c5bfaf45b","name":"e0e01d65-f432-411b-b673-239c5bfaf45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4c8d673e-7d42-4987-b107-684a037cf5b6","name":"4c8d673e-7d42-4987-b107-684a037cf5b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"287f6d48-afc4-4934-99e3-6a793feaea68","name":"287f6d48-afc4-4934-99e3-6a793feaea68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3059d51d-11a6-4332-933f-f0d0fb58181e","name":"3059d51d-11a6-4332-933f-f0d0fb58181e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0e01d65-f432-411b-b673-239c5bfaf45b","name":"e0e01d65-f432-411b-b673-239c5bfaf45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c8d673e-7d42-4987-b107-684a037cf5b6","name":"4c8d673e-7d42-4987-b107-684a037cf5b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,54 +83,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7aa7ae2b-508c-4b78-8b26-237fb4b31279","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf163fbb-78e4-4e41-b583-c67bc8097d1e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48f0d3d6-843e-48e9-b1d3-421527bee669","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd09e29d-514b-4234-8e70-7413f027cb01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"287f6d48-afc4-4934-99e3-6a793feaea68","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f613c2c-fd00-4733-a64b-d4ca2796b1b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9539d417-e1c9-4696-8cfe-4e498ec1ee40","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3059d51d-11a6-4332-933f-f0d0fb58181e","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fecb5fb1-8817-4d28-beb0-77282063505b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f412f3c5-96fc-42e6-8f43-b2380baf6041","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c16c7cb7-ce94-4501-8c83-cd879c4539f4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be6d5e73-096b-420a-a3d8-ce62602f57b3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e3d0df4-9ad4-4629-9392-f873a64462a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6d05ec9-749e-456c-84e7-a1ce56d2b2dd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48ea3a9e-cee6-444d-b1da-6a83aab91101","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e01d65-f432-411b-b673-239c5bfaf45b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"626bd8a0-7388-4c79-9cfc-6815424a3f97","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c8d673e-7d42-4987-b107-684a037cf5b6","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"421b2d1c-319b-47d8-b080-e9e0b349b065","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"936e4486-47a9-4643-b27b-70c3ab2f2e00","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7aa7ae2b-508c-4b78-8b26-237fb4b31279","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf163fbb-78e4-4e41-b583-c67bc8097d1e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48f0d3d6-843e-48e9-b1d3-421527bee669","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd09e29d-514b-4234-8e70-7413f027cb01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"287f6d48-afc4-4934-99e3-6a793feaea68","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f613c2c-fd00-4733-a64b-d4ca2796b1b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9539d417-e1c9-4696-8cfe-4e498ec1ee40","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3059d51d-11a6-4332-933f-f0d0fb58181e","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fecb5fb1-8817-4d28-beb0-77282063505b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f412f3c5-96fc-42e6-8f43-b2380baf6041","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c16c7cb7-ce94-4501-8c83-cd879c4539f4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be6d5e73-096b-420a-a3d8-ce62602f57b3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e3d0df4-9ad4-4629-9392-f873a64462a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6d05ec9-749e-456c-84e7-a1ce56d2b2dd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48ea3a9e-cee6-444d-b1da-6a83aab91101","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e01d65-f432-411b-b673-239c5bfaf45b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"626bd8a0-7388-4c79-9cfc-6815424a3f97","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c8d673e-7d42-4987-b107-684a037cf5b6","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"421b2d1c-319b-47d8-b080-e9e0b349b065","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"936e4486-47a9-4643-b27b-70c3ab2f2e00","IsCreationKey":false,"Key":15.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_mk4_complex/spr_mk4_complex.yy b/sprites/spr_mk4_complex/spr_mk4_complex.yy index 4d0c73e8db..174287f26c 100644 --- a/sprites/spr_mk4_complex/spr_mk4_complex.yy +++ b/sprites/spr_mk4_complex/spr_mk4_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy index acce101b8e..78ce856cc7 100644 --- a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy +++ b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_complex_backpack", "bboxMode":0, "bbox_bottom":35, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a43406eb-6236-415d-9902-e818a2185ba9","name":"a43406eb-6236-415d-9902-e818a2185ba9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a43406eb-6236-415d-9902-e818a2185ba9","name":"a43406eb-6236-415d-9902-e818a2185ba9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a43406eb-6236-415d-9902-e818a2185ba9","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90dd7544-906e-477c-a0a3-0c94bc9aee40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a43406eb-6236-415d-9902-e818a2185ba9","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90dd7544-906e-477c-a0a3-0c94bc9aee40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy b/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy index 47b9a44e7d..bb56afac64 100644 --- a/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy +++ b/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_head_variants", "bboxMode":0, "bbox_bottom":45, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b9e1ad2f-89b1-4000-9111-d63df121427d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9e1ad2f-89b1-4000-9111-d63df121427d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy b/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy index edd67fd904..483b6c7c74 100644 --- a/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy +++ b/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d132fab6-39de-405e-b127-9f335cf85536","name":"d132fab6-39de-405e-b127-9f335cf85536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d132fab6-39de-405e-b127-9f335cf85536","name":"d132fab6-39de-405e-b127-9f335cf85536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d132fab6-39de-405e-b127-9f335cf85536","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0853379d-62d4-401d-bdeb-8b64cac8fbfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d132fab6-39de-405e-b127-9f335cf85536","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0853379d-62d4-401d-bdeb-8b64cac8fbfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy b/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy index 6ea8cc3a67..8ef77826c5 100644 --- a/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy +++ b/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_left_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d128442-bf77-4769-8d75-a63dd3942ff8","name":"7d128442-bf77-4769-8d75-a63dd3942ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f4435dc-8ba2-40a6-a643-d38318383c10","name":"0f4435dc-8ba2-40a6-a643-d38318383c10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d128442-bf77-4769-8d75-a63dd3942ff8","name":"7d128442-bf77-4769-8d75-a63dd3942ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f4435dc-8ba2-40a6-a643-d38318383c10","name":"0f4435dc-8ba2-40a6-a643-d38318383c10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baf60be2-46a1-4588-a03b-762baa867599","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d128442-bf77-4769-8d75-a63dd3942ff8","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e63d2dd-b459-434d-93fd-4607df6dd69a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f4435dc-8ba2-40a6-a643-d38318383c10","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8dcb92ec-fd8d-4cc6-9285-dbb186051c10","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b38845bb-5261-4b58-b135-a5718fb726f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8bd7e56-9dc2-4b90-a286-403f37e35f36","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baf60be2-46a1-4588-a03b-762baa867599","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d128442-bf77-4769-8d75-a63dd3942ff8","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e63d2dd-b459-434d-93fd-4607df6dd69a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f4435dc-8ba2-40a6-a643-d38318383c10","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8dcb92ec-fd8d-4cc6-9285-dbb186051c10","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b38845bb-5261-4b58-b135-a5718fb726f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8bd7e56-9dc2-4b90-a286-403f37e35f36","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy index 17020ec82d..3e3acecc96 100644 --- a/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy +++ b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_leg_variants", "bboxMode":0, "bbox_bottom":193, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f5551e24-09d8-40c0-888e-0e5818c0c403","name":"f5551e24-09d8-40c0-888e-0e5818c0c403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79b13155-0f85-4e11-9fef-324bf6e87d15","name":"79b13155-0f85-4e11-9fef-324bf6e87d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5551e24-09d8-40c0-888e-0e5818c0c403","name":"f5551e24-09d8-40c0-888e-0e5818c0c403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79b13155-0f85-4e11-9fef-324bf6e87d15","name":"79b13155-0f85-4e11-9fef-324bf6e87d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5551e24-09d8-40c0-888e-0e5818c0c403","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0d74eee-2fdc-4c64-89a0-eca5b14b32d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee26bab2-02cc-4e4d-a75a-00c04cf56d3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79b13155-0f85-4e11-9fef-324bf6e87d15","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e5b82f0-b1e4-4462-9747-2831172b74a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01846774-a3dd-4995-9497-fbee372af500","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5551e24-09d8-40c0-888e-0e5818c0c403","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0d74eee-2fdc-4c64-89a0-eca5b14b32d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee26bab2-02cc-4e4d-a75a-00c04cf56d3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79b13155-0f85-4e11-9fef-324bf6e87d15","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e5b82f0-b1e4-4462-9747-2831172b74a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01846774-a3dd-4995-9497-fbee372af500","IsCreationKey":false,"Key":3.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_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy b/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy index 6c4ad5dd18..cd2bd79456 100644 --- a/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy +++ b/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_mongol_chest_variants", "bboxMode":0, "bbox_bottom":79, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2132b90-0c80-46bb-88ef-de7faad10ae5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2132b90-0c80-46bb-88ef-de7faad10ae5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy b/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy index 2d2b81f60d..a6fc9e6f7f 100644 --- a/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy +++ b/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_mongol_hat", "bboxMode":0, "bbox_bottom":29, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"776f298a-8428-4cd5-8716-592b704fce94","name":"776f298a-8428-4cd5-8716-592b704fce94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"776f298a-8428-4cd5-8716-592b704fce94","name":"776f298a-8428-4cd5-8716-592b704fce94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"776f298a-8428-4cd5-8716-592b704fce94","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83c1deea-feff-46bd-b99b-36c3d05c4bbb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"776f298a-8428-4cd5-8716-592b704fce94","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83c1deea-feff-46bd-b99b-36c3d05c4bbb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy b/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy index 5f36bc2308..8a776f1f85 100644 --- a/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy +++ b/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_mouth_variants", "bboxMode":0, "bbox_bottom":43, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cb87107-55af-49a2-967f-fce654e6d0b2","name":"7cb87107-55af-49a2-967f-fce654e6d0b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f57e6879-ac68-40d0-900d-57fff9a35503","name":"f57e6879-ac68-40d0-900d-57fff9a35503","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cb87107-55af-49a2-967f-fce654e6d0b2","name":"7cb87107-55af-49a2-967f-fce654e6d0b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f57e6879-ac68-40d0-900d-57fff9a35503","name":"f57e6879-ac68-40d0-900d-57fff9a35503","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdd2c8c8-f92b-409f-b185-8b6f7db1b8aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb87107-55af-49a2-967f-fce654e6d0b2","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc1900e1-e6ba-42d6-8d89-f59b501502a7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f57e6879-ac68-40d0-900d-57fff9a35503","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c312846-f775-44d4-9710-5e49bda55667","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b40c0e7a-d4dc-4bf6-91f0-72ce317e597d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b4f09f8-23a8-455e-a154-20561e393423","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdd2c8c8-f92b-409f-b185-8b6f7db1b8aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb87107-55af-49a2-967f-fce654e6d0b2","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc1900e1-e6ba-42d6-8d89-f59b501502a7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f57e6879-ac68-40d0-900d-57fff9a35503","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c312846-f775-44d4-9710-5e49bda55667","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b40c0e7a-d4dc-4bf6-91f0-72ce317e597d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b4f09f8-23a8-455e-a154-20561e393423","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy b/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy index 08acf87610..d015ece017 100644 --- a/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy +++ b/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"691da313-acdf-4e3b-8a61-65b5199f6f21","name":"691da313-acdf-4e3b-8a61-65b5199f6f21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"691da313-acdf-4e3b-8a61-65b5199f6f21","name":"691da313-acdf-4e3b-8a61-65b5199f6f21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"691da313-acdf-4e3b-8a61-65b5199f6f21","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6246d1fe-0f1d-44a4-876f-79b2e85b226a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"691da313-acdf-4e3b-8a61-65b5199f6f21","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6246d1fe-0f1d-44a4-876f-79b2e85b226a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy b/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy index cea29f3409..09f51c6865 100644 --- a/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy +++ b/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f939d89-30fc-4492-a4fe-b12fa412f437","name":"9f939d89-30fc-4492-a4fe-b12fa412f437","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f939d89-30fc-4492-a4fe-b12fa412f437","name":"9f939d89-30fc-4492-a4fe-b12fa412f437","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f939d89-30fc-4492-a4fe-b12fa412f437","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ad3f6b6-0d9e-474b-accc-e820942fdad5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d3ed260-00ee-4573-9de6-a47b932a55aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce299549-2c09-47b2-b44d-2306b8c0c2b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54242b24-25bc-4088-a2c4-fdf65553d805","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a90700c3-30df-47fe-adcd-a32ef97a91b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f939d89-30fc-4492-a4fe-b12fa412f437","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ad3f6b6-0d9e-474b-accc-e820942fdad5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d3ed260-00ee-4573-9de6-a47b932a55aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce299549-2c09-47b2-b44d-2306b8c0c2b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54242b24-25bc-4088-a2c4-fdf65553d805","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a90700c3-30df-47fe-adcd-a32ef97a91b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy b/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy index d748da46c8..7065380fff 100644 --- a/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy +++ b/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_chest_variants", "bboxMode":0, "bbox_bottom":97, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bafabbd7-db90-49f5-9bc8-8b338ebf2ca3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bafabbd7-db90-49f5-9bc8-8b338ebf2ca3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_colors/spr_mk5_colors.yy b/sprites/spr_mk5_colors/spr_mk5_colors.yy index 152cccd4cc..87ae564ee9 100644 --- a/sprites/spr_mk5_colors/spr_mk5_colors.yy +++ b/sprites/spr_mk5_colors/spr_mk5_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03b9eef3-bac8-4c92-b391-60154466ea63","name":"03b9eef3-bac8-4c92-b391-60154466ea63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"525390cd-8f5d-4f17-b373-e7523c71e756","name":"525390cd-8f5d-4f17-b373-e7523c71e756","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"824057dd-57d8-4988-81ad-7843670e525f","name":"824057dd-57d8-4988-81ad-7843670e525f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"04056724-6e77-47f9-bc78-04245136983a","name":"04056724-6e77-47f9-bc78-04245136983a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4739aff-a6c6-479d-8022-5da8edd7feac","name":"a4739aff-a6c6-479d-8022-5da8edd7feac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0538d1c9-8b5c-467f-8881-3971b138dce1","name":"0538d1c9-8b5c-467f-8881-3971b138dce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03b9eef3-bac8-4c92-b391-60154466ea63","name":"03b9eef3-bac8-4c92-b391-60154466ea63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"525390cd-8f5d-4f17-b373-e7523c71e756","name":"525390cd-8f5d-4f17-b373-e7523c71e756","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"824057dd-57d8-4988-81ad-7843670e525f","name":"824057dd-57d8-4988-81ad-7843670e525f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04056724-6e77-47f9-bc78-04245136983a","name":"04056724-6e77-47f9-bc78-04245136983a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4739aff-a6c6-479d-8022-5da8edd7feac","name":"a4739aff-a6c6-479d-8022-5da8edd7feac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0538d1c9-8b5c-467f-8881-3971b138dce1","name":"0538d1c9-8b5c-467f-8881-3971b138dce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f79352-9e1d-41b5-971d-53bc7d180dcf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41ebc135-a734-483b-9fdb-036963d1fd78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"278ee5e0-fcf7-4231-a797-cc9f649c46fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03b9eef3-bac8-4c92-b391-60154466ea63","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2698944f-a778-4862-af5e-d1e965a055e9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b4ad9b4-ccbf-40cf-9814-6c5848584e0e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"525390cd-8f5d-4f17-b373-e7523c71e756","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4131ca8-4631-4aff-ba48-ffc95e14da43","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"824057dd-57d8-4988-81ad-7843670e525f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e54b2e68-86b8-42df-83a2-5667027c2582","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0bb39ab-c8b1-4931-b5b0-38d0c7e1ca9d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04056724-6e77-47f9-bc78-04245136983a","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6d661e5-6c13-4083-b139-1984b5b15593","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4739aff-a6c6-479d-8022-5da8edd7feac","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c0f3071-514e-4c64-a1a3-c1ff0538208c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f7c6f1c-cbc1-4d9d-ab0c-3265f63aeb87","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02611d68-04eb-426c-9235-2793882b1177","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0340420d-ca3d-4e8f-a3d3-d39a86fc1cad","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0538d1c9-8b5c-467f-8881-3971b138dce1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ebf624a-29e0-43d1-957b-5ef6da0fd47e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34f79352-9e1d-41b5-971d-53bc7d180dcf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41ebc135-a734-483b-9fdb-036963d1fd78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"278ee5e0-fcf7-4231-a797-cc9f649c46fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03b9eef3-bac8-4c92-b391-60154466ea63","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2698944f-a778-4862-af5e-d1e965a055e9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b4ad9b4-ccbf-40cf-9814-6c5848584e0e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"525390cd-8f5d-4f17-b373-e7523c71e756","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4131ca8-4631-4aff-ba48-ffc95e14da43","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"824057dd-57d8-4988-81ad-7843670e525f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e54b2e68-86b8-42df-83a2-5667027c2582","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0bb39ab-c8b1-4931-b5b0-38d0c7e1ca9d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04056724-6e77-47f9-bc78-04245136983a","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6d661e5-6c13-4083-b139-1984b5b15593","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4739aff-a6c6-479d-8022-5da8edd7feac","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c0f3071-514e-4c64-a1a3-c1ff0538208c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f7c6f1c-cbc1-4d9d-ab0c-3265f63aeb87","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02611d68-04eb-426c-9235-2793882b1177","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0340420d-ca3d-4e8f-a3d3-d39a86fc1cad","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0538d1c9-8b5c-467f-8881-3971b138dce1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ebf624a-29e0-43d1-957b-5ef6da0fd47e","IsCreationKey":false,"Key":13.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_mk5_complex/spr_mk5_complex.yy b/sprites/spr_mk5_complex/spr_mk5_complex.yy index 4b6e44d95c..98fc288dd9 100644 --- a/sprites/spr_mk5_complex/spr_mk5_complex.yy +++ b/sprites/spr_mk5_complex/spr_mk5_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"efd749b6-b89e-48c1-99df-bde59481c13f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"efd749b6-b89e-48c1-99df-bde59481c13f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy index 26b419ba0d..2218324c12 100644 --- a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy +++ b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_complex_backpack", "bboxMode":0, "bbox_bottom":35, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d00609fa-9d93-4657-a437-e937e9cd46e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d00609fa-9d93-4657-a437-e937e9cd46e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy index 62a3da6288..0bfe7a9246 100644 --- a/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy +++ b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_head_variants", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6ae9cb2a-6253-4261-9f21-88688afd2163","name":"6ae9cb2a-6253-4261-9f21-88688afd2163","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ae9cb2a-6253-4261-9f21-88688afd2163","name":"6ae9cb2a-6253-4261-9f21-88688afd2163","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ae9cb2a-6253-4261-9f21-88688afd2163","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a73431-ca07-41d9-b12f-d718a5984fc6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ae9cb2a-6253-4261-9f21-88688afd2163","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a73431-ca07-41d9-b12f-d718a5984fc6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy b/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy index 975616b124..3933b3de1d 100644 --- a/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy +++ b/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b03de0e7-42de-4112-9568-659441788221","name":"b03de0e7-42de-4112-9568-659441788221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b03de0e7-42de-4112-9568-659441788221","name":"b03de0e7-42de-4112-9568-659441788221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b03de0e7-42de-4112-9568-659441788221","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cabe8ec7-e204-4d1a-a7bf-1450852659fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b03de0e7-42de-4112-9568-659441788221","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cabe8ec7-e204-4d1a-a7bf-1450852659fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy b/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy index c236091b21..278a6af5a0 100644 --- a/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy +++ b/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"667e4008-fe43-4bbe-b40b-8411d9921596","name":"667e4008-fe43-4bbe-b40b-8411d9921596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"667e4008-fe43-4bbe-b40b-8411d9921596","name":"667e4008-fe43-4bbe-b40b-8411d9921596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"667e4008-fe43-4bbe-b40b-8411d9921596","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"993de37b-fcef-4d76-92c0-6e447ba018c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"667e4008-fe43-4bbe-b40b-8411d9921596","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"993de37b-fcef-4d76-92c0-6e447ba018c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy b/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy index 34fa4aafe5..cc2f42a13d 100644 --- a/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy +++ b/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_samuri_faceplate", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5333554c-9d16-493b-8907-d467605b3c7c","name":"5333554c-9d16-493b-8907-d467605b3c7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5333554c-9d16-493b-8907-d467605b3c7c","name":"5333554c-9d16-493b-8907-d467605b3c7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5333554c-9d16-493b-8907-d467605b3c7c","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6268e815-40ba-4a86-99ba-0009c1cbbc9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5333554c-9d16-493b-8907-d467605b3c7c","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6268e815-40ba-4a86-99ba-0009c1cbbc9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_complex/spr_mk6_complex.yy b/sprites/spr_mk6_complex/spr_mk6_complex.yy index d637a5303e..881148f0e6 100644 --- a/sprites/spr_mk6_complex/spr_mk6_complex.yy +++ b/sprites/spr_mk6_complex/spr_mk6_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23021aeb-0c67-4243-bf92-73fe45924fe0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23021aeb-0c67-4243-bf92-73fe45924fe0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy b/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy index b903b5661e..0d08c9ab78 100644 --- a/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy +++ b/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_complex_backpack", "bboxMode":0, "bbox_bottom":38, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"557d0497-d213-4f3c-9acb-a261ca311b93","name":"557d0497-d213-4f3c-9acb-a261ca311b93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"557d0497-d213-4f3c-9acb-a261ca311b93","name":"557d0497-d213-4f3c-9acb-a261ca311b93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"557d0497-d213-4f3c-9acb-a261ca311b93","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a8ae85dd-0643-4118-a10b-348ff5c192da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"557d0497-d213-4f3c-9acb-a261ca311b93","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a8ae85dd-0643-4118-a10b-348ff5c192da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy b/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy index fb93663d38..8ae305162e 100644 --- a/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy +++ b/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_cthonian_heads", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","path":"sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d75e3f1-ccde-413d-ba85-55cf7f715d46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","path":"sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d75e3f1-ccde-413d-ba85-55cf7f715d46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy b/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy index c4b6608c40..5600da5a74 100644 --- a/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy +++ b/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_forehead_knightly", "bboxMode":0, "bbox_bottom":29, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"990daad4-708f-4aff-be58-94b415e06c63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70d60aec-8edb-4110-af4b-e8f926007ab2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95e20c38-53de-470d-9550-f0e9435d416a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"990daad4-708f-4aff-be58-94b415e06c63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70d60aec-8edb-4110-af4b-e8f926007ab2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95e20c38-53de-470d-9550-f0e9435d416a","IsCreationKey":false,"Key":2.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_mk6_head_variants/spr_mk6_head_variants.yy b/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy index 74d45fa7aa..7f8fc9e724 100644 --- a/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy +++ b/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_head_variants", "bboxMode":0, "bbox_bottom":46, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83fc5467-64c1-49f9-8b39-0522440d9284","name":"83fc5467-64c1-49f9-8b39-0522440d9284","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83fc5467-64c1-49f9-8b39-0522440d9284","name":"83fc5467-64c1-49f9-8b39-0522440d9284","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c6fa85d-e91b-4424-a5a9-457f82bdc5b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fc5467-64c1-49f9-8b39-0522440d9284","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fdbe958-7c98-4ca5-bc2d-75debc7c1e5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5fb38721-2924-47bc-a9c0-aa2137ffc2d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c6fa85d-e91b-4424-a5a9-457f82bdc5b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fc5467-64c1-49f9-8b39-0522440d9284","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fdbe958-7c98-4ca5-bc2d-75debc7c1e5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5fb38721-2924-47bc-a9c0-aa2137ffc2d1","IsCreationKey":false,"Key":2.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_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy b/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy index 034eb566fd..9012ac6008 100644 --- a/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy +++ b/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_knightly_mouth_variants", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed8f7823-887b-4797-b2fc-2c5bebf5c720","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed8f7823-887b-4797-b2fc-2c5bebf5c720","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy b/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy index 20d965e7e7..4215ef0194 100644 --- a/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy +++ b/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22cfde6e-f8bd-4528-8635-78300f040903","name":"22cfde6e-f8bd-4528-8635-78300f040903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22cfde6e-f8bd-4528-8635-78300f040903","name":"22cfde6e-f8bd-4528-8635-78300f040903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22cfde6e-f8bd-4528-8635-78300f040903","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a261d08-29c4-4b92-b017-d0cd9ed8f1ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22cfde6e-f8bd-4528-8635-78300f040903","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a261d08-29c4-4b92-b017-d0cd9ed8f1ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy b/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy index be40e0616d..eee19efc32 100644 --- a/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy +++ b/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_mongol_chest_variants", "bboxMode":0, "bbox_bottom":77, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"be51056f-3c34-44c2-865d-3cb121432582","name":"be51056f-3c34-44c2-865d-3cb121432582","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be51056f-3c34-44c2-865d-3cb121432582","name":"be51056f-3c34-44c2-865d-3cb121432582","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be51056f-3c34-44c2-865d-3cb121432582","path":"sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b8a0cec-2320-4e14-9783-f4e8bf0f87d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be51056f-3c34-44c2-865d-3cb121432582","path":"sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b8a0cec-2320-4e14-9783-f4e8bf0f87d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy b/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy index 26b2f4dae5..4472ecb273 100644 --- a/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy +++ b/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_mouth_prussian", "bboxMode":0, "bbox_bottom":45, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8571ae2-19d0-4093-ae0a-e5f864f1c8b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d33d213-2125-4792-bea1-65c540c83851","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6423fa90-8cbf-47a6-ad5e-e020ea6ae916","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8571ae2-19d0-4093-ae0a-e5f864f1c8b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d33d213-2125-4792-bea1-65c540c83851","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6423fa90-8cbf-47a6-ad5e-e020ea6ae916","IsCreationKey":false,"Key":2.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_mk6_mouth_variants/spr_mk6_mouth_variants.yy b/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy index 396e34cb92..ca8a7036fe 100644 --- a/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy +++ b/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_mouth_variants", "bboxMode":0, "bbox_bottom":41, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"79e7c2cf-678c-4a6a-863f-a7530e271840","name":"79e7c2cf-678c-4a6a-863f-a7530e271840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15b22a94-9604-4054-869e-a78662b8ec58","name":"15b22a94-9604-4054-869e-a78662b8ec58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0baf035-398a-47b0-91c9-fd825a890c94","name":"e0baf035-398a-47b0-91c9-fd825a890c94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79e7c2cf-678c-4a6a-863f-a7530e271840","name":"79e7c2cf-678c-4a6a-863f-a7530e271840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15b22a94-9604-4054-869e-a78662b8ec58","name":"15b22a94-9604-4054-869e-a78662b8ec58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0baf035-398a-47b0-91c9-fd825a890c94","name":"e0baf035-398a-47b0-91c9-fd825a890c94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79e7c2cf-678c-4a6a-863f-a7530e271840","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87a6e7ac-eb2f-4c87-9af3-b2d14c030606","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b22a94-9604-4054-869e-a78662b8ec58","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af62b5cb-8786-452d-b03b-ed40c3dc6b0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0baf035-398a-47b0-91c9-fd825a890c94","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93544ea3-4ac1-4ea3-90a7-1c5f1f9626b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79e7c2cf-678c-4a6a-863f-a7530e271840","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87a6e7ac-eb2f-4c87-9af3-b2d14c030606","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b22a94-9604-4054-869e-a78662b8ec58","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af62b5cb-8786-452d-b03b-ed40c3dc6b0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0baf035-398a-47b0-91c9-fd825a890c94","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93544ea3-4ac1-4ea3-90a7-1c5f1f9626b4","IsCreationKey":false,"Key":2.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_mk6_right_arm/spr_mk6_right_arm.yy b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy index b3a8788f58..cc446affb7 100644 --- a/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy +++ b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fea9cd1-fb34-40d9-a036-61a42fecb51b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fea9cd1-fb34-40d9-a036-61a42fecb51b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy b/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy index a8c9b88ae6..dbf734430f 100644 --- a/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy +++ b/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_chest_ultra", "bboxMode":0, "bbox_bottom":75, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41ee0869-22a0-48b8-a427-0b83c48f44e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fe645e7-d233-453e-94b8-ad1e403f67f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e528881-8989-4611-9af3-d1fbfb6e801f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41ee0869-22a0-48b8-a427-0b83c48f44e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7fe645e7-d233-453e-94b8-ad1e403f67f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e528881-8989-4611-9af3-d1fbfb6e801f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy index 3894b2ac0e..3ec8102d72 100644 --- a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy +++ b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_chest_variants", "bboxMode":0, "bbox_bottom":73, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a5283cf-1b94-4acb-8e35-054b1b7e9647","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3565a559-326d-41c5-a322-0539e7fd4db8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dff23688-54a3-4f58-9748-753ea26db022","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"515d67b4-d543-46e6-8846-2c782789fdc0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"efe29eea-b902-49f6-84aa-a2ed325b6df6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a5283cf-1b94-4acb-8e35-054b1b7e9647","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3565a559-326d-41c5-a322-0539e7fd4db8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dff23688-54a3-4f58-9748-753ea26db022","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"515d67b4-d543-46e6-8846-2c782789fdc0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"efe29eea-b902-49f6-84aa-a2ed325b6df6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_colors/spr_mk7_colors.yy b/sprites/spr_mk7_colors/spr_mk7_colors.yy index 4d85774d70..d1cfc8c5da 100644 --- a/sprites/spr_mk7_colors/spr_mk7_colors.yy +++ b/sprites/spr_mk7_colors/spr_mk7_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_colors", "bboxMode":0, "bbox_bottom":281, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"193aff66-5833-47c7-9ed8-759d3357f47e","name":"193aff66-5833-47c7-9ed8-759d3357f47e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"537f38be-267b-411a-b3f5-955b65e5b516","name":"537f38be-267b-411a-b3f5-955b65e5b516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7965302a-4558-4997-bb0a-53070501b346","name":"7965302a-4558-4997-bb0a-53070501b346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"193aff66-5833-47c7-9ed8-759d3357f47e","name":"193aff66-5833-47c7-9ed8-759d3357f47e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"537f38be-267b-411a-b3f5-955b65e5b516","name":"537f38be-267b-411a-b3f5-955b65e5b516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7965302a-4558-4997-bb0a-53070501b346","name":"7965302a-4558-4997-bb0a-53070501b346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,48 +83,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aa55f99-dcd4-44ed-8f22-89b7e6954826","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"193aff66-5833-47c7-9ed8-759d3357f47e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"222812b7-2032-4667-9138-22e4e5ba61e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09beb9c6-b978-4ca7-b22e-a4d4a871745b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37f99b97-a065-4cdc-bd92-2831a8e44efd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba68f83a-7007-4c08-a09e-685074b73eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"537f38be-267b-411a-b3f5-955b65e5b516","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd0c33be-fe95-4d4e-896b-f695b1cad650","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53e5f5b2-541f-4b32-bf2c-d77a0ed44abb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"efd1188b-0578-4324-9a32-b99c428534b7","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c8c2d1a-62ed-4576-9385-317f739f82ab","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c601ed8-4532-44a6-8fba-e1d41872c695","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64231b23-101c-4d8d-8043-efa06138ea9f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7965302a-4558-4997-bb0a-53070501b346","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae643bac-6a55-4baf-9b4f-430da92b70af","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"996fc6d5-2bd6-480b-b65c-77c4af03b378","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f995272-2abe-4060-a7df-e5bc4924ca70","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aa55f99-dcd4-44ed-8f22-89b7e6954826","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"193aff66-5833-47c7-9ed8-759d3357f47e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"222812b7-2032-4667-9138-22e4e5ba61e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09beb9c6-b978-4ca7-b22e-a4d4a871745b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37f99b97-a065-4cdc-bd92-2831a8e44efd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba68f83a-7007-4c08-a09e-685074b73eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"537f38be-267b-411a-b3f5-955b65e5b516","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd0c33be-fe95-4d4e-896b-f695b1cad650","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53e5f5b2-541f-4b32-bf2c-d77a0ed44abb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"efd1188b-0578-4324-9a32-b99c428534b7","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c8c2d1a-62ed-4576-9385-317f739f82ab","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c601ed8-4532-44a6-8fba-e1d41872c695","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64231b23-101c-4d8d-8043-efa06138ea9f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7965302a-4558-4997-bb0a-53070501b346","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae643bac-6a55-4baf-9b4f-430da92b70af","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"996fc6d5-2bd6-480b-b65c-77c4af03b378","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f995272-2abe-4060-a7df-e5bc4924ca70","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex/spr_mk7_complex.yy b/sprites/spr_mk7_complex/spr_mk7_complex.yy index 246cccae3e..7e3c6b6b4a 100644 --- a/sprites/spr_mk7_complex/spr_mk7_complex.yy +++ b/sprites/spr_mk7_complex/spr_mk7_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -89,9 +83,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0920e5f3-c5b3-46e7-9eb6-c9832e0b26b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0920e5f3-c5b3-46e7-9eb6-c9832e0b26b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy index 30308453ad..8b13f59d81 100644 --- a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy +++ b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_backpack", "bboxMode":0, "bbox_bottom":38, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d759779c-a75b-4d79-b22b-410d27d6c6de","name":"d759779c-a75b-4d79-b22b-410d27d6c6de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d759779c-a75b-4d79-b22b-410d27d6c6de","name":"d759779c-a75b-4d79-b22b-410d27d6c6de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d759779c-a75b-4d79-b22b-410d27d6c6de","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfcc2188-1c25-4b83-b365-64f54b46e5f6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d759779c-a75b-4d79-b22b-410d27d6c6de","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfcc2188-1c25-4b83-b365-64f54b46e5f6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy b/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy index bfb4971270..f7e43de452 100644 --- a/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy +++ b/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_belt", "bboxMode":0, "bbox_bottom":104, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"163be470-f687-42e2-b07c-ad2291c828fa","name":"163be470-f687-42e2-b07c-ad2291c828fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"163be470-f687-42e2-b07c-ad2291c828fa","name":"163be470-f687-42e2-b07c-ad2291c828fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9682d976-cfa5-495a-b8f6-5be5477a1db6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9d12c3e7-cfb3-4825-b44b-5227c2503b2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"163be470-f687-42e2-b07c-ad2291c828fa","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cb55ce9-9436-4e2c-9d6b-4a81a672efc0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9682d976-cfa5-495a-b8f6-5be5477a1db6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9d12c3e7-cfb3-4825-b44b-5227c2503b2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"163be470-f687-42e2-b07c-ad2291c828fa","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cb55ce9-9436-4e2c-9d6b-4a81a672efc0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy b/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy index 44a0e66bdd..58d29a6ecb 100644 --- a/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy +++ b/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_crux_belt", "bboxMode":0, "bbox_bottom":107, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8516e89a-68d9-460b-8288-a2e0c1a172f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8516e89a-68d9-460b-8288-a2e0c1a172f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy index a68028e381..faa14d664a 100644 --- a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy +++ b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_knees", "bboxMode":0, "bbox_bottom":164, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -88,9 +82,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy b/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy index 665accc9b4..9ec0e5fa74 100644 --- a/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy +++ b/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_left_pauldron", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy b/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy index b98693c9db..8cb0900ba9 100644 --- a/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy +++ b/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_right_pauldron", "bboxMode":0, "bbox_bottom":81, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fec73702-4742-44a4-a0aa-eb3645361703","name":"fec73702-4742-44a4-a0aa-eb3645361703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fec73702-4742-44a4-a0aa-eb3645361703","name":"fec73702-4742-44a4-a0aa-eb3645361703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -90,12 +84,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec73702-4742-44a4-a0aa-eb3645361703","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5741aa36-ecdb-43df-978f-2fd7d30dd093","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec73702-4742-44a4-a0aa-eb3645361703","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5741aa36-ecdb-43df-978f-2fd7d30dd093","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_mk7_full_colour/spr_mk7_full_colour.yy b/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy index 992b76a445..53eff73a9c 100644 --- a/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy +++ b/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_full_colour", "bboxMode":0, "bbox_bottom":220, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"274a8c7b-ca8c-4721-8340-7a38238347c7","name":"274a8c7b-ca8c-4721-8340-7a38238347c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"274a8c7b-ca8c-4721-8340-7a38238347c7","name":"274a8c7b-ca8c-4721-8340-7a38238347c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc1fc3c0-fa0f-45d3-8a1a-2ffa8d073dec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6e067f3-ad2b-4116-9e07-c3b86d62143c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"274a8c7b-ca8c-4721-8340-7a38238347c7","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1530679f-5fa0-4e40-a97f-16971a179bd4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8e2b4d81-03fe-4fb8-b4ec-dab2348651b5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc1fc3c0-fa0f-45d3-8a1a-2ffa8d073dec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6e067f3-ad2b-4116-9e07-c3b86d62143c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"274a8c7b-ca8c-4721-8340-7a38238347c7","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1530679f-5fa0-4e40-a97f-16971a179bd4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8e2b4d81-03fe-4fb8-b4ec-dab2348651b5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy index a95b2f8f92..77e7c3fad3 100644 --- a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy +++ b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_gladiator_chest", "bboxMode":0, "bbox_bottom":88, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1cdabc8e-5838-4520-bb52-b164914135dd","name":"1cdabc8e-5838-4520-bb52-b164914135dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1cdabc8e-5838-4520-bb52-b164914135dd","name":"1cdabc8e-5838-4520-bb52-b164914135dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7154fd28-b589-4124-982c-0c705bca0e90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cdabc8e-5838-4520-bb52-b164914135dd","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b623e4d-4d87-4cc2-9ef5-9416c7741aea","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd2746b7-cdab-4df5-a8c4-ab06ddd6fbef","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7154fd28-b589-4124-982c-0c705bca0e90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cdabc8e-5838-4520-bb52-b164914135dd","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b623e4d-4d87-4cc2-9ef5-9416c7741aea","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd2746b7-cdab-4df5-a8c4-ab06ddd6fbef","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy b/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy index 525fe935cf..4b392198ce 100644 --- a/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy +++ b/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_head_variants", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baf9a104-7ab3-42e8-bc99-ab91707455a7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baf9a104-7ab3-42e8-bc99-ab91707455a7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy b/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy index bdaed8ab22..259c530676 100644 --- a/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy +++ b/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_knightly_chest", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01437ca1-e985-4229-a447-001c9264a235","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01437ca1-e985-4229-a447-001c9264a235","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy b/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy index 1850d33f78..cbbdf3e612 100644 --- a/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy +++ b/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5d794479-23e8-47a4-925d-8b51fe539cad","name":"5d794479-23e8-47a4-925d-8b51fe539cad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d794479-23e8-47a4-925d-8b51fe539cad","name":"5d794479-23e8-47a4-925d-8b51fe539cad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d794479-23e8-47a4-925d-8b51fe539cad","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0924d635-008c-493a-8c4b-3d347b7d6043","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d794479-23e8-47a4-925d-8b51fe539cad","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0924d635-008c-493a-8c4b-3d347b7d6043","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy index 38bc699b60..ba21c41b38 100644 --- a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy +++ b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_left_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6fc3a72-e76f-4ffa-92a9-682bda147f0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"363746cf-6f85-469a-b176-f73ceba6559e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a072026-bb8f-472a-8844-5f39c475684d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6fc3a72-e76f-4ffa-92a9-682bda147f0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"363746cf-6f85-469a-b176-f73ceba6559e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a072026-bb8f-472a-8844-5f39c475684d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy b/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy index b3c08ea75a..8e05a1f8dd 100644 --- a/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy +++ b/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_leg_variants", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6481474b-6526-4bec-86dd-ba8cc60fe287","name":"6481474b-6526-4bec-86dd-ba8cc60fe287","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9dfbc583-089d-4b8c-9012-405d17389b4b","name":"9dfbc583-089d-4b8c-9012-405d17389b4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6481474b-6526-4bec-86dd-ba8cc60fe287","name":"6481474b-6526-4bec-86dd-ba8cc60fe287","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9dfbc583-089d-4b8c-9012-405d17389b4b","name":"9dfbc583-089d-4b8c-9012-405d17389b4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6481474b-6526-4bec-86dd-ba8cc60fe287","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"989a10c5-a397-4446-9be1-267e74dc0585","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dfbc583-089d-4b8c-9012-405d17389b4b","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c9a2904-eb56-452e-8890-9a68ec5d0217","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6481474b-6526-4bec-86dd-ba8cc60fe287","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"989a10c5-a397-4446-9be1-267e74dc0585","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dfbc583-089d-4b8c-9012-405d17389b4b","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c9a2904-eb56-452e-8890-9a68ec5d0217","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy b/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy index 49c7f81a23..5ea5bb551c 100644 --- a/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy +++ b/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_mongol_chest_variants", "bboxMode":0, "bbox_bottom":73, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64394992-62c2-494d-9a48-1fdaec945713","name":"64394992-62c2-494d-9a48-1fdaec945713","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64394992-62c2-494d-9a48-1fdaec945713","name":"64394992-62c2-494d-9a48-1fdaec945713","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64394992-62c2-494d-9a48-1fdaec945713","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"687774f6-25e5-43b9-9644-afb140487387","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc0888e9-91c0-494a-b193-3ac7bb3db229","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64394992-62c2-494d-9a48-1fdaec945713","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"687774f6-25e5-43b9-9644-afb140487387","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc0888e9-91c0-494a-b193-3ac7bb3db229","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_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy b/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy index f559ed92cd..b747599ace 100644 --- a/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy +++ b/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_mouth_prussian", "bboxMode":0, "bbox_bottom":48, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39559a84-9ef2-47ad-982c-840f197ffac7","name":"39559a84-9ef2-47ad-982c-840f197ffac7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39559a84-9ef2-47ad-982c-840f197ffac7","name":"39559a84-9ef2-47ad-982c-840f197ffac7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d2d40c6-5430-4d09-a305-853a603296d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3160ee19-f37b-4969-bc87-9c858e597b6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39559a84-9ef2-47ad-982c-840f197ffac7","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58009909-cf0f-4b81-96c4-5fa8378c9091","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d2d40c6-5430-4d09-a305-853a603296d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3160ee19-f37b-4969-bc87-9c858e597b6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39559a84-9ef2-47ad-982c-840f197ffac7","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58009909-cf0f-4b81-96c4-5fa8378c9091","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy b/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy index 4fcad814c3..50a02383ec 100644 --- a/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy +++ b/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_mouth_variants", "bboxMode":0, "bbox_bottom":44, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"805b74c1-f681-48e7-abfd-6f5b223474c6","name":"805b74c1-f681-48e7-abfd-6f5b223474c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"805b74c1-f681-48e7-abfd-6f5b223474c6","name":"805b74c1-f681-48e7-abfd-6f5b223474c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"805b74c1-f681-48e7-abfd-6f5b223474c6","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90424d54-c018-4c65-bf40-761e34299d1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94d1248d-c0c4-4e25-8dfc-560ddc824524","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e284f5f0-bfd1-44e1-83c7-c26b0384c4ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b5b860f-4677-4acd-80cd-7c6676d57d40","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"805b74c1-f681-48e7-abfd-6f5b223474c6","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90424d54-c018-4c65-bf40-761e34299d1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94d1248d-c0c4-4e25-8dfc-560ddc824524","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e284f5f0-bfd1-44e1-83c7-c26b0384c4ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b5b860f-4677-4acd-80cd-7c6676d57d40","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy b/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy index 01cf9d494e..7ecca87e30 100644 --- a/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy +++ b/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_prussia_chest", "bboxMode":0, "bbox_bottom":82, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be47593c-61a3-4f18-94fb-d10377ee52c2","name":"be47593c-61a3-4f18-94fb-d10377ee52c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be47593c-61a3-4f18-94fb-d10377ee52c2","name":"be47593c-61a3-4f18-94fb-d10377ee52c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"325b6201-0d39-4816-ab63-ff3059baaa71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8623654c-b493-4e7a-9016-c4cb86b3a5c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be47593c-61a3-4f18-94fb-d10377ee52c2","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3a1701a-91b0-42b3-821d-2ca5b311081a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e60dbbc5-c2af-4409-87fb-f63db8f14b63","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4db6343-e700-4a31-9305-2b0c40459865","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"325b6201-0d39-4816-ab63-ff3059baaa71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8623654c-b493-4e7a-9016-c4cb86b3a5c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be47593c-61a3-4f18-94fb-d10377ee52c2","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3a1701a-91b0-42b3-821d-2ca5b311081a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e60dbbc5-c2af-4409-87fb-f63db8f14b63","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4db6343-e700-4a31-9305-2b0c40459865","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy b/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy index 749775f2b1..dad32314a0 100644 --- a/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy +++ b/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3d2383f-78e1-45a6-b6fb-577392a18352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3d2383f-78e1-45a6-b6fb-577392a18352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy index 65beda6db2..fde1910d87 100644 --- a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy +++ b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"22f140e8-36e9-438e-ac20-4d6a50de8292","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e8a26e7-bfc2-42e4-bcfe-afeebb652382","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a096d33-1914-457f-a964-ec5ba2833a6e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0675daf6-3a75-4886-b1c7-7d722f306c69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"22f140e8-36e9-438e-ac20-4d6a50de8292","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e8a26e7-bfc2-42e4-bcfe-afeebb652382","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a096d33-1914-457f-a964-ec5ba2833a6e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0675daf6-3a75-4886-b1c7-7d722f306c69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy b/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy index 812efe5ed7..407591fb56 100644 --- a/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy +++ b/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_rope_belt", "bboxMode":0, "bbox_bottom":163, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e921701-e99d-41a9-82a0-24a921a8ed56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e921701-e99d-41a9-82a0-24a921a8ed56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy b/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy index 97c3245e32..c95522093e 100644 --- a/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy +++ b/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_runic_belt", "bboxMode":0, "bbox_bottom":104, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30003a9b-235a-4a43-8274-13d6bc52408e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30003a9b-235a-4a43-8274-13d6bc52408e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy b/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy index 86d18731af..c2daf35793 100644 --- a/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy +++ b/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_sculpted_chest", "bboxMode":0, "bbox_bottom":97, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d02faaf-2101-406d-a94f-527d1c7834db","name":"0d02faaf-2101-406d-a94f-527d1c7834db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d02faaf-2101-406d-a94f-527d1c7834db","name":"0d02faaf-2101-406d-a94f-527d1c7834db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3d2212a-239a-4ea3-b5f3-154921fccd5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e077023e-8787-4782-9730-7a619200302f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5915a327-71ae-45ce-8bf1-4f238f188d9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"007cbf5c-34b9-47f6-b9ec-9ba25915eea2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c9ae7ee-19de-49e6-a417-1d9a3874db53","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d02faaf-2101-406d-a94f-527d1c7834db","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cfbe42f-6839-4f34-b9fa-cba90066c043","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ecc1285-25c4-4843-abd9-6f539e6e54c3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3d2212a-239a-4ea3-b5f3-154921fccd5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e077023e-8787-4782-9730-7a619200302f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5915a327-71ae-45ce-8bf1-4f238f188d9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"007cbf5c-34b9-47f6-b9ec-9ba25915eea2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c9ae7ee-19de-49e6-a417-1d9a3874db53","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d02faaf-2101-406d-a94f-527d1c7834db","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cfbe42f-6839-4f34-b9fa-cba90066c043","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ecc1285-25c4-4843-abd9-6f539e6e54c3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy index 21dba15817..f40beee983 100644 --- a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy +++ b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_thorax_variants", "bboxMode":0, "bbox_bottom":94, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d0338708-7e62-4549-91ae-e73b183dd2ef","name":"d0338708-7e62-4549-91ae-e73b183dd2ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44f5165b-6919-4a3a-9c58-452f3f588084","name":"44f5165b-6919-4a3a-9c58-452f3f588084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0338708-7e62-4549-91ae-e73b183dd2ef","name":"d0338708-7e62-4549-91ae-e73b183dd2ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44f5165b-6919-4a3a-9c58-452f3f588084","name":"44f5165b-6919-4a3a-9c58-452f3f588084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0338708-7e62-4549-91ae-e73b183dd2ef","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df9c08ff-f06d-400b-80e7-bb59328f9199","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee5845f8-5f75-4dda-836e-fc135b26839e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44f5165b-6919-4a3a-9c58-452f3f588084","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db13cbd7-28ca-45ef-bbcc-e67390716428","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca73c5a3-17d3-45a9-b6c9-78cb538894d1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fae1fd8-4aa0-442c-994c-edeef09a437b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec56882c-5f46-4d97-b25b-d17bbef25348","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0338708-7e62-4549-91ae-e73b183dd2ef","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df9c08ff-f06d-400b-80e7-bb59328f9199","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee5845f8-5f75-4dda-836e-fc135b26839e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44f5165b-6919-4a3a-9c58-452f3f588084","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db13cbd7-28ca-45ef-bbcc-e67390716428","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca73c5a3-17d3-45a9-b6c9-78cb538894d1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fae1fd8-4aa0-442c-994c-edeef09a437b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec56882c-5f46-4d97-b25b-d17bbef25348","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy b/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy index fee5ab2bd8..a95a560535 100644 --- a/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy +++ b/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_wolf_cult_belt", "bboxMode":0, "bbox_bottom":105, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4dd3a544-ca29-4553-b7c4-e80f13fc8817","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4dd3a544-ca29-4553-b7c4-e80f13fc8817","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy b/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy index 79541a838e..9d2d53b28e 100644 --- a/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy +++ b/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_wolf_cult_chest_variants", "bboxMode":0, "bbox_bottom":70, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ad9cfc1-5d97-4389-99cb-ecafad8ac462","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ad9cfc1-5d97-4389-99cb-ecafad8ac462","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk8_colors/spr_mk8_colors.yy b/sprites/spr_mk8_colors/spr_mk8_colors.yy index a800b21d31..0202853028 100644 --- a/sprites/spr_mk8_colors/spr_mk8_colors.yy +++ b/sprites/spr_mk8_colors/spr_mk8_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk8_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"981be636-52a5-4d29-96b0-5dee6151a13a","name":"981be636-52a5-4d29-96b0-5dee6151a13a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b557307-d3ab-44db-88bd-dd939efc6f44","name":"1b557307-d3ab-44db-88bd-dd939efc6f44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95e99182-f9d7-45c6-aa75-55e9d68109af","name":"95e99182-f9d7-45c6-aa75-55e9d68109af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"349d1be4-0273-4d96-b600-2d943ad99dbe","name":"349d1be4-0273-4d96-b600-2d943ad99dbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c002c68f-30e5-4bbe-b121-e694c138b49d","name":"c002c68f-30e5-4bbe-b121-e694c138b49d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"51421269-71df-4679-9664-340ff8792b13","name":"51421269-71df-4679-9664-340ff8792b13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"981be636-52a5-4d29-96b0-5dee6151a13a","name":"981be636-52a5-4d29-96b0-5dee6151a13a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b557307-d3ab-44db-88bd-dd939efc6f44","name":"1b557307-d3ab-44db-88bd-dd939efc6f44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95e99182-f9d7-45c6-aa75-55e9d68109af","name":"95e99182-f9d7-45c6-aa75-55e9d68109af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"349d1be4-0273-4d96-b600-2d943ad99dbe","name":"349d1be4-0273-4d96-b600-2d943ad99dbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c002c68f-30e5-4bbe-b121-e694c138b49d","name":"c002c68f-30e5-4bbe-b121-e694c138b49d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51421269-71df-4679-9664-340ff8792b13","name":"51421269-71df-4679-9664-340ff8792b13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ebf9ae16-672c-441f-a17e-427926b6b7cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cee4d72f-5a12-42ae-a9c9-3561d40b0ff2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"981be636-52a5-4d29-96b0-5dee6151a13a","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76a9ca46-05c1-4bb5-acc8-2a902aafaa8f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddc8d6b7-8742-46d6-b53b-8e944fa4a624","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b557307-d3ab-44db-88bd-dd939efc6f44","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2b0de0d-7520-4f67-b900-38544950c442","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e99182-f9d7-45c6-aa75-55e9d68109af","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"696987ef-0b47-44bd-8b4f-dc0717b4ebb1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cad3b930-d7c0-42d9-b598-4fb681152d39","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"349d1be4-0273-4d96-b600-2d943ad99dbe","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"110ba57c-100a-4f0b-a35c-6dd3e30ad0fd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c002c68f-30e5-4bbe-b121-e694c138b49d","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c77406f6-2f88-4c3c-890f-86bc5b562115","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d1a7567-af80-4b42-a3d4-f55d86e29ee0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6213a87d-cde3-4aad-96a0-66fa3cccfd96","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a539504c-1db9-4b3d-ae90-398cd9f79ff7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51421269-71df-4679-9664-340ff8792b13","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e08051c1-4b10-4607-aaef-e161d151137d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ebf9ae16-672c-441f-a17e-427926b6b7cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cee4d72f-5a12-42ae-a9c9-3561d40b0ff2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"981be636-52a5-4d29-96b0-5dee6151a13a","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76a9ca46-05c1-4bb5-acc8-2a902aafaa8f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddc8d6b7-8742-46d6-b53b-8e944fa4a624","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b557307-d3ab-44db-88bd-dd939efc6f44","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2b0de0d-7520-4f67-b900-38544950c442","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e99182-f9d7-45c6-aa75-55e9d68109af","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"696987ef-0b47-44bd-8b4f-dc0717b4ebb1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cad3b930-d7c0-42d9-b598-4fb681152d39","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"349d1be4-0273-4d96-b600-2d943ad99dbe","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"110ba57c-100a-4f0b-a35c-6dd3e30ad0fd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c002c68f-30e5-4bbe-b121-e694c138b49d","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c77406f6-2f88-4c3c-890f-86bc5b562115","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d1a7567-af80-4b42-a3d4-f55d86e29ee0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6213a87d-cde3-4aad-96a0-66fa3cccfd96","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a539504c-1db9-4b3d-ae90-398cd9f79ff7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51421269-71df-4679-9664-340ff8792b13","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e08051c1-4b10-4607-aaef-e161d151137d","IsCreationKey":false,"Key":12.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_mk8_gorget/spr_mk8_gorget.yy b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy index 30e32980b3..bb7e1b1d87 100644 --- a/sprites/spr_mk8_gorget/spr_mk8_gorget.yy +++ b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk8_gorget", "bboxMode":0, "bbox_bottom":53, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"851a2104-903f-436b-b68b-06b80d754bf4","name":"851a2104-903f-436b-b68b-06b80d754bf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"603329e3-8632-4533-b8b4-82b83c307cac","name":"603329e3-8632-4533-b8b4-82b83c307cac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4999c3e-8f41-4b09-ac88-634015b49682","name":"d4999c3e-8f41-4b09-ac88-634015b49682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"851a2104-903f-436b-b68b-06b80d754bf4","name":"851a2104-903f-436b-b68b-06b80d754bf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"603329e3-8632-4533-b8b4-82b83c307cac","name":"603329e3-8632-4533-b8b4-82b83c307cac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4999c3e-8f41-4b09-ac88-634015b49682","name":"d4999c3e-8f41-4b09-ac88-634015b49682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"383a62b7-cef5-4267-b973-3ac3aad57cca","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3419f9e2-c3bc-467e-bdf0-b5dab567d3fb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"603329e3-8632-4533-b8b4-82b83c307cac","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"533ed542-183a-4df2-9110-ce46ac29753c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4999c3e-8f41-4b09-ac88-634015b49682","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98495c8f-472a-43e1-9468-6da68d0a2e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f44dc52-686d-478a-8f07-84ac5d102ce6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"383a62b7-cef5-4267-b973-3ac3aad57cca","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3419f9e2-c3bc-467e-bdf0-b5dab567d3fb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"603329e3-8632-4533-b8b4-82b83c307cac","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"533ed542-183a-4df2-9110-ce46ac29753c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4999c3e-8f41-4b09-ac88-634015b49682","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98495c8f-472a-43e1-9468-6da68d0a2e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f44dc52-686d-478a-8f07-84ac5d102ce6","IsCreationKey":false,"Key":6.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_mm_butts/spr_mm_butts.yy b/sprites/spr_mm_butts/spr_mm_butts.yy index dab65c487f..1e54636e49 100644 --- a/sprites/spr_mm_butts/spr_mm_butts.yy +++ b/sprites/spr_mm_butts/spr_mm_butts.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_butts", "bboxMode":0, "bbox_bottom":19, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b2f3fc02-83c3-4384-8cf7-349730941d32","name":"b2f3fc02-83c3-4384-8cf7-349730941d32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ada21ef-8373-4ce3-a587-650fb8da0541","name":"8ada21ef-8373-4ce3-a587-650fb8da0541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2f3fc02-83c3-4384-8cf7-349730941d32","name":"b2f3fc02-83c3-4384-8cf7-349730941d32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ada21ef-8373-4ce3-a587-650fb8da0541","name":"8ada21ef-8373-4ce3-a587-650fb8da0541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2f3fc02-83c3-4384-8cf7-349730941d32","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3a0d07f-06dc-4ca4-b90a-8a1d3ac5001c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ada21ef-8373-4ce3-a587-650fb8da0541","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85c4ac87-7c94-4842-aed9-9ecf21a490bb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89e01832-b757-43a7-97c2-1be750fd2a76","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca031830-21c6-4642-818b-5df96fb549d2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04528819-a220-4726-8700-303995f2fb3c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2f3fc02-83c3-4384-8cf7-349730941d32","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3a0d07f-06dc-4ca4-b90a-8a1d3ac5001c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ada21ef-8373-4ce3-a587-650fb8da0541","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85c4ac87-7c94-4842-aed9-9ecf21a490bb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89e01832-b757-43a7-97c2-1be750fd2a76","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca031830-21c6-4642-818b-5df96fb549d2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04528819-a220-4726-8700-303995f2fb3c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mm_butts_small/spr_mm_butts_small.yy b/sprites/spr_mm_butts_small/spr_mm_butts_small.yy index 707db231a6..a5014c3ab4 100644 --- a/sprites/spr_mm_butts_small/spr_mm_butts_small.yy +++ b/sprites/spr_mm_butts_small/spr_mm_butts_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_butts_small", "bboxMode":0, "bbox_bottom":19, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f7c9bd0-1068-40a4-9cd4-3638dca38bb5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab03fb07-e69f-4023-b23b-278203142e4a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f7c9bd0-1068-40a4-9cd4-3638dca38bb5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab03fb07-e69f-4023-b23b-278203142e4a","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_mm_glow/spr_mm_glow.yy b/sprites/spr_mm_glow/spr_mm_glow.yy index 20b8314a19..6992b7deae 100644 --- a/sprites/spr_mm_glow/spr_mm_glow.yy +++ b/sprites/spr_mm_glow/spr_mm_glow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_glow", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d532e166-1426-4753-a82c-2239adaee1f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d532e166-1426-4753-a82c-2239adaee1f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mm_glowold/spr_mm_glowold.yy b/sprites/spr_mm_glowold/spr_mm_glowold.yy index 2f34d688c5..52be77ffd3 100644 --- a/sprites/spr_mm_glowold/spr_mm_glowold.yy +++ b/sprites/spr_mm_glowold/spr_mm_glowold.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_glowold", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a810a33a-a34b-49b8-a394-e5126d46c22f","name":"a810a33a-a34b-49b8-a394-e5126d46c22f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a810a33a-a34b-49b8-a394-e5126d46c22f","name":"a810a33a-a34b-49b8-a394-e5126d46c22f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a810a33a-a34b-49b8-a394-e5126d46c22f","path":"sprites/spr_mm_glowold/spr_mm_glowold.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3d2b87d-08e3-49ce-95d6-627e333eca68","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a810a33a-a34b-49b8-a394-e5126d46c22f","path":"sprites/spr_mm_glowold/spr_mm_glowold.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3d2b87d-08e3-49ce-95d6-627e333eca68","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mongol_hat/spr_mongol_hat.yy b/sprites/spr_mongol_hat/spr_mongol_hat.yy index a5cac3914a..324d768d63 100644 --- a/sprites/spr_mongol_hat/spr_mongol_hat.yy +++ b/sprites/spr_mongol_hat/spr_mongol_hat.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mongol_hat", "bboxMode":0, "bbox_bottom":37, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","path":"sprites/spr_mongol_hat/spr_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76c12ca8-2264-465a-adde-c808846b3898","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","path":"sprites/spr_mongol_hat/spr_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a992ca08-8ceb-4c3f-9f58-d09a22923b59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","path":"sprites/spr_mongol_hat/spr_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76c12ca8-2264-465a-adde-c808846b3898","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","path":"sprites/spr_mongol_hat/spr_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a992ca08-8ceb-4c3f-9f58-d09a22923b59","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_mongol_topknots/spr_mongol_topknots.yy b/sprites/spr_mongol_topknots/spr_mongol_topknots.yy index 3c32849d9f..979312ed4e 100644 --- a/sprites/spr_mongol_topknots/spr_mongol_topknots.yy +++ b/sprites/spr_mongol_topknots/spr_mongol_topknots.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mongol_topknots", "bboxMode":0, "bbox_bottom":69, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5866fa80-598f-4ae8-8d66-084c1cdd183e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea659019-df79-4bf1-ae2f-14074bff361b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf9cefb6-3a88-481c-ab5a-bb6cb1fd5de9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5866fa80-598f-4ae8-8d66-084c1cdd183e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea659019-df79-4bf1-ae2f-14074bff361b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf9cefb6-3a88-481c-ab5a-bb6cb1fd5de9","IsCreationKey":false,"Key":2.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_narthecium_2/spr_narthecium_2.yy b/sprites/spr_narthecium_2/spr_narthecium_2.yy index be1d7326dc..6cf1fbf539 100644 --- a/sprites/spr_narthecium_2/spr_narthecium_2.yy +++ b/sprites/spr_narthecium_2/spr_narthecium_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_narthecium_2", "bboxMode":0, "bbox_bottom":134, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_narthecium_2/spr_narthecium_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25b210ef-73fb-4ec5-bcd7-b16bd2738aa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_narthecium_2/spr_narthecium_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25b210ef-73fb-4ec5-bcd7-b16bd2738aa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_new_banner/spr_new_banner.yy b/sprites/spr_new_banner/spr_new_banner.yy index c5332cb062..49db4b6e17 100644 --- a/sprites/spr_new_banner/spr_new_banner.yy +++ b/sprites/spr_new_banner/spr_new_banner.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_banner", "bboxMode":0, "bbox_bottom":197, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"affc02cd-401a-4d10-8d72-28cb9fc69444","name":"affc02cd-401a-4d10-8d72-28cb9fc69444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"affc02cd-401a-4d10-8d72-28cb9fc69444","name":"affc02cd-401a-4d10-8d72-28cb9fc69444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"affc02cd-401a-4d10-8d72-28cb9fc69444","path":"sprites/spr_new_banner/spr_new_banner.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3187ab50-787e-4692-9541-b46b5dd9ffd0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"affc02cd-401a-4d10-8d72-28cb9fc69444","path":"sprites/spr_new_banner/spr_new_banner.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3187ab50-787e-4692-9541-b46b5dd9ffd0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_new_mm/spr_new_mm.yy b/sprites/spr_new_mm/spr_new_mm.yy index f53214f6a2..285d68329c 100644 --- a/sprites/spr_new_mm/spr_new_mm.yy +++ b/sprites/spr_new_mm/spr_new_mm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_mm", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"24507153-8c4a-4a69-b14f-9a079657f166","name":"24507153-8c4a-4a69-b14f-9a079657f166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24507153-8c4a-4a69-b14f-9a079657f166","name":"24507153-8c4a-4a69-b14f-9a079657f166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24507153-8c4a-4a69-b14f-9a079657f166","path":"sprites/spr_new_mm/spr_new_mm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ccf15d7-8a86-430e-a2ca-93818cb6d7f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24507153-8c4a-4a69-b14f-9a079657f166","path":"sprites/spr_new_mm/spr_new_mm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ccf15d7-8a86-430e-a2ca-93818cb6d7f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_new_resource/spr_new_resource.yy b/sprites/spr_new_resource/spr_new_resource.yy index a7c43fcbb3..c507c235a1 100644 --- a/sprites/spr_new_resource/spr_new_resource.yy +++ b/sprites/spr_new_resource/spr_new_resource.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_resource", "bboxMode":0, "bbox_bottom":16, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d19f578-139c-4064-8be1-47be64f4285e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23d29671-1fde-42a4-b10a-af9b95b35347","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1e32982-b0e4-4d65-9829-47a9b31990ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"184f4138-aff7-414c-ad9b-da8d8f89d9b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d19f578-139c-4064-8be1-47be64f4285e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23d29671-1fde-42a4-b10a-af9b95b35347","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1e32982-b0e4-4d65-9829-47a9b31990ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"184f4138-aff7-414c-ad9b-da8d8f89d9b8","IsCreationKey":false,"Key":3.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_new_ui/spr_new_ui.yy b/sprites/spr_new_ui/spr_new_ui.yy index 6c60cea1a0..b06921e5ef 100644 --- a/sprites/spr_new_ui/spr_new_ui.yy +++ b/sprites/spr_new_ui/spr_new_ui.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_ui", "bboxMode":0, "bbox_bottom":899, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,12 +73,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78876266-578e-4c35-9427-365cd0f530f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"52b35884-ddd9-4ffa-9407-83da11883191","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78876266-578e-4c35-9427-365cd0f530f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"52b35884-ddd9-4ffa-9407-83da11883191","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_new_ui_cover/spr_new_ui_cover.yy b/sprites/spr_new_ui_cover/spr_new_ui_cover.yy index f2db196f68..6f1fc1d976 100644 --- a/sprites/spr_new_ui_cover/spr_new_ui_cover.yy +++ b/sprites/spr_new_ui_cover/spr_new_ui_cover.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_ui_cover", "bboxMode":0, "bbox_bottom":16, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40857d9f-b7b0-460f-8da3-993db52e0aee","name":"40857d9f-b7b0-460f-8da3-993db52e0aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40857d9f-b7b0-460f-8da3-993db52e0aee","name":"40857d9f-b7b0-460f-8da3-993db52e0aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40857d9f-b7b0-460f-8da3-993db52e0aee","path":"sprites/spr_new_ui_cover/spr_new_ui_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf14c101-a0a4-4283-81ca-19d9c4c64d75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40857d9f-b7b0-460f-8da3-993db52e0aee","path":"sprites/spr_new_ui_cover/spr_new_ui_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf14c101-a0a4-4283-81ca-19d9c4c64d75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_noarmour_colors/spr_noarmour_colors.yy b/sprites/spr_noarmour_colors/spr_noarmour_colors.yy index 426778757f..1077824ab1 100644 --- a/sprites/spr_noarmour_colors/spr_noarmour_colors.yy +++ b/sprites/spr_noarmour_colors/spr_noarmour_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_noarmour_colors", "bboxMode":0, "bbox_bottom":223, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee2b0a1a-4b5e-48a3-8ce7-58a199d69840","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38cc4662-e007-4c05-a7a0-3f86779d9c91","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee2b0a1a-4b5e-48a3-8ce7-58a199d69840","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38cc4662-e007-4c05-a7a0-3f86779d9c91","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":{ diff --git a/sprites/spr_none/spr_none.yy b/sprites/spr_none/spr_none.yy index 1259ef6117..0b964ea1cc 100644 --- a/sprites/spr_none/spr_none.yy +++ b/sprites/spr_none/spr_none.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_none", "bboxMode":0, "bbox_bottom":63, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4a6846e4-12cb-4abb-9404-633df612cd68","name":"4a6846e4-12cb-4abb-9404-633df612cd68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a6846e4-12cb-4abb-9404-633df612cd68","name":"4a6846e4-12cb-4abb-9404-633df612cd68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a6846e4-12cb-4abb-9404-633df612cd68","path":"sprites/spr_none/spr_none.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a859341-0d2d-4356-b87d-df4182e972bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a6846e4-12cb-4abb-9404-633df612cd68","path":"sprites/spr_none/spr_none.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a859341-0d2d-4356-b87d-df4182e972bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy b/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy index 6bb656566a..8764a267df 100644 --- a/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy +++ b/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_numeral_left_knee", "bboxMode":0, "bbox_bottom":157, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"29533519-c6e5-4bda-a613-b26007242bcb","name":"29533519-c6e5-4bda-a613-b26007242bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c4049b43-1809-4728-924c-5444da8719b5","name":"c4049b43-1809-4728-924c-5444da8719b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"29533519-c6e5-4bda-a613-b26007242bcb","name":"29533519-c6e5-4bda-a613-b26007242bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4049b43-1809-4728-924c-5444da8719b5","name":"c4049b43-1809-4728-924c-5444da8719b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09b95042-aae6-492f-b786-b74c8c6e9263","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47ab4ac3-1121-425c-9979-42936e389541","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36a71730-fbce-4be8-b54c-fd8eaf732dad","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec4374be-3bbd-4d09-aeda-dd7c2f4b6da2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee25b373-1963-4f2e-9aa5-3532ed45cff6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af3546e5-fb3f-4506-9654-5aafa55e19fd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0cbf6635-ee09-47d2-a582-f271220c8676","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"29533519-c6e5-4bda-a613-b26007242bcb","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de7ee4b9-7b88-45f6-965e-8c99fe6bd60a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9729f53-ea1d-4a0d-adfe-4596f2e3bd5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c2462aa-f436-4f4a-97e8-831ed46702b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4049b43-1809-4728-924c-5444da8719b5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"502ea72f-bafd-4719-b46e-178305e29cda","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09b95042-aae6-492f-b786-b74c8c6e9263","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47ab4ac3-1121-425c-9979-42936e389541","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36a71730-fbce-4be8-b54c-fd8eaf732dad","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec4374be-3bbd-4d09-aeda-dd7c2f4b6da2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee25b373-1963-4f2e-9aa5-3532ed45cff6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af3546e5-fb3f-4506-9654-5aafa55e19fd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0cbf6635-ee09-47d2-a582-f271220c8676","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"29533519-c6e5-4bda-a613-b26007242bcb","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de7ee4b9-7b88-45f6-965e-8c99fe6bd60a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9729f53-ea1d-4a0d-adfe-4596f2e3bd5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c2462aa-f436-4f4a-97e8-831ed46702b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4049b43-1809-4728-924c-5444da8719b5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"502ea72f-bafd-4719-b46e-178305e29cda","IsCreationKey":false,"Key":10.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_ork_target/spr_ork_target.yy b/sprites/spr_ork_target/spr_ork_target.yy index 246116103c..6d2a6a23d9 100644 --- a/sprites/spr_ork_target/spr_ork_target.yy +++ b/sprites/spr_ork_target/spr_ork_target.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ork_target", "bboxMode":2, "bbox_bottom":31, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da401b80-f220-4151-8235-7d11983b9b40","name":"da401b80-f220-4151-8235-7d11983b9b40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da401b80-f220-4151-8235-7d11983b9b40","name":"da401b80-f220-4151-8235-7d11983b9b40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da401b80-f220-4151-8235-7d11983b9b40","path":"sprites/spr_ork_target/spr_ork_target.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5209f4b7-620f-415b-8e5a-03ade6474c7b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da401b80-f220-4151-8235-7d11983b9b40","path":"sprites/spr_ork_target/spr_ork_target.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5209f4b7-620f-415b-8e5a-03ade6474c7b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_p_name_bg/spr_p_name_bg.yy b/sprites/spr_p_name_bg/spr_p_name_bg.yy index 11a6cf1b03..0694b71d9f 100644 --- a/sprites/spr_p_name_bg/spr_p_name_bg.yy +++ b/sprites/spr_p_name_bg/spr_p_name_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_p_name_bg", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","path":"sprites/spr_p_name_bg/spr_p_name_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a5f223cb-8fe5-4bd4-bb65-4996f34d2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","path":"sprites/spr_p_name_bg/spr_p_name_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5f223cb-8fe5-4bd4-bb65-4996f34d2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pa_arms/spr_pa_arms.yy b/sprites/spr_pa_arms/spr_pa_arms.yy index 0fa3e1b58d..b6845624d4 100644 --- a/sprites/spr_pa_arms/spr_pa_arms.yy +++ b/sprites/spr_pa_arms/spr_pa_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pa_arms", "bboxMode":0, "bbox_bottom":126, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,12 +72,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c707c1b9-a614-4238-989e-e486b4848dbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d39f4531-dd1e-4b87-878a-c5d11affd31f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c707c1b9-a614-4238-989e-e486b4848dbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d39f4531-dd1e-4b87-878a-c5d11affd31f","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_pa_arms_ornate/spr_pa_arms_ornate.yy b/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy index ec128d53f5..6f67fb6fcb 100644 --- a/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy +++ b/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pa_arms_ornate", "bboxMode":0, "bbox_bottom":126, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8363e074-6ccb-4eab-8cd5-9d0ea12c4e60","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1728fb22-de3b-4c95-872c-cc9250da60e5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8363e074-6ccb-4eab-8cd5-9d0ea12c4e60","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1728fb22-de3b-4c95-872c-cc9250da60e5","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_pa_hands/spr_pa_hands.yy b/sprites/spr_pa_hands/spr_pa_hands.yy index 6ccc6b749b..f34966c090 100644 --- a/sprites/spr_pa_hands/spr_pa_hands.yy +++ b/sprites/spr_pa_hands/spr_pa_hands.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pa_hands", "bboxMode":0, "bbox_bottom":126, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6eff66f0-db00-47d5-b4be-d57184964002","name":"6eff66f0-db00-47d5-b4be-d57184964002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"155b1984-8759-413d-8092-2796ab1a3a09","name":"155b1984-8759-413d-8092-2796ab1a3a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a35b258a-44c7-430f-99de-c54f836b592a","name":"a35b258a-44c7-430f-99de-c54f836b592a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b630790-a06c-4a90-b3c5-720b7345b536","name":"9b630790-a06c-4a90-b3c5-720b7345b536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6eff66f0-db00-47d5-b4be-d57184964002","name":"6eff66f0-db00-47d5-b4be-d57184964002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"155b1984-8759-413d-8092-2796ab1a3a09","name":"155b1984-8759-413d-8092-2796ab1a3a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a35b258a-44c7-430f-99de-c54f836b592a","name":"a35b258a-44c7-430f-99de-c54f836b592a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b630790-a06c-4a90-b3c5-720b7345b536","name":"9b630790-a06c-4a90-b3c5-720b7345b536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c995ba96-5312-4067-ac4e-80e3f9a3cfe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6eff66f0-db00-47d5-b4be-d57184964002","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"036f006a-c105-4025-bfa6-f12fad434fba","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f5500df-9a23-49bc-9bf9-acd7cb3706df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"155b1984-8759-413d-8092-2796ab1a3a09","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64489bc4-4523-4692-af5f-6f1896df5dc9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6341f511-a84d-4e6c-85a2-8e2eb49d7a37","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c9f00a5-3395-42bb-8316-ad0c9dd02fe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e840d8a-dd19-4272-9d33-fd5aee23576d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b258a-44c7-430f-99de-c54f836b592a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"66a8a65b-7d54-4c68-987c-ddeef4b4946a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e6b8980-b8a1-4a97-a7d0-a5c63705e814","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b630790-a06c-4a90-b3c5-720b7345b536","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f8266ab-f08f-4789-bf17-d6bbc1172c5c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1c9d65e-2cea-414f-910a-6f8feea246d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f31a737-8fc9-4606-9bf4-63ab1f940942","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c995ba96-5312-4067-ac4e-80e3f9a3cfe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6eff66f0-db00-47d5-b4be-d57184964002","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"036f006a-c105-4025-bfa6-f12fad434fba","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f5500df-9a23-49bc-9bf9-acd7cb3706df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"155b1984-8759-413d-8092-2796ab1a3a09","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64489bc4-4523-4692-af5f-6f1896df5dc9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6341f511-a84d-4e6c-85a2-8e2eb49d7a37","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c9f00a5-3395-42bb-8316-ad0c9dd02fe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e840d8a-dd19-4272-9d33-fd5aee23576d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b258a-44c7-430f-99de-c54f836b592a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"66a8a65b-7d54-4c68-987c-ddeef4b4946a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e6b8980-b8a1-4a97-a7d0-a5c63705e814","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b630790-a06c-4a90-b3c5-720b7345b536","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f8266ab-f08f-4789-bf17-d6bbc1172c5c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1c9d65e-2cea-414f-910a-6f8feea246d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f31a737-8fc9-4606-9bf4-63ab1f940942","IsCreationKey":false,"Key":11.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_pack_arm/spr_pack_arm.yy b/sprites/spr_pack_arm/spr_pack_arm.yy index 8161899e76..bb52801509 100644 --- a/sprites/spr_pack_arm/spr_pack_arm.yy +++ b/sprites/spr_pack_arm/spr_pack_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_arm", "bboxMode":0, "bbox_bottom":206, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"248cf0d9-174e-4863-8f84-e32382a7c773","name":"248cf0d9-174e-4863-8f84-e32382a7c773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"248cf0d9-174e-4863-8f84-e32382a7c773","name":"248cf0d9-174e-4863-8f84-e32382a7c773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"878757e1-ecdc-4262-9fac-0cd2cc896318","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"248cf0d9-174e-4863-8f84-e32382a7c773","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99c18d6d-89c3-455b-be9f-a6f49f0864d4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"878757e1-ecdc-4262-9fac-0cd2cc896318","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"248cf0d9-174e-4863-8f84-e32382a7c773","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99c18d6d-89c3-455b-be9f-a6f49f0864d4","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":{ diff --git a/sprites/spr_pack_arms/spr_pack_arms.yy b/sprites/spr_pack_arms/spr_pack_arms.yy index 70b7f6b02b..d693a5ec27 100644 --- a/sprites/spr_pack_arms/spr_pack_arms.yy +++ b/sprites/spr_pack_arms/spr_pack_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_arms", "bboxMode":0, "bbox_bottom":206, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0a62add5-b009-4050-ad6b-642b81efdcee","name":"0a62add5-b009-4050-ad6b-642b81efdcee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a62add5-b009-4050-ad6b-642b81efdcee","name":"0a62add5-b009-4050-ad6b-642b81efdcee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a62add5-b009-4050-ad6b-642b81efdcee","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1789541c-4533-4609-a018-a82ef1b709a0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2450620f-c70f-4df1-b4f4-bf7ea3682c22","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"961fb051-1332-4540-9c9c-b86c69a2d34a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a62add5-b009-4050-ad6b-642b81efdcee","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1789541c-4533-4609-a018-a82ef1b709a0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2450620f-c70f-4df1-b4f4-bf7ea3682c22","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"961fb051-1332-4540-9c9c-b86c69a2d34a","IsCreationKey":false,"Key":2.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_pack_brazier/spr_pack_brazier.yy b/sprites/spr_pack_brazier/spr_pack_brazier.yy index 3345415fa4..0efe887f30 100644 --- a/sprites/spr_pack_brazier/spr_pack_brazier.yy +++ b/sprites/spr_pack_brazier/spr_pack_brazier.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_brazier", "bboxMode":0, "bbox_bottom":53, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a56ce07-8e61-4c45-b30f-8fdfa4e44d2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9565c920-28b4-410e-9be7-a89088b5b95c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bf2e48d-0846-455b-ab62-0f5943650061","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a56ce07-8e61-4c45-b30f-8fdfa4e44d2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9565c920-28b4-410e-9be7-a89088b5b95c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bf2e48d-0846-455b-ab62-0f5943650061","IsCreationKey":false,"Key":2.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_pack_brazier2/spr_pack_brazier2.yy b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy index 530902bffa..5094b04a85 100644 --- a/sprites/spr_pack_brazier2/spr_pack_brazier2.yy +++ b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_brazier2", "bboxMode":0, "bbox_bottom":97, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier2/spr_pack_brazier2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41a45b27-c017-44df-9857-968f0d783204","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier2/spr_pack_brazier2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41a45b27-c017-44df-9857-968f0d783204","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy index c87e3aa5bd..761348fb9e 100644 --- a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy +++ b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_brazier3", "bboxMode":0, "bbox_bottom":99, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pack_devastator/spr_pack_devastator.yy b/sprites/spr_pack_devastator/spr_pack_devastator.yy index 66fb610765..d38a1c7292 100644 --- a/sprites/spr_pack_devastator/spr_pack_devastator.yy +++ b/sprites/spr_pack_devastator/spr_pack_devastator.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_devastator", "bboxMode":0, "bbox_bottom":37, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","IsCreationKey":false,"Key":2.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_pack_jump/spr_pack_jump.yy b/sprites/spr_pack_jump/spr_pack_jump.yy index c8144980c9..408b8188f3 100644 --- a/sprites/spr_pack_jump/spr_pack_jump.yy +++ b/sprites/spr_pack_jump/spr_pack_jump.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_jump", "bboxMode":0, "bbox_bottom":77, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"777ae2eb-75f6-4a1f-8633-057327b9a258","name":"777ae2eb-75f6-4a1f-8633-057327b9a258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"777ae2eb-75f6-4a1f-8633-057327b9a258","name":"777ae2eb-75f6-4a1f-8633-057327b9a258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"232f2f80-aef0-425c-91c6-b057a1e4eab0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb16272d-2add-47a5-895f-f9827024011d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"777ae2eb-75f6-4a1f-8633-057327b9a258","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02d8ecc3-ce99-4de6-a06b-f69ff1bfe13e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"232f2f80-aef0-425c-91c6-b057a1e4eab0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb16272d-2add-47a5-895f-f9827024011d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"777ae2eb-75f6-4a1f-8633-057327b9a258","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02d8ecc3-ce99-4de6-a06b-f69ff1bfe13e","IsCreationKey":false,"Key":2.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_pauldron_spikes_left/spr_pauldron_spikes_left.yy b/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy index 0cdb31f36c..098bc42341 100644 --- a/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy +++ b/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pauldron_spikes_left", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7fc53778-12a4-4b34-8591-e40108986c71","name":"7fc53778-12a4-4b34-8591-e40108986c71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fc53778-12a4-4b34-8591-e40108986c71","name":"7fc53778-12a4-4b34-8591-e40108986c71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fc53778-12a4-4b34-8591-e40108986c71","path":"sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1dca78a-a6a8-48f4-9199-bb30337ec2be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fc53778-12a4-4b34-8591-e40108986c71","path":"sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1dca78a-a6a8-48f4-9199-bb30337ec2be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy b/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy index 989232794e..c750d16d5d 100644 --- a/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy +++ b/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pauldron_spikes_right", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_penitent_ui/spr_penitent_ui.yy b/sprites/spr_penitent_ui/spr_penitent_ui.yy index a1d1740000..d80ed92237 100644 --- a/sprites/spr_penitent_ui/spr_penitent_ui.yy +++ b/sprites/spr_penitent_ui/spr_penitent_ui.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_penitent_ui", "bboxMode":0, "bbox_bottom":24, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e43885ff-f49c-42e0-9d0c-cfc22ce51284","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e43885ff-f49c-42e0-9d0c-cfc22ce51284","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_pixel_button_left/spr_pixel_button_left.yy b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy index 0c9bb360ee..51dd8a856d 100644 --- a/sprites/spr_pixel_button_left/spr_pixel_button_left.yy +++ b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pixel_button_left", "bboxMode":0, "bbox_bottom":27, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c35b10b1-5374-4d18-bff9-7373fd5c1c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c35b10b1-5374-4d18-bff9-7373fd5c1c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy index 47f39abccc..583ac2fb85 100644 --- a/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy +++ b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pixel_button_middle", "bboxMode":0, "bbox_bottom":27, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b9d0197-8c88-4a7d-908c-67e942c40821","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b9d0197-8c88-4a7d-908c-67e942c40821","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pixel_button_right/spr_pixel_button_right.yy b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy index 9b86f78d93..37b0751f74 100644 --- a/sprites/spr_pixel_button_right/spr_pixel_button_right.yy +++ b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pixel_button_right", "bboxMode":0, "bbox_bottom":27, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb32a9c7-a6e7-47d3-86a8-a0bc2d995ce5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb32a9c7-a6e7-47d3-86a8-a0bc2d995ce5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_planet_screen/spr_planet_screen.yy b/sprites/spr_planet_screen/spr_planet_screen.yy index e30d03ad29..f3749893eb 100644 --- a/sprites/spr_planet_screen/spr_planet_screen.yy +++ b/sprites/spr_planet_screen/spr_planet_screen.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_planet_screen", "bboxMode":0, "bbox_bottom":293, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1086920f-108b-4fc6-93c0-e148bf438fe6","name":"1086920f-108b-4fc6-93c0-e148bf438fe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1086920f-108b-4fc6-93c0-e148bf438fe6","name":"1086920f-108b-4fc6-93c0-e148bf438fe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1086920f-108b-4fc6-93c0-e148bf438fe6","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73a40a92-c3a3-4dbc-9c6c-7be898649750","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1086920f-108b-4fc6-93c0-e148bf438fe6","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73a40a92-c3a3-4dbc-9c6c-7be898649750","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_planet_splash/spr_planet_splash.yy b/sprites/spr_planet_splash/spr_planet_splash.yy index 9bb728b71e..be9af08d9d 100644 --- a/sprites/spr_planet_splash/spr_planet_splash.yy +++ b/sprites/spr_planet_splash/spr_planet_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_planet_splash", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2c9150bc-4398-4602-912c-ca4949edb320","name":"2c9150bc-4398-4602-912c-ca4949edb320","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c9150bc-4398-4602-912c-ca4949edb320","name":"2c9150bc-4398-4602-912c-ca4949edb320","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c9150bc-4398-4602-912c-ca4949edb320","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ee5d7ca-42fa-4a31-a7f1-15a186131545","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c9150bc-4398-4602-912c-ca4949edb320","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ee5d7ca-42fa-4a31-a7f1-15a186131545","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_planets/spr_planets.yy b/sprites/spr_planets/spr_planets.yy index de312cb614..cf32396d66 100644 --- a/sprites/spr_planets/spr_planets.yy +++ b/sprites/spr_planets/spr_planets.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_planets", "bboxMode":0, "bbox_bottom":31, @@ -12,27 +12,27 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"181a775a-4952-48db-90d2-1b3fef4cae06","name":"181a775a-4952-48db-90d2-1b3fef4cae06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7dc545d7-cb74-455f-9122-a8de598730d7","name":"7dc545d7-cb74-455f-9122-a8de598730d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99571177-9e49-4765-861d-b8f711717ce2","name":"99571177-9e49-4765-861d-b8f711717ce2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"408c6368-40f2-4d72-80af-2a1756e36642","name":"408c6368-40f2-4d72-80af-2a1756e36642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8615a206-0f18-4722-a4ae-4899f089587c","name":"8615a206-0f18-4722-a4ae-4899f089587c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d60044a0-af82-4fb3-8e49-bb6520e52808","name":"d60044a0-af82-4fb3-8e49-bb6520e52808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"62040f87-514e-47c8-9541-112685e3f530","name":"62040f87-514e-47c8-9541-112685e3f530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"181a775a-4952-48db-90d2-1b3fef4cae06","name":"181a775a-4952-48db-90d2-1b3fef4cae06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dc545d7-cb74-455f-9122-a8de598730d7","name":"7dc545d7-cb74-455f-9122-a8de598730d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99571177-9e49-4765-861d-b8f711717ce2","name":"99571177-9e49-4765-861d-b8f711717ce2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"408c6368-40f2-4d72-80af-2a1756e36642","name":"408c6368-40f2-4d72-80af-2a1756e36642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8615a206-0f18-4722-a4ae-4899f089587c","name":"8615a206-0f18-4722-a4ae-4899f089587c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d60044a0-af82-4fb3-8e49-bb6520e52808","name":"d60044a0-af82-4fb3-8e49-bb6520e52808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"62040f87-514e-47c8-9541-112685e3f530","name":"62040f87-514e-47c8-9541-112685e3f530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -88,69 +88,27 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"181a775a-4952-48db-90d2-1b3fef4cae06","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d9dacf7-ad8b-4edf-bfd0-624027251d40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dc545d7-cb74-455f-9122-a8de598730d7","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d03183c7-6624-4a7a-bbca-e0cc0c0c09f6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99571177-9e49-4765-861d-b8f711717ce2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69a15a91-fcc1-4f28-a65e-e166b5751a52","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"395570ba-a096-4896-a1c4-7b7d90e9b1b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f63676b1-5f8d-4ea3-9cb4-09f84bc95b5c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4d5e6c7-2b5a-431a-9e47-5c843d58a1ff","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"408c6368-40f2-4d72-80af-2a1756e36642","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c30d912d-4df4-404a-b38f-ce8dda5d458d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4155acf-3e82-4cb2-92c7-10316d0ee9c3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ae654d1-25d9-4269-940b-e1e7fc72d625","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de5bffaf-c831-43d4-9b48-89a5618b09ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1dbfd5f7-fe0f-494c-b4fa-3de37ffaa8be","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b56335f0-c594-468c-b9cf-257a4f546fa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bed3a042-e251-4d6e-89e6-5e544dcb1ff6","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8615a206-0f18-4722-a4ae-4899f089587c","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3524370c-3828-4c5f-8dec-dd6c226c217c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d60044a0-af82-4fb3-8e49-bb6520e52808","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"325d6ae0-a21f-4350-9c1c-3af98ab3c0cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bb71ca1-af6d-4ae9-8614-22ebf352e3c9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78125f44-1c11-47ad-85ff-c496612e6b2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e7f41fba-0333-4687-b256-a1d38f6896d4","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62040f87-514e-47c8-9541-112685e3f530","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"211e6999-babe-483d-8c39-1b83087d41bf","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a141fe-5907-401c-881a-37f7ae9f2f8d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"edfb3906-d795-4658-8ef4-e1065bbaf111","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"181a775a-4952-48db-90d2-1b3fef4cae06","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d9dacf7-ad8b-4edf-bfd0-624027251d40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dc545d7-cb74-455f-9122-a8de598730d7","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d03183c7-6624-4a7a-bbca-e0cc0c0c09f6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99571177-9e49-4765-861d-b8f711717ce2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69a15a91-fcc1-4f28-a65e-e166b5751a52","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"395570ba-a096-4896-a1c4-7b7d90e9b1b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f63676b1-5f8d-4ea3-9cb4-09f84bc95b5c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4d5e6c7-2b5a-431a-9e47-5c843d58a1ff","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"408c6368-40f2-4d72-80af-2a1756e36642","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c30d912d-4df4-404a-b38f-ce8dda5d458d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4155acf-3e82-4cb2-92c7-10316d0ee9c3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ae654d1-25d9-4269-940b-e1e7fc72d625","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de5bffaf-c831-43d4-9b48-89a5618b09ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1dbfd5f7-fe0f-494c-b4fa-3de37ffaa8be","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b56335f0-c594-468c-b9cf-257a4f546fa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bed3a042-e251-4d6e-89e6-5e544dcb1ff6","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8615a206-0f18-4722-a4ae-4899f089587c","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3524370c-3828-4c5f-8dec-dd6c226c217c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d60044a0-af82-4fb3-8e49-bb6520e52808","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"325d6ae0-a21f-4350-9c1c-3af98ab3c0cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bb71ca1-af6d-4ae9-8614-22ebf352e3c9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78125f44-1c11-47ad-85ff-c496612e6b2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e7f41fba-0333-4687-b256-a1d38f6896d4","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"62040f87-514e-47c8-9541-112685e3f530","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"211e6999-babe-483d-8c39-1b83087d41bf","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a141fe-5907-401c-881a-37f7ae9f2f8d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edfb3906-d795-4658-8ef4-e1065bbaf111","IsCreationKey":false,"Key":20.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_popup/spr_popup.yy b/sprites/spr_popup/spr_popup.yy index e4a6f32231..3f509030dc 100644 --- a/sprites/spr_popup/spr_popup.yy +++ b/sprites/spr_popup/spr_popup.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup", "bboxMode":0, "bbox_bottom":287, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ad78fbb-c358-45fd-88f9-e5369faed57a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f81e50-3bc5-4ec7-92f2-f09b4c113e6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ad78fbb-c358-45fd-88f9-e5369faed57a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34f81e50-3bc5-4ec7-92f2-f09b4c113e6e","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":{ diff --git a/sprites/spr_popup_dialogue/spr_popup_dialogue.yy b/sprites/spr_popup_dialogue/spr_popup_dialogue.yy index e7841dac57..62bd897e94 100644 --- a/sprites/spr_popup_dialogue/spr_popup_dialogue.yy +++ b/sprites/spr_popup_dialogue/spr_popup_dialogue.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_dialogue", "bboxMode":0, "bbox_bottom":146, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","path":"sprites/spr_popup_dialogue/spr_popup_dialogue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa362568-b6a2-4a5b-be4a-271695972d87","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","path":"sprites/spr_popup_dialogue/spr_popup_dialogue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa362568-b6a2-4a5b-be4a-271695972d87","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_popup_event/spr_popup_event.yy b/sprites/spr_popup_event/spr_popup_event.yy index da6690cee9..0e8729d93d 100644 --- a/sprites/spr_popup_event/spr_popup_event.yy +++ b/sprites/spr_popup_event/spr_popup_event.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_event", "bboxMode":0, "bbox_bottom":602, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1550ec3-8ef7-4b66-b938-85de6e30b587","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcfc72ea-4585-4003-8f57-fcd1e98e8d62","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1550ec3-8ef7-4b66-b938-85de6e30b587","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcfc72ea-4585-4003-8f57-fcd1e98e8d62","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":{ diff --git a/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy b/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy index c6cd61142a..85afb4429b 100644 --- a/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy +++ b/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_event_avatar", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"194603b5-15a9-40de-be4a-f33d87da14f9","name":"194603b5-15a9-40de-be4a-f33d87da14f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"194603b5-15a9-40de-be4a-f33d87da14f9","name":"194603b5-15a9-40de-be4a-f33d87da14f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"194603b5-15a9-40de-be4a-f33d87da14f9","path":"sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a54b2f11-3f4e-4e52-97b2-9e5eeeffa1ee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"194603b5-15a9-40de-be4a-f33d87da14f9","path":"sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a54b2f11-3f4e-4e52-97b2-9e5eeeffa1ee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_popup_large/spr_popup_large.yy b/sprites/spr_popup_large/spr_popup_large.yy index 04031a662d..b441825f1f 100644 --- a/sprites/spr_popup_large/spr_popup_large.yy +++ b/sprites/spr_popup_large/spr_popup_large.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_large", "bboxMode":0, "bbox_bottom":431, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fcd8569d-481d-4125-8dd4-f909a8072676","name":"fcd8569d-481d-4125-8dd4-f909a8072676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcd8569d-481d-4125-8dd4-f909a8072676","name":"fcd8569d-481d-4125-8dd4-f909a8072676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c89065fb-82cd-4a55-8377-98dfd5690db7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcd8569d-481d-4125-8dd4-f909a8072676","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd94c960-1265-4fa8-b9f5-cd210600f0c3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c89065fb-82cd-4a55-8377-98dfd5690db7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcd8569d-481d-4125-8dd4-f909a8072676","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd94c960-1265-4fa8-b9f5-cd210600f0c3","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":{ diff --git a/sprites/spr_popup_manage/spr_popup_manage.yy b/sprites/spr_popup_manage/spr_popup_manage.yy index cb9f1743ed..d898c03dd3 100644 --- a/sprites/spr_popup_manage/spr_popup_manage.yy +++ b/sprites/spr_popup_manage/spr_popup_manage.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_manage", "bboxMode":0, "bbox_bottom":31, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","path":"sprites/spr_popup_manage/spr_popup_manage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8116bdaf-a3ea-46cd-b211-840747ff36d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","path":"sprites/spr_popup_manage/spr_popup_manage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8116bdaf-a3ea-46cd-b211-840747ff36d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_popup_medium/spr_popup_medium.yy b/sprites/spr_popup_medium/spr_popup_medium.yy index ca70fde681..4b88f3a669 100644 --- a/sprites/spr_popup_medium/spr_popup_medium.yy +++ b/sprites/spr_popup_medium/spr_popup_medium.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_medium", "bboxMode":0, "bbox_bottom":323, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a0b9f7e-d70e-44bd-aef3-295ac159bfc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ccf5fc1f-fcea-4c0e-a400-30e315180537","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a0b9f7e-d70e-44bd-aef3-295ac159bfc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ccf5fc1f-fcea-4c0e-a400-30e315180537","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":{ diff --git a/sprites/spr_popup_pic/spr_popup_pic.yy b/sprites/spr_popup_pic/spr_popup_pic.yy index ca684faa6c..1966058f14 100644 --- a/sprites/spr_popup_pic/spr_popup_pic.yy +++ b/sprites/spr_popup_pic/spr_popup_pic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_pic", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","path":"sprites/spr_popup_pic/spr_popup_pic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aeba4c16-c958-463b-b3cf-e0f6230963a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","path":"sprites/spr_popup_pic/spr_popup_pic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aeba4c16-c958-463b-b3cf-e0f6230963a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_popup_select/spr_popup_select.yy b/sprites/spr_popup_select/spr_popup_select.yy index 640998425b..c1a0042ba1 100644 --- a/sprites/spr_popup_select/spr_popup_select.yy +++ b/sprites/spr_popup_select/spr_popup_select.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_select", "bboxMode":0, "bbox_bottom":14, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"51edd839-9f92-4390-bd00-98fd88f418f5","name":"51edd839-9f92-4390-bd00-98fd88f418f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51edd839-9f92-4390-bd00-98fd88f418f5","name":"51edd839-9f92-4390-bd00-98fd88f418f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51edd839-9f92-4390-bd00-98fd88f418f5","path":"sprites/spr_popup_select/spr_popup_select.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f47bec7-dfd3-417b-8d4b-afef3dc60b06","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51edd839-9f92-4390-bd00-98fd88f418f5","path":"sprites/spr_popup_select/spr_popup_select.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f47bec7-dfd3-417b-8d4b-afef3dc60b06","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_popup_small/spr_popup_small.yy b/sprites/spr_popup_small/spr_popup_small.yy index 063857151e..863e371331 100644 --- a/sprites/spr_popup_small/spr_popup_small.yy +++ b/sprites/spr_popup_small/spr_popup_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_small", "bboxMode":0, "bbox_bottom":242, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"82319a6a-45e9-4485-8f08-078bc038a38e","name":"82319a6a-45e9-4485-8f08-078bc038a38e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82319a6a-45e9-4485-8f08-078bc038a38e","name":"82319a6a-45e9-4485-8f08-078bc038a38e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82319a6a-45e9-4485-8f08-078bc038a38e","path":"sprites/spr_popup_small/spr_popup_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97b4525a-1cad-40d4-9aad-bea97fde4a16","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82319a6a-45e9-4485-8f08-078bc038a38e","path":"sprites/spr_popup_small/spr_popup_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97b4525a-1cad-40d4-9aad-bea97fde4a16","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_postbattle/spr_postbattle.yy b/sprites/spr_postbattle/spr_postbattle.yy index 1bcf922ac7..aaa723e0bc 100644 --- a/sprites/spr_postbattle/spr_postbattle.yy +++ b/sprites/spr_postbattle/spr_postbattle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_postbattle", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_postbattle_space/spr_postbattle_space.yy b/sprites/spr_postbattle_space/spr_postbattle_space.yy index e740a62d11..190267cbdc 100644 --- a/sprites/spr_postbattle_space/spr_postbattle_space.yy +++ b/sprites/spr_postbattle_space/spr_postbattle_space.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_postbattle_space", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_prussian_spike/spr_prussian_spike.yy b/sprites/spr_prussian_spike/spr_prussian_spike.yy index 2427bc7c35..984217b8c2 100644 --- a/sprites/spr_prussian_spike/spr_prussian_spike.yy +++ b/sprites/spr_prussian_spike/spr_prussian_spike.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_prussian_spike", "bboxMode":0, "bbox_bottom":64, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cae929a5-f374-473f-a6d0-cf192764bb7e","name":"cae929a5-f374-473f-a6d0-cf192764bb7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15b2950d-a703-41a5-9fda-cf6e20097872","name":"15b2950d-a703-41a5-9fda-cf6e20097872","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cae929a5-f374-473f-a6d0-cf192764bb7e","name":"cae929a5-f374-473f-a6d0-cf192764bb7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15b2950d-a703-41a5-9fda-cf6e20097872","name":"15b2950d-a703-41a5-9fda-cf6e20097872","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7710b0d4-f532-4e1b-9547-19ebdc6eba63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6cd9f835-bb5b-4f5a-ac74-9bba33318a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae929a5-f374-473f-a6d0-cf192764bb7e","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2a07b9a-97cc-468f-8185-eed5040dcffe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d774d0a5-b13e-404b-be5a-1c394506d7c7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b2950d-a703-41a5-9fda-cf6e20097872","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d2053dfa-4aca-4c73-b641-8710602b8f93","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7710b0d4-f532-4e1b-9547-19ebdc6eba63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6cd9f835-bb5b-4f5a-ac74-9bba33318a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae929a5-f374-473f-a6d0-cf192764bb7e","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2a07b9a-97cc-468f-8185-eed5040dcffe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d774d0a5-b13e-404b-be5a-1c394506d7c7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b2950d-a703-41a5-9fda-cf6e20097872","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d2053dfa-4aca-4c73-b641-8710602b8f93","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_psy_hood/spr_psy_hood.yy b/sprites/spr_psy_hood/spr_psy_hood.yy index 99d66f5664..9aeba0c484 100644 --- a/sprites/spr_psy_hood/spr_psy_hood.yy +++ b/sprites/spr_psy_hood/spr_psy_hood.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood", "bboxMode":0, "bbox_bottom":203, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9dab986-458a-47fd-80b0-9fe27508109d","name":"e9dab986-458a-47fd-80b0-9fe27508109d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00179c07-d252-45ef-b3ab-ce1592356c5e","name":"00179c07-d252-45ef-b3ab-ce1592356c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9dab986-458a-47fd-80b0-9fe27508109d","name":"e9dab986-458a-47fd-80b0-9fe27508109d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00179c07-d252-45ef-b3ab-ce1592356c5e","name":"00179c07-d252-45ef-b3ab-ce1592356c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cdc5249-b43e-47ef-9b3e-594c53429273","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9dab986-458a-47fd-80b0-9fe27508109d","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c69bf823-ffbd-4cb3-b33f-35f35acf7786","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87f19802-bd95-4849-8a1c-6fd2716596c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00179c07-d252-45ef-b3ab-ce1592356c5e","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10320bca-2abd-4fce-b081-c3aa679fae96","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cdc5249-b43e-47ef-9b3e-594c53429273","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9dab986-458a-47fd-80b0-9fe27508109d","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c69bf823-ffbd-4cb3-b33f-35f35acf7786","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87f19802-bd95-4849-8a1c-6fd2716596c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00179c07-d252-45ef-b3ab-ce1592356c5e","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10320bca-2abd-4fce-b081-c3aa679fae96","IsCreationKey":false,"Key":3.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_psy_hood_complex/spr_psy_hood_complex.yy b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy index 1f24dcf7c6..47b18885af 100644 --- a/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy +++ b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood_complex", "bboxMode":0, "bbox_bottom":51, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd2d4908-2e48-4f69-8c27-96c251f4d07e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd2d4908-2e48-4f69-8c27-96c251f4d07e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pulse/spr_pulse.yy b/sprites/spr_pulse/spr_pulse.yy index 7af03e1903..3a5203ab9c 100644 --- a/sprites/spr_pulse/spr_pulse.yy +++ b/sprites/spr_pulse/spr_pulse.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pulse", "bboxMode":0, "bbox_bottom":1, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","path":"sprites/spr_pulse/spr_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bea83358-4f2a-4a9d-ab40-f1a58e73e370","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","path":"sprites/spr_pulse/spr_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bea83358-4f2a-4a9d-ab40-f1a58e73e370","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_purge_1/spr_purge_1.yy b/sprites/spr_purge_1/spr_purge_1.yy index 198e747870..9af7d76b5c 100644 --- a/sprites/spr_purge_1/spr_purge_1.yy +++ b/sprites/spr_purge_1/spr_purge_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_1", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_purge_2/spr_purge_2.yy b/sprites/spr_purge_2/spr_purge_2.yy index 2b8450f3ed..471230fc5b 100644 --- a/sprites/spr_purge_2/spr_purge_2.yy +++ b/sprites/spr_purge_2/spr_purge_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_2", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_purge_buttons/spr_purge_buttons.yy b/sprites/spr_purge_buttons/spr_purge_buttons.yy index 48ea8b9abd..4a22d0cd9b 100644 --- a/sprites/spr_purge_buttons/spr_purge_buttons.yy +++ b/sprites/spr_purge_buttons/spr_purge_buttons.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_buttons", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9a10719-dd38-43e2-82b7-62f03a6de243","name":"d9a10719-dd38-43e2-82b7-62f03a6de243","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9a10719-dd38-43e2-82b7-62f03a6de243","name":"d9a10719-dd38-43e2-82b7-62f03a6de243","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9a10719-dd38-43e2-82b7-62f03a6de243","path":"sprites/spr_purge_buttons/spr_purge_buttons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fed73b7e-5330-4e80-a7c6-0cec4a4ed761","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9a10719-dd38-43e2-82b7-62f03a6de243","path":"sprites/spr_purge_buttons/spr_purge_buttons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fed73b7e-5330-4e80-a7c6-0cec4a4ed761","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_purge_panel/spr_purge_panel.yy b/sprites/spr_purge_panel/spr_purge_panel.yy index a49d40d9eb..95ff974a51 100644 --- a/sprites/spr_purge_panel/spr_purge_panel.yy +++ b/sprites/spr_purge_panel/spr_purge_panel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_panel", "bboxMode":0, "bbox_bottom":399, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"92a13947-7100-4a9e-96d0-2af58cd2d330","name":"92a13947-7100-4a9e-96d0-2af58cd2d330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92a13947-7100-4a9e-96d0-2af58cd2d330","name":"92a13947-7100-4a9e-96d0-2af58cd2d330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a13947-7100-4a9e-96d0-2af58cd2d330","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89cc209d-0fa1-4713-be02-efb2bfdf7d52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a13947-7100-4a9e-96d0-2af58cd2d330","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89cc209d-0fa1-4713-be02-efb2bfdf7d52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_purity_s/spr_purity_s.yy b/sprites/spr_purity_s/spr_purity_s.yy index 532b8b7108..122958dadb 100644 --- a/sprites/spr_purity_s/spr_purity_s.yy +++ b/sprites/spr_purity_s/spr_purity_s.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purity_s", "bboxMode":0, "bbox_bottom":60, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4b074bea-caac-469b-9dc8-35be1593a7aa","name":"4b074bea-caac-469b-9dc8-35be1593a7aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ebc45331-ddb7-4801-be91-f23288c05447","name":"ebc45331-ddb7-4801-be91-f23288c05447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b074bea-caac-469b-9dc8-35be1593a7aa","name":"4b074bea-caac-469b-9dc8-35be1593a7aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebc45331-ddb7-4801-be91-f23288c05447","name":"ebc45331-ddb7-4801-be91-f23288c05447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b074bea-caac-469b-9dc8-35be1593a7aa","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ff55be1-b90d-4d5d-baed-3a98a57c2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebc45331-ddb7-4801-be91-f23288c05447","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44283d58-d9c9-4ca2-ac9d-2477d311bd16","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b074bea-caac-469b-9dc8-35be1593a7aa","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ff55be1-b90d-4d5d-baed-3a98a57c2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebc45331-ddb7-4801-be91-f23288c05447","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44283d58-d9c9-4ca2-ac9d-2477d311bd16","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_purity_seal/spr_purity_seal.yy b/sprites/spr_purity_seal/spr_purity_seal.yy index 08105fcd98..cedf7af02f 100644 --- a/sprites/spr_purity_seal/spr_purity_seal.yy +++ b/sprites/spr_purity_seal/spr_purity_seal.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purity_seal", "bboxMode":0, "bbox_bottom":34, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"595ff173-4df7-4f84-aebc-576f91f18c23","name":"595ff173-4df7-4f84-aebc-576f91f18c23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40957cfc-9310-4d3e-82de-89b771ac8e99","name":"40957cfc-9310-4d3e-82de-89b771ac8e99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd65f936-1dae-4e5a-a681-a5d359010378","name":"cd65f936-1dae-4e5a-a681-a5d359010378","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"595ff173-4df7-4f84-aebc-576f91f18c23","name":"595ff173-4df7-4f84-aebc-576f91f18c23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40957cfc-9310-4d3e-82de-89b771ac8e99","name":"40957cfc-9310-4d3e-82de-89b771ac8e99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd65f936-1dae-4e5a-a681-a5d359010378","name":"cd65f936-1dae-4e5a-a681-a5d359010378","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41685129-d244-497a-a3e8-0e14686d6982","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"595ff173-4df7-4f84-aebc-576f91f18c23","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cdca2c2b-2c35-469c-8ef2-2c9abf1ee822","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40957cfc-9310-4d3e-82de-89b771ac8e99","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4fb4474-fd47-425f-9aa4-3f8a7dc7647b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd65f936-1dae-4e5a-a681-a5d359010378","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd004756-0650-4537-8065-75fdb6c773e5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41685129-d244-497a-a3e8-0e14686d6982","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"595ff173-4df7-4f84-aebc-576f91f18c23","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cdca2c2b-2c35-469c-8ef2-2c9abf1ee822","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40957cfc-9310-4d3e-82de-89b771ac8e99","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4fb4474-fd47-425f-9aa4-3f8a7dc7647b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd65f936-1dae-4e5a-a681-a5d359010378","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd004756-0650-4537-8065-75fdb6c773e5","IsCreationKey":false,"Key":3.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_rack/spr_rack.yy b/sprites/spr_rack/spr_rack.yy index 3f07d72ebc..a2ee56947e 100644 --- a/sprites/spr_rack/spr_rack.yy +++ b/sprites/spr_rack/spr_rack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rack", "bboxMode":0, "bbox_bottom":55, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"200951dc-976d-43f5-b63c-55247595c3c4","name":"200951dc-976d-43f5-b63c-55247595c3c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"200951dc-976d-43f5-b63c-55247595c3c4","name":"200951dc-976d-43f5-b63c-55247595c3c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a18159c-4459-42a4-8c29-8f30e8382d64","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db36723d-e503-4b00-b23e-b55a501c4a13","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"200951dc-976d-43f5-b63c-55247595c3c4","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2bb5956b-927a-43e4-a043-90eeca134dbe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a18159c-4459-42a4-8c29-8f30e8382d64","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db36723d-e503-4b00-b23e-b55a501c4a13","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"200951dc-976d-43f5-b63c-55247595c3c4","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2bb5956b-927a-43e4-a043-90eeca134dbe","IsCreationKey":false,"Key":2.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_rack_and_pinion/spr_rack_and_pinion.yy b/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy index bdb3d387c7..dc149d7efa 100644 --- a/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy +++ b/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rack_and_pinion", "bboxMode":0, "bbox_bottom":98, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"77b808e9-cf80-4505-82f1-e7844a0e438e","name":"77b808e9-cf80-4505-82f1-e7844a0e438e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77b808e9-cf80-4505-82f1-e7844a0e438e","name":"77b808e9-cf80-4505-82f1-e7844a0e438e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c4e1e22-99f3-45f0-bbc7-9ffbbcc84d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77b808e9-cf80-4505-82f1-e7844a0e438e","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4d8925e-44b2-47d5-821b-ce6c5b56c499","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c4e1e22-99f3-45f0-bbc7-9ffbbcc84d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"77b808e9-cf80-4505-82f1-e7844a0e438e","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4d8925e-44b2-47d5-821b-ce6c5b56c499","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_raid/spr_raid.yy b/sprites/spr_raid/spr_raid.yy index f0e636ae43..d60da68ecf 100644 --- a/sprites/spr_raid/spr_raid.yy +++ b/sprites/spr_raid/spr_raid.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_raid", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_railgun/spr_railgun.yy b/sprites/spr_railgun/spr_railgun.yy index dba93f0a9c..654ba1e2e0 100644 --- a/sprites/spr_railgun/spr_railgun.yy +++ b/sprites/spr_railgun/spr_railgun.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_railgun", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","path":"sprites/spr_railgun/spr_railgun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3e8013e-d7cb-4e2f-99bf-b1d015a71030","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","path":"sprites/spr_railgun/spr_railgun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3e8013e-d7cb-4e2f-99bf-b1d015a71030","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_rectangle/spr_rectangle.yy b/sprites/spr_rectangle/spr_rectangle.yy index 08bb52c75b..ba18df5be6 100644 --- a/sprites/spr_rectangle/spr_rectangle.yy +++ b/sprites/spr_rectangle/spr_rectangle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rectangle", "bboxMode":0, "bbox_bottom":63, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","path":"sprites/spr_rectangle/spr_rectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a5922e9-fdf9-46ba-9e50-4e975a5185b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","path":"sprites/spr_rectangle/spr_rectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a5922e9-fdf9-46ba-9e50-4e975a5185b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_red_button/spr_red_button.yy b/sprites/spr_red_button/spr_red_button.yy index b8897ea438..f7eea4e5dd 100644 --- a/sprites/spr_red_button/spr_red_button.yy +++ b/sprites/spr_red_button/spr_red_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_red_button", "bboxMode":0, "bbox_bottom":14, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42d4f096-7a12-431c-b52e-70dfab70905b","name":"42d4f096-7a12-431c-b52e-70dfab70905b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b40951a-6001-451b-9b42-d414988c9166","name":"2b40951a-6001-451b-9b42-d414988c9166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42d4f096-7a12-431c-b52e-70dfab70905b","name":"42d4f096-7a12-431c-b52e-70dfab70905b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b40951a-6001-451b-9b42-d414988c9166","name":"2b40951a-6001-451b-9b42-d414988c9166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c65371fa-e5df-4e1a-aa5f-0d7a9c9d5caa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42d4f096-7a12-431c-b52e-70dfab70905b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"977e278b-9d59-4a1e-bc3a-10e616a2eb1a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cce11ad7-1ee4-42c4-8f05-d1a8b12225ee","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a19fad0-1940-464a-9ac4-65537e18eba6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b40951a-6001-451b-9b42-d414988c9166","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d65637f-4e2b-4d02-b19a-4160209998dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c65371fa-e5df-4e1a-aa5f-0d7a9c9d5caa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42d4f096-7a12-431c-b52e-70dfab70905b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"977e278b-9d59-4a1e-bc3a-10e616a2eb1a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cce11ad7-1ee4-42c4-8f05-d1a8b12225ee","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a19fad0-1940-464a-9ac4-65537e18eba6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b40951a-6001-451b-9b42-d414988c9166","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d65637f-4e2b-4d02-b19a-4160209998dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_requisition/spr_requisition.yy b/sprites/spr_requisition/spr_requisition.yy index c0dc9d03ca..314359ae77 100644 --- a/sprites/spr_requisition/spr_requisition.yy +++ b/sprites/spr_requisition/spr_requisition.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_requisition", "bboxMode":0, "bbox_bottom":12, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","path":"sprites/spr_requisition/spr_requisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f22ebed-4e20-47f6-8189-3f42d1a5f4d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","path":"sprites/spr_requisition/spr_requisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f22ebed-4e20-47f6-8189-3f42d1a5f4d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_research_bar/spr_research_bar.yy b/sprites/spr_research_bar/spr_research_bar.yy index 0916d96065..879f57927b 100644 --- a/sprites/spr_research_bar/spr_research_bar.yy +++ b/sprites/spr_research_bar/spr_research_bar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_research_bar", "bboxMode":0, "bbox_bottom":361, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cd763fd7-8004-4d62-bc1a-be3268cef684","name":"cd763fd7-8004-4d62-bc1a-be3268cef684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5b48025-2525-46d9-8c75-c549648ded91","name":"d5b48025-2525-46d9-8c75-c549648ded91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd763fd7-8004-4d62-bc1a-be3268cef684","name":"cd763fd7-8004-4d62-bc1a-be3268cef684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5b48025-2525-46d9-8c75-c549648ded91","name":"d5b48025-2525-46d9-8c75-c549648ded91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd763fd7-8004-4d62-bc1a-be3268cef684","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"805a2c94-7484-4778-84be-453aa5d791f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"938b49cd-3ce1-4611-8b7b-36691b2a339e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5b48025-2525-46d9-8c75-c549648ded91","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ce8ad41-35df-4164-ba8e-1d0ad7fc40a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd763fd7-8004-4d62-bc1a-be3268cef684","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"805a2c94-7484-4778-84be-453aa5d791f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"938b49cd-3ce1-4611-8b7b-36691b2a339e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5b48025-2525-46d9-8c75-c549648ded91","path":"sprites/spr_research_bar/spr_research_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ce8ad41-35df-4164-ba8e-1d0ad7fc40a5","IsCreationKey":false,"Key":2.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_rg_mk5_helm/spr_rg_mk5_helm.yy b/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy index 636ae54657..d8ec7e0dc2 100644 --- a/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy +++ b/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rg_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2c0915b1-4f26-423a-a956-3a0630133ae1","name":"2c0915b1-4f26-423a-a956-3a0630133ae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72defa52-0aba-434c-b51c-01507cb45ea6","name":"72defa52-0aba-434c-b51c-01507cb45ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c0915b1-4f26-423a-a956-3a0630133ae1","name":"2c0915b1-4f26-423a-a956-3a0630133ae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72defa52-0aba-434c-b51c-01507cb45ea6","name":"72defa52-0aba-434c-b51c-01507cb45ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c0915b1-4f26-423a-a956-3a0630133ae1","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f67310a-5e8a-43c9-8389-ba3149221012","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72defa52-0aba-434c-b51c-01507cb45ea6","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6fcdc1b7-dc3c-43c9-8b6a-16e91f98fa20","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c0915b1-4f26-423a-a956-3a0630133ae1","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f67310a-5e8a-43c9-8389-ba3149221012","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72defa52-0aba-434c-b51c-01507cb45ea6","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6fcdc1b7-dc3c-43c9-8b6a-16e91f98fa20","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_rg_mk6_helm/spr_rg_mk6_helm.yy b/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy index 25f60bf307..10e5e6ca30 100644 --- a/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy +++ b/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rg_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f1677e0-0f38-4f52-a627-47e4289d2362","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b689ef9-d60a-4607-8763-a4787092f4c9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f1677e0-0f38-4f52-a627-47e4289d2362","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b689ef9-d60a-4607-8763-a4787092f4c9","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_rg_mk7_helm/spr_rg_mk7_helm.yy b/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy index 20583297a0..7f829e9dd6 100644 --- a/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy +++ b/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rg_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d180ba81-7586-41b6-a6d4-50590e5bf476","name":"d180ba81-7586-41b6-a6d4-50590e5bf476","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"035dc48e-d054-4138-99c1-3c0ba9933028","name":"035dc48e-d054-4138-99c1-3c0ba9933028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d180ba81-7586-41b6-a6d4-50590e5bf476","name":"d180ba81-7586-41b6-a6d4-50590e5bf476","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"035dc48e-d054-4138-99c1-3c0ba9933028","name":"035dc48e-d054-4138-99c1-3c0ba9933028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d180ba81-7586-41b6-a6d4-50590e5bf476","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6daeef45-8813-4e6d-9ef8-7612a88be84c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"035dc48e-d054-4138-99c1-3c0ba9933028","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88334651-7f26-4851-be94-2d5a48c4c788","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d180ba81-7586-41b6-a6d4-50590e5bf476","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6daeef45-8813-4e6d-9ef8-7612a88be84c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"035dc48e-d054-4138-99c1-3c0ba9933028","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88334651-7f26-4851-be94-2d5a48c4c788","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_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy b/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy index b33eb95a2f..0d5a461ced 100644 --- a/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy +++ b/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_right_pauldron_chainmail", "bboxMode":0, "bbox_bottom":101, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -90,9 +84,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy b/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy index 12ded5c93d..e9c5e959a5 100644 --- a/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy +++ b/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_right_pauldron_fur_hanging", "bboxMode":0, "bbox_bottom":117, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -38,13 +38,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -94,18 +88,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33d2e335-5dc5-4789-8de3-f0a1d7cd31eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a12ed751-04fc-4209-ac99-48bcdbbc6165","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e69e0ac3-f154-4767-862b-5fa127764071","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fa8ac9e-2744-463d-8742-e306d24015c5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33d2e335-5dc5-4789-8de3-f0a1d7cd31eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a12ed751-04fc-4209-ac99-48bcdbbc6165","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e69e0ac3-f154-4767-862b-5fa127764071","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fa8ac9e-2744-463d-8742-e306d24015c5","IsCreationKey":false,"Key":3.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_right_shin_spikes/spr_right_shin_spikes.yy b/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy index f7253930c9..a9ed516189 100644 --- a/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy +++ b/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_right_shin_spikes", "bboxMode":0, "bbox_bottom":199, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_rock_bg/spr_rock_bg.yy b/sprites/spr_rock_bg/spr_rock_bg.yy index 321f668fc0..a9eed43a6c 100644 --- a/sprites/spr_rock_bg/spr_rock_bg.yy +++ b/sprites/spr_rock_bg/spr_rock_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rock_bg", "bboxMode":0, "bbox_bottom":899, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","path":"sprites/spr_rock_bg/spr_rock_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2c8c984-e1ff-4038-9274-cae4d4aba40d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","path":"sprites/spr_rock_bg/spr_rock_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2c8c984-e1ff-4038-9274-cae4d4aba40d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_rocket/spr_rocket.yy b/sprites/spr_rocket/spr_rocket.yy index e867945c85..dd6b45a0d3 100644 --- a/sprites/spr_rocket/spr_rocket.yy +++ b/sprites/spr_rocket/spr_rocket.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rocket", "bboxMode":0, "bbox_bottom":2, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1f991b9-5dd3-499c-bcf3-a5e1a9a9dd46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72f52d58-18c4-4aee-8d08-559c984219a0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1f991b9-5dd3-499c-bcf3-a5e1a9a9dd46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72f52d58-18c4-4aee-8d08-559c984219a0","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":{ diff --git a/sprites/spr_rocket_ork/spr_rocket_ork.yy b/sprites/spr_rocket_ork/spr_rocket_ork.yy index 7c2df176de..f3c4c9d32f 100644 --- a/sprites/spr_rocket_ork/spr_rocket_ork.yy +++ b/sprites/spr_rocket_ork/spr_rocket_ork.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rocket_ork", "bboxMode":0, "bbox_bottom":3, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","path":"sprites/spr_rocket_ork/spr_rocket_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7edaff64-0a68-4835-9f47-726e08bf1f2c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","path":"sprites/spr_rocket_ork/spr_rocket_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7edaff64-0a68-4835-9f47-726e08bf1f2c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_rocket_whirl/spr_rocket_whirl.yy b/sprites/spr_rocket_whirl/spr_rocket_whirl.yy index 830a098fc1..cc163cea5c 100644 --- a/sprites/spr_rocket_whirl/spr_rocket_whirl.yy +++ b/sprites/spr_rocket_whirl/spr_rocket_whirl.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rocket_whirl", "bboxMode":0, "bbox_bottom":3, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","path":"sprites/spr_rocket_whirl/spr_rocket_whirl.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfd43af1-35a8-43b8-98e6-2b1a7a9f9aa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","path":"sprites/spr_rocket_whirl/spr_rocket_whirl.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfd43af1-35a8-43b8-98e6-2b1a7a9f9aa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy index eee2f59f99..8e7ef3fb82 100644 --- a/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy +++ b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_roman_centurian_crest", "bboxMode":0, "bbox_bottom":87, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93ba81df-88f2-4d08-9f82-8e78097802e9","name":"93ba81df-88f2-4d08-9f82-8e78097802e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93ba81df-88f2-4d08-9f82-8e78097802e9","name":"93ba81df-88f2-4d08-9f82-8e78097802e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"508f7cdc-6556-4fd2-ae19-caa00fdda7cd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"081e45b1-f437-4ec9-bca2-4b4d5bd6000f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ba81df-88f2-4d08-9f82-8e78097802e9","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c11e64b-0ad4-4a34-a388-29e5e02054b8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"508f7cdc-6556-4fd2-ae19-caa00fdda7cd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"081e45b1-f437-4ec9-bca2-4b4d5bd6000f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ba81df-88f2-4d08-9f82-8e78097802e9","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c11e64b-0ad4-4a34-a388-29e5e02054b8","IsCreationKey":false,"Key":2.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_roman_cloak/spr_roman_cloak.yy b/sprites/spr_roman_cloak/spr_roman_cloak.yy index 67d20f28ba..d1fe356077 100644 --- a/sprites/spr_roman_cloak/spr_roman_cloak.yy +++ b/sprites/spr_roman_cloak/spr_roman_cloak.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_roman_cloak", "bboxMode":0, "bbox_bottom":198, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_roman_cloak/spr_roman_cloak.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"60ec27ae-3716-4f2f-bedd-ecb89a562808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_roman_cloak/spr_roman_cloak.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"60ec27ae-3716-4f2f-bedd-ecb89a562808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_roman_tabbard/spr_roman_tabbard.yy b/sprites/spr_roman_tabbard/spr_roman_tabbard.yy index d9a1bdc2ad..41e56a2f11 100644 --- a/sprites/spr_roman_tabbard/spr_roman_tabbard.yy +++ b/sprites/spr_roman_tabbard/spr_roman_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_roman_tabbard", "bboxMode":0, "bbox_bottom":167, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"438faf08-020c-4bdf-a878-8a0b45400e3a","name":"438faf08-020c-4bdf-a878-8a0b45400e3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b829e070-a074-46e9-8d94-6507222cc796","name":"b829e070-a074-46e9-8d94-6507222cc796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"438faf08-020c-4bdf-a878-8a0b45400e3a","name":"438faf08-020c-4bdf-a878-8a0b45400e3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b829e070-a074-46e9-8d94-6507222cc796","name":"b829e070-a074-46e9-8d94-6507222cc796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"438faf08-020c-4bdf-a878-8a0b45400e3a","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e16b319-3f1e-426c-b41e-a1334b774b27","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc2b5276-f541-4905-907d-6ff1d1db896d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b829e070-a074-46e9-8d94-6507222cc796","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"236d0bfc-7eb0-434a-936b-b17f5ed52954","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"438faf08-020c-4bdf-a878-8a0b45400e3a","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e16b319-3f1e-426c-b41e-a1334b774b27","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc2b5276-f541-4905-907d-6ff1d1db896d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b829e070-a074-46e9-8d94-6507222cc796","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"236d0bfc-7eb0-434a-936b-b17f5ed52954","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":3.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_round/spr_round.yy b/sprites/spr_round/spr_round.yy index 49fdb14d54..6764226735 100644 --- a/sprites/spr_round/spr_round.yy +++ b/sprites/spr_round/spr_round.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_round", "bboxMode":0, "bbox_bottom":4, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a689993-189b-4e77-b0e3-ce46b98da50f","name":"8a689993-189b-4e77-b0e3-ce46b98da50f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a689993-189b-4e77-b0e3-ce46b98da50f","name":"8a689993-189b-4e77-b0e3-ce46b98da50f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a689993-189b-4e77-b0e3-ce46b98da50f","path":"sprites/spr_round/spr_round.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3404087c-38fe-4166-a339-626d9a1dbf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a689993-189b-4e77-b0e3-ce46b98da50f","path":"sprites/spr_round/spr_round.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3404087c-38fe-4166-a339-626d9a1dbf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_runes_hanging/spr_runes_hanging.yy b/sprites/spr_runes_hanging/spr_runes_hanging.yy index 39a9060978..fa7278b636 100644 --- a/sprites/spr_runes_hanging/spr_runes_hanging.yy +++ b/sprites/spr_runes_hanging/spr_runes_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_runes_hanging", "bboxMode":0, "bbox_bottom":33, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8063ca68-f497-45e7-a395-cefa25b8634d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0030ce9b-8b1d-4287-8146-0ee5744db08f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b42a06ce-b79c-4c9f-91f7-7f2f50d3f451","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8063ca68-f497-45e7-a395-cefa25b8634d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0030ce9b-8b1d-4287-8146-0ee5744db08f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b42a06ce-b79c-4c9f-91f7-7f2f50d3f451","IsCreationKey":false,"Key":2.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_runi/spr_runi.yy b/sprites/spr_runi/spr_runi.yy index 3d0e4f22d6..fa007b6c48 100644 --- a/sprites/spr_runi/spr_runi.yy +++ b/sprites/spr_runi/spr_runi.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_runi", "bboxMode":0, "bbox_bottom":594, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","path":"sprites/spr_runi/spr_runi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"12a9f26e-4b5b-4a77-94da-1a7dcb969626","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","path":"sprites/spr_runi/spr_runi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"12a9f26e-4b5b-4a77-94da-1a7dcb969626","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy b/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy index 091d0159f2..3d51596537 100644 --- a/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy +++ b/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sal_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2f64d54a-0827-4814-aa34-420768d2e26f","name":"2f64d54a-0827-4814-aa34-420768d2e26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eddeafd5-5003-4157-91a2-8d4836dd19da","name":"eddeafd5-5003-4157-91a2-8d4836dd19da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f64d54a-0827-4814-aa34-420768d2e26f","name":"2f64d54a-0827-4814-aa34-420768d2e26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eddeafd5-5003-4157-91a2-8d4836dd19da","name":"eddeafd5-5003-4157-91a2-8d4836dd19da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f64d54a-0827-4814-aa34-420768d2e26f","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11e32477-62a6-4221-aed9-7427cfef7d74","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eddeafd5-5003-4157-91a2-8d4836dd19da","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f67fbbb-e174-495e-8ddd-953b11ba345d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f64d54a-0827-4814-aa34-420768d2e26f","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11e32477-62a6-4221-aed9-7427cfef7d74","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eddeafd5-5003-4157-91a2-8d4836dd19da","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f67fbbb-e174-495e-8ddd-953b11ba345d","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_sal_mk6_helm/spr_sal_mk6_helm.yy b/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy index 3c76fb79aa..2cf8084790 100644 --- a/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy +++ b/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sal_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"179171d0-8a6b-49c9-aaf5-cf15c1fe2765","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc8b1087-d55f-49fb-8979-f211b1113861","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"179171d0-8a6b-49c9-aaf5-cf15c1fe2765","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc8b1087-d55f-49fb-8979-f211b1113861","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_sal_mk7_helm/spr_sal_mk7_helm.yy b/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy index f586bafef3..f12df3e139 100644 --- a/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy +++ b/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sal_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98f7ee0d-de6c-40e4-bea8-5cdb875c68aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f71d9fe5-e2bc-451e-8e76-ddc75512c23e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98f7ee0d-de6c-40e4-bea8-5cdb875c68aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f71d9fe5-e2bc-451e-8e76-ddc75512c23e","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_sanguin_guard/spr_sanguin_guard.yy b/sprites/spr_sanguin_guard/spr_sanguin_guard.yy index 6d290489db..803d21a215 100644 --- a/sprites/spr_sanguin_guard/spr_sanguin_guard.yy +++ b/sprites/spr_sanguin_guard/spr_sanguin_guard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sanguin_guard", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d39ed2e-1e13-4613-90de-a21b28017808","name":"1d39ed2e-1e13-4613-90de-a21b28017808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e84cd8e-d989-4364-8931-044b097b2c0b","name":"6e84cd8e-d989-4364-8931-044b097b2c0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d39ed2e-1e13-4613-90de-a21b28017808","name":"1d39ed2e-1e13-4613-90de-a21b28017808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e84cd8e-d989-4364-8931-044b097b2c0b","name":"6e84cd8e-d989-4364-8931-044b097b2c0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d39ed2e-1e13-4613-90de-a21b28017808","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46b887ed-d41d-4816-934e-b3d81925b4ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e84cd8e-d989-4364-8931-044b097b2c0b","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41a96470-a2cc-4913-89ba-084ca5b95be3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d39ed2e-1e13-4613-90de-a21b28017808","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46b887ed-d41d-4816-934e-b3d81925b4ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e84cd8e-d989-4364-8931-044b097b2c0b","path":"sprites/spr_sanguin_guard/spr_sanguin_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41a96470-a2cc-4913-89ba-084ca5b95be3","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_save_data/spr_save_data.yy b/sprites/spr_save_data/spr_save_data.yy index 05029a0881..0299fd0e30 100644 --- a/sprites/spr_save_data/spr_save_data.yy +++ b/sprites/spr_save_data/spr_save_data.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_data", "bboxMode":0, "bbox_bottom":148, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa10b32e-1760-4f33-a7de-ab420904efee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9ce4746-507b-478b-abb0-c66f8a91886a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa10b32e-1760-4f33-a7de-ab420904efee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9ce4746-507b-478b-abb0-c66f8a91886a","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":{ diff --git a/sprites/spr_save_footer/spr_save_footer.yy b/sprites/spr_save_footer/spr_save_footer.yy index d747c49060..eebb11ce8c 100644 --- a/sprites/spr_save_footer/spr_save_footer.yy +++ b/sprites/spr_save_footer/spr_save_footer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_footer", "bboxMode":0, "bbox_bottom":22, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7fac7063-30a5-452e-9407-1c9ff0a74081","name":"7fac7063-30a5-452e-9407-1c9ff0a74081","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fac7063-30a5-452e-9407-1c9ff0a74081","name":"7fac7063-30a5-452e-9407-1c9ff0a74081","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fac7063-30a5-452e-9407-1c9ff0a74081","path":"sprites/spr_save_footer/spr_save_footer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1dc09db-0d3d-47f3-95ad-8da60232d5c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fac7063-30a5-452e-9407-1c9ff0a74081","path":"sprites/spr_save_footer/spr_save_footer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1dc09db-0d3d-47f3-95ad-8da60232d5c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_save_header/spr_save_header.yy b/sprites/spr_save_header/spr_save_header.yy index 9026f30431..38d593c5e8 100644 --- a/sprites/spr_save_header/spr_save_header.yy +++ b/sprites/spr_save_header/spr_save_header.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_header", "bboxMode":0, "bbox_bottom":121, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","path":"sprites/spr_save_header/spr_save_header.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dea20569-1407-453c-ad16-91a5dccef40c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","path":"sprites/spr_save_header/spr_save_header.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dea20569-1407-453c-ad16-91a5dccef40c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_save_headers/spr_save_headers.yy b/sprites/spr_save_headers/spr_save_headers.yy index d9d16c670c..b8a5fa4240 100644 --- a/sprites/spr_save_headers/spr_save_headers.yy +++ b/sprites/spr_save_headers/spr_save_headers.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_headers", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4265250d-287d-4acb-8680-f4646fa0c8ac","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38bad956-b039-4cbb-9d79-eff1f3f84425","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4265250d-287d-4acb-8680-f4646fa0c8ac","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38bad956-b039-4cbb-9d79-eff1f3f84425","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_saveload/spr_saveload.yy b/sprites/spr_saveload/spr_saveload.yy index 13a4b6ef27..56f23f4d44 100644 --- a/sprites/spr_saveload/spr_saveload.yy +++ b/sprites/spr_saveload/spr_saveload.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_saveload", "bboxMode":0, "bbox_bottom":134, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b8e32215-7622-4eef-af7b-824e15be42d2","name":"b8e32215-7622-4eef-af7b-824e15be42d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b8e32215-7622-4eef-af7b-824e15be42d2","name":"b8e32215-7622-4eef-af7b-824e15be42d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8e32215-7622-4eef-af7b-824e15be42d2","path":"sprites/spr_saveload/spr_saveload.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"813303e0-d3ae-424e-b769-32da363af5c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8e32215-7622-4eef-af7b-824e15be42d2","path":"sprites/spr_saveload/spr_saveload.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"813303e0-d3ae-424e-b769-32da363af5c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_scout_arms/spr_scout_arms.yy b/sprites/spr_scout_arms/spr_scout_arms.yy index f4bc0468e8..ace7e27f01 100644 --- a/sprites/spr_scout_arms/spr_scout_arms.yy +++ b/sprites/spr_scout_arms/spr_scout_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_arms", "bboxMode":0, "bbox_bottom":148, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6bc053b-c894-460e-ac79-cd852f23c9c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41583aef-5412-457d-9744-f18a930b7a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6bc053b-c894-460e-ac79-cd852f23c9c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41583aef-5412-457d-9744-f18a930b7a7c","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_scout_colors/spr_scout_colors.yy b/sprites/spr_scout_colors/spr_scout_colors.yy index c2d62c1425..40dae1500a 100644 --- a/sprites/spr_scout_colors/spr_scout_colors.yy +++ b/sprites/spr_scout_colors/spr_scout_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_colors", "bboxMode":0, "bbox_bottom":224, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef0f181d-ac35-46c7-a638-d4505b813415","name":"ef0f181d-ac35-46c7-a638-d4505b813415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"955d0257-722c-4028-932b-5740aecc7d30","name":"955d0257-722c-4028-932b-5740aecc7d30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6da1856-79f0-4a6f-940c-bf95033834d1","name":"a6da1856-79f0-4a6f-940c-bf95033834d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48e52af8-1443-4d50-8ab3-941caf166149","name":"48e52af8-1443-4d50-8ab3-941caf166149","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e57071a6-5e15-446b-85b0-c663e938470c","name":"e57071a6-5e15-446b-85b0-c663e938470c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf79f59c-ee61-423f-8697-26acae0d7361","name":"cf79f59c-ee61-423f-8697-26acae0d7361","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38579090-ad10-4741-9b4a-7c6478e31a26","name":"38579090-ad10-4741-9b4a-7c6478e31a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef0f181d-ac35-46c7-a638-d4505b813415","name":"ef0f181d-ac35-46c7-a638-d4505b813415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"955d0257-722c-4028-932b-5740aecc7d30","name":"955d0257-722c-4028-932b-5740aecc7d30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6da1856-79f0-4a6f-940c-bf95033834d1","name":"a6da1856-79f0-4a6f-940c-bf95033834d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48e52af8-1443-4d50-8ab3-941caf166149","name":"48e52af8-1443-4d50-8ab3-941caf166149","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e57071a6-5e15-446b-85b0-c663e938470c","name":"e57071a6-5e15-446b-85b0-c663e938470c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf79f59c-ee61-423f-8697-26acae0d7361","name":"cf79f59c-ee61-423f-8697-26acae0d7361","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38579090-ad10-4741-9b4a-7c6478e31a26","name":"38579090-ad10-4741-9b4a-7c6478e31a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d5d4c8b-01fd-4390-8694-cf9ddd810069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef0f181d-ac35-46c7-a638-d4505b813415","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4aa7b4ca-0c75-457b-a50f-13d5f19245cb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"955d0257-722c-4028-932b-5740aecc7d30","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe7f9372-79c7-437e-bbb4-7790f934e59e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c507679e-8f8a-4ef4-8222-1b9ce635927b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da1856-79f0-4a6f-940c-bf95033834d1","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a84c13f-6866-4eec-8bae-6be7cb7a0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e52af8-1443-4d50-8ab3-941caf166149","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de2bac43-95c3-4de0-83e3-8f3de63440d4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"147bd5ab-89e6-4a62-bfdc-8349bdc18418","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e57071a6-5e15-446b-85b0-c663e938470c","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff8965c0-516f-4910-be5f-29bbda2b7dad","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"17242221-c2eb-40aa-9597-b0fe258a7de0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf79f59c-ee61-423f-8697-26acae0d7361","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91cb7282-2dc4-44bc-8b17-2f5588596a4e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cb8dde6-007f-4ada-a643-60e7a3e8795d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38579090-ad10-4741-9b4a-7c6478e31a26","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d40f65ca-ce19-40f9-9564-74c25672707f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d5d4c8b-01fd-4390-8694-cf9ddd810069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef0f181d-ac35-46c7-a638-d4505b813415","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4aa7b4ca-0c75-457b-a50f-13d5f19245cb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"955d0257-722c-4028-932b-5740aecc7d30","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe7f9372-79c7-437e-bbb4-7790f934e59e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c507679e-8f8a-4ef4-8222-1b9ce635927b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da1856-79f0-4a6f-940c-bf95033834d1","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a84c13f-6866-4eec-8bae-6be7cb7a0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e52af8-1443-4d50-8ab3-941caf166149","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de2bac43-95c3-4de0-83e3-8f3de63440d4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"147bd5ab-89e6-4a62-bfdc-8349bdc18418","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e57071a6-5e15-446b-85b0-c663e938470c","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff8965c0-516f-4910-be5f-29bbda2b7dad","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"17242221-c2eb-40aa-9597-b0fe258a7de0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf79f59c-ee61-423f-8697-26acae0d7361","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91cb7282-2dc4-44bc-8b17-2f5588596a4e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cb8dde6-007f-4ada-a643-60e7a3e8795d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38579090-ad10-4741-9b4a-7c6478e31a26","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d40f65ca-ce19-40f9-9564-74c25672707f","IsCreationKey":false,"Key":11.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_scout_complex/spr_scout_complex.yy b/sprites/spr_scout_complex/spr_scout_complex.yy index cd69b27854..21cd9ea9e4 100644 --- a/sprites/spr_scout_complex/spr_scout_complex.yy +++ b/sprites/spr_scout_complex/spr_scout_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_complex", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_complex/spr_scout_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c74f3d25-50a8-4016-8372-0d7a2c479225","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_complex/spr_scout_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c74f3d25-50a8-4016-8372-0d7a2c479225","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_scout_heads/spr_scout_heads.yy b/sprites/spr_scout_heads/spr_scout_heads.yy index 05336f619e..3953dba83f 100644 --- a/sprites/spr_scout_heads/spr_scout_heads.yy +++ b/sprites/spr_scout_heads/spr_scout_heads.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_heads", "bboxMode":0, "bbox_bottom":62, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f983ac49-49e4-493b-a33e-522f5e49f625","name":"f983ac49-49e4-493b-a33e-522f5e49f625","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84beb665-cb67-4e10-8b97-8a016f610d39","name":"84beb665-cb67-4e10-8b97-8a016f610d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f983ac49-49e4-493b-a33e-522f5e49f625","name":"f983ac49-49e4-493b-a33e-522f5e49f625","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84beb665-cb67-4e10-8b97-8a016f610d39","name":"84beb665-cb67-4e10-8b97-8a016f610d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f983ac49-49e4-493b-a33e-522f5e49f625","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1556974-823e-42d5-aab9-580ae03ef33e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84beb665-cb67-4e10-8b97-8a016f610d39","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a8357cc-4b19-4835-bf07-8e4e579ef6de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f983ac49-49e4-493b-a33e-522f5e49f625","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1556974-823e-42d5-aab9-580ae03ef33e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84beb665-cb67-4e10-8b97-8a016f610d39","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a8357cc-4b19-4835-bf07-8e4e579ef6de","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_scout_left/spr_scout_left.yy b/sprites/spr_scout_left/spr_scout_left.yy index 52766f5ab0..1ea10a311d 100644 --- a/sprites/spr_scout_left/spr_scout_left.yy +++ b/sprites/spr_scout_left/spr_scout_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_left", "bboxMode":0, "bbox_bottom":148, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_left/spr_scout_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a267d99-aaba-41f0-b003-f0a2fb5b595d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_left/spr_scout_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a267d99-aaba-41f0-b003-f0a2fb5b595d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_scout_new/spr_scout_new.yy b/sprites/spr_scout_new/spr_scout_new.yy index 62630facc7..e7a7e1bfcc 100644 --- a/sprites/spr_scout_new/spr_scout_new.yy +++ b/sprites/spr_scout_new/spr_scout_new.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_new", "bboxMode":0, "bbox_bottom":231, @@ -12,15 +12,15 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82f2cb7a-a266-4656-8a58-99ba2e420640","name":"82f2cb7a-a266-4656-8a58-99ba2e420640","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df188ab0-15cc-489f-be4e-3c05681254e5","name":"df188ab0-15cc-489f-be4e-3c05681254e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82f2cb7a-a266-4656-8a58-99ba2e420640","name":"82f2cb7a-a266-4656-8a58-99ba2e420640","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df188ab0-15cc-489f-be4e-3c05681254e5","name":"df188ab0-15cc-489f-be4e-3c05681254e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,33 +78,15 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b31af662-ba1d-4d27-9df0-c883a9cb9df0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b9777d1-7fcc-4592-8be4-75b3800b827d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"162b08ca-f2e2-49d1-9537-d39b34544a88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb4566d4-91b3-4db5-afc7-614fdcb9f276","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4849c4a7-07d6-40bc-99df-fba446ffb063","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"321ec812-a02f-41e5-b397-5d2b32198c0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2c8eee3-df35-4327-9c95-9f658774bdfa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82f2cb7a-a266-4656-8a58-99ba2e420640","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31a14009-85d3-47a8-bdfb-d9f082fbb6da","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df188ab0-15cc-489f-be4e-3c05681254e5","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c225af2-ada9-46d5-8d46-9959e85fc393","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b31af662-ba1d-4d27-9df0-c883a9cb9df0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b9777d1-7fcc-4592-8be4-75b3800b827d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"162b08ca-f2e2-49d1-9537-d39b34544a88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb4566d4-91b3-4db5-afc7-614fdcb9f276","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4849c4a7-07d6-40bc-99df-fba446ffb063","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"321ec812-a02f-41e5-b397-5d2b32198c0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2c8eee3-df35-4327-9c95-9f658774bdfa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82f2cb7a-a266-4656-8a58-99ba2e420640","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31a14009-85d3-47a8-bdfb-d9f082fbb6da","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df188ab0-15cc-489f-be4e-3c05681254e5","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c225af2-ada9-46d5-8d46-9959e85fc393","IsCreationKey":false,"Key":8.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_scout_right/spr_scout_right.yy b/sprites/spr_scout_right/spr_scout_right.yy index dae1c22b31..a7fcff52de 100644 --- a/sprites/spr_scout_right/spr_scout_right.yy +++ b/sprites/spr_scout_right/spr_scout_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_right", "bboxMode":0, "bbox_bottom":148, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_right/spr_scout_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff644c2f-3222-44a3-9955-1166309280e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_right/spr_scout_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff644c2f-3222-44a3-9955-1166309280e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_servo_arm/spr_servo_arm.yy b/sprites/spr_servo_arm/spr_servo_arm.yy index d41a902fee..ec68a0573a 100644 --- a/sprites/spr_servo_arm/spr_servo_arm.yy +++ b/sprites/spr_servo_arm/spr_servo_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_servo_arm", "bboxMode":0, "bbox_bottom":84, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_arm/spr_servo_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5207aa92-d126-4f55-aa26-68a203e9ca4e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_arm/spr_servo_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5207aa92-d126-4f55-aa26-68a203e9ca4e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_servo_harness/spr_servo_harness.yy b/sprites/spr_servo_harness/spr_servo_harness.yy index f378056629..719d822d87 100644 --- a/sprites/spr_servo_harness/spr_servo_harness.yy +++ b/sprites/spr_servo_harness/spr_servo_harness.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_servo_harness", "bboxMode":0, "bbox_bottom":240, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd3a1e77-d409-44b9-b38b-b4a745e9b089","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd3a1e77-d409-44b9-b38b-b4a745e9b089","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_settings_bg/spr_settings_bg.yy b/sprites/spr_settings_bg/spr_settings_bg.yy index 7108fa64a0..48dca5d6f9 100644 --- a/sprites/spr_settings_bg/spr_settings_bg.yy +++ b/sprites/spr_settings_bg/spr_settings_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_settings_bg", "bboxMode":0, "bbox_bottom":899, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcfb2445-3d42-4b16-8d19-767110267766","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcfb2445-3d42-4b16-8d19-767110267766","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_settings_button/spr_settings_button.yy b/sprites/spr_settings_button/spr_settings_button.yy index 19f9cbf23e..bee2101d3d 100644 --- a/sprites/spr_settings_button/spr_settings_button.yy +++ b/sprites/spr_settings_button/spr_settings_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_settings_button", "bboxMode":0, "bbox_bottom":115, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","path":"sprites/spr_settings_button/spr_settings_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65dc51be-7c3a-43b6-8534-c0d168564495","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","path":"sprites/spr_settings_button/spr_settings_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65dc51be-7c3a-43b6-8534-c0d168564495","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_aconite/spr_ship_aconite.yy b/sprites/spr_ship_aconite/spr_ship_aconite.yy index 860ea93221..64b55a553d 100644 --- a/sprites/spr_ship_aconite/spr_ship_aconite.yy +++ b/sprites/spr_ship_aconite/spr_ship_aconite.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_aconite", "bboxMode":0, "bbox_bottom":28, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08b75cf2-26f5-4e6f-ad20-0821d2aa305a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08b75cf2-26f5-4e6f-ad20-0821d2aa305a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_ammer/spr_ship_ammer.yy b/sprites/spr_ship_ammer/spr_ship_ammer.yy index 0dbbc04d5f..e068e85c9c 100644 --- a/sprites/spr_ship_ammer/spr_ship_ammer.yy +++ b/sprites/spr_ship_ammer/spr_ship_ammer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_ammer", "bboxMode":0, "bbox_bottom":57, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aecbecdd-4094-46cf-8a12-6fa03388a226","name":"aecbecdd-4094-46cf-8a12-6fa03388a226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aecbecdd-4094-46cf-8a12-6fa03388a226","name":"aecbecdd-4094-46cf-8a12-6fa03388a226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aecbecdd-4094-46cf-8a12-6fa03388a226","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c02728c4-68e1-453f-8fa8-598ef2561c23","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aecbecdd-4094-46cf-8a12-6fa03388a226","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c02728c4-68e1-453f-8fa8-598ef2561c23","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_apoc/spr_ship_apoc.yy b/sprites/spr_ship_apoc/spr_ship_apoc.yy index 2c2faf3b7a..08ebbee5a5 100644 --- a/sprites/spr_ship_apoc/spr_ship_apoc.yy +++ b/sprites/spr_ship_apoc/spr_ship_apoc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_apoc", "bboxMode":0, "bbox_bottom":91, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_aven/spr_ship_aven.yy b/sprites/spr_ship_aven/spr_ship_aven.yy index 8e589bb085..54701be189 100644 --- a/sprites/spr_ship_aven/spr_ship_aven.yy +++ b/sprites/spr_ship_aven/spr_ship_aven.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_aven", "bboxMode":0, "bbox_bottom":59, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3b549580-f553-4212-b6bb-c41c3ff18e19","name":"3b549580-f553-4212-b6bb-c41c3ff18e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b549580-f553-4212-b6bb-c41c3ff18e19","name":"3b549580-f553-4212-b6bb-c41c3ff18e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b549580-f553-4212-b6bb-c41c3ff18e19","path":"sprites/spr_ship_aven/spr_ship_aven.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c4593dc-7dbb-404f-8004-0357ea802527","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b549580-f553-4212-b6bb-c41c3ff18e19","path":"sprites/spr_ship_aven/spr_ship_aven.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c4593dc-7dbb-404f-8004-0357ea802527","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_back_black/spr_ship_back_black.yy b/sprites/spr_ship_back_black/spr_ship_back_black.yy index d17a11420a..14a5f76c8d 100644 --- a/sprites/spr_ship_back_black/spr_ship_back_black.yy +++ b/sprites/spr_ship_back_black/spr_ship_back_black.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_back_black", "bboxMode":0, "bbox_bottom":116, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"41b410c3-01c1-440c-bd9d-40498f3ee679","name":"41b410c3-01c1-440c-bd9d-40498f3ee679","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f84f2a39-f16e-4874-809b-e99be35df387","name":"f84f2a39-f16e-4874-809b-e99be35df387","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f115bba-8dfa-467c-b850-6053b3321a30","name":"7f115bba-8dfa-467c-b850-6053b3321a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41b410c3-01c1-440c-bd9d-40498f3ee679","name":"41b410c3-01c1-440c-bd9d-40498f3ee679","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f84f2a39-f16e-4874-809b-e99be35df387","name":"f84f2a39-f16e-4874-809b-e99be35df387","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f115bba-8dfa-467c-b850-6053b3321a30","name":"7f115bba-8dfa-467c-b850-6053b3321a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b410c3-01c1-440c-bd9d-40498f3ee679","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5b49c97-eb68-44d9-85f7-56308f784f56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a3f9dfb-09e6-49d7-9e49-459c61fb20c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f84f2a39-f16e-4874-809b-e99be35df387","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"439c05d6-5612-440b-bd9b-3221d09bd73b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f115bba-8dfa-467c-b850-6053b3321a30","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b8203b0-1a34-40c1-b27e-a6d7d549bb87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b410c3-01c1-440c-bd9d-40498f3ee679","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5b49c97-eb68-44d9-85f7-56308f784f56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a3f9dfb-09e6-49d7-9e49-459c61fb20c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f84f2a39-f16e-4874-809b-e99be35df387","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"439c05d6-5612-440b-bd9b-3221d09bd73b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f115bba-8dfa-467c-b850-6053b3321a30","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b8203b0-1a34-40c1-b27e-a6d7d549bb87","IsCreationKey":false,"Key":3.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_ship_back_white/spr_ship_back_white.yy b/sprites/spr_ship_back_white/spr_ship_back_white.yy index d13cbcd416..8403fc60ff 100644 --- a/sprites/spr_ship_back_white/spr_ship_back_white.yy +++ b/sprites/spr_ship_back_white/spr_ship_back_white.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_back_white", "bboxMode":0, "bbox_bottom":116, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1aa71696-4ad5-412d-9f14-342cd38f5631","name":"1aa71696-4ad5-412d-9f14-342cd38f5631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36a2218b-dff1-41ce-890d-520e37171b31","name":"36a2218b-dff1-41ce-890d-520e37171b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"965b4909-9ecd-4504-9ac1-ad7559c50805","name":"965b4909-9ecd-4504-9ac1-ad7559c50805","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1aa71696-4ad5-412d-9f14-342cd38f5631","name":"1aa71696-4ad5-412d-9f14-342cd38f5631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36a2218b-dff1-41ce-890d-520e37171b31","name":"36a2218b-dff1-41ce-890d-520e37171b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"965b4909-9ecd-4504-9ac1-ad7559c50805","name":"965b4909-9ecd-4504-9ac1-ad7559c50805","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa71696-4ad5-412d-9f14-342cd38f5631","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7305107d-cd32-473d-89ec-c95e03ea3123","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36a2218b-dff1-41ce-890d-520e37171b31","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0746d0f4-e483-44c7-b37f-73d286bbe7f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f452a7af-801c-4f84-b0f4-dc73532f0037","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"965b4909-9ecd-4504-9ac1-ad7559c50805","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d495220-6a63-4ead-840b-771b34989d14","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa71696-4ad5-412d-9f14-342cd38f5631","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7305107d-cd32-473d-89ec-c95e03ea3123","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36a2218b-dff1-41ce-890d-520e37171b31","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0746d0f4-e483-44c7-b37f-73d286bbe7f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f452a7af-801c-4f84-b0f4-dc73532f0037","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"965b4909-9ecd-4504-9ac1-ad7559c50805","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d495220-6a63-4ead-840b-771b34989d14","IsCreationKey":false,"Key":3.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_ship_bb/spr_ship_bb.yy b/sprites/spr_ship_bb/spr_ship_bb.yy index 9805abd3d0..63fe300fb8 100644 --- a/sprites/spr_ship_bb/spr_ship_bb.yy +++ b/sprites/spr_ship_bb/spr_ship_bb.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_bb", "bboxMode":0, "bbox_bottom":107, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"96ec14b1-8003-4935-8f74-42e9b2745881","name":"96ec14b1-8003-4935-8f74-42e9b2745881","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96ec14b1-8003-4935-8f74-42e9b2745881","name":"96ec14b1-8003-4935-8f74-42e9b2745881","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96ec14b1-8003-4935-8f74-42e9b2745881","path":"sprites/spr_ship_bb/spr_ship_bb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6633c984-3753-45cd-96e4-8b814e874c8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96ec14b1-8003-4935-8f74-42e9b2745881","path":"sprites/spr_ship_bb/spr_ship_bb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6633c984-3753-45cd-96e4-8b814e874c8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_black/spr_ship_black.yy b/sprites/spr_ship_black/spr_ship_black.yy index 88d9588b5d..2f96c2bfb1 100644 --- a/sprites/spr_ship_black/spr_ship_black.yy +++ b/sprites/spr_ship_black/spr_ship_black.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_black", "bboxMode":0, "bbox_bottom":59, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1160e664-0428-462e-a0fa-9720be0f263d","name":"1160e664-0428-462e-a0fa-9720be0f263d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1160e664-0428-462e-a0fa-9720be0f263d","name":"1160e664-0428-462e-a0fa-9720be0f263d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1160e664-0428-462e-a0fa-9720be0f263d","path":"sprites/spr_ship_black/spr_ship_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac1354f0-7622-4cc8-8099-1ffdb0d0c310","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1160e664-0428-462e-a0fa-9720be0f263d","path":"sprites/spr_ship_black/spr_ship_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac1354f0-7622-4cc8-8099-1ffdb0d0c310","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_cairn/spr_ship_cairn.yy b/sprites/spr_ship_cairn/spr_ship_cairn.yy index 493b59d7f2..98f171ad00 100644 --- a/sprites/spr_ship_cairn/spr_ship_cairn.yy +++ b/sprites/spr_ship_cairn/spr_ship_cairn.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_cairn", "bboxMode":0, "bbox_bottom":190, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","path":"sprites/spr_ship_cairn/spr_ship_cairn.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"602e325e-4d92-43dc-baf7-5933f1213a55","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","path":"sprites/spr_ship_cairn/spr_ship_cairn.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"602e325e-4d92-43dc-baf7-5933f1213a55","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_carnage/spr_ship_carnage.yy b/sprites/spr_ship_carnage/spr_ship_carnage.yy index 9886132837..962f5c3041 100644 --- a/sprites/spr_ship_carnage/spr_ship_carnage.yy +++ b/sprites/spr_ship_carnage/spr_ship_carnage.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_carnage", "bboxMode":0, "bbox_bottom":45, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","path":"sprites/spr_ship_carnage/spr_ship_carnage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bee4553-fc2f-442d-9707-5190ea802b9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","path":"sprites/spr_ship_carnage/spr_ship_carnage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bee4553-fc2f-442d-9707-5190ea802b9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_castellan/spr_ship_castellan.yy b/sprites/spr_ship_castellan/spr_ship_castellan.yy index aed43c53c6..22d8ef5c2d 100644 --- a/sprites/spr_ship_castellan/spr_ship_castellan.yy +++ b/sprites/spr_ship_castellan/spr_ship_castellan.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_castellan", "bboxMode":0, "bbox_bottom":83, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3224b95f-84a0-4626-a51b-35b507429cc9","name":"3224b95f-84a0-4626-a51b-35b507429cc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3224b95f-84a0-4626-a51b-35b507429cc9","name":"3224b95f-84a0-4626-a51b-35b507429cc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3224b95f-84a0-4626-a51b-35b507429cc9","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2a64330-a52a-4a89-9633-babd1b2c633d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3224b95f-84a0-4626-a51b-35b507429cc9","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2a64330-a52a-4a89-9633-babd1b2c633d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_craftworld/spr_ship_craftworld.yy b/sprites/spr_ship_craftworld/spr_ship_craftworld.yy index 3b73f1bc63..b006c6fe9f 100644 --- a/sprites/spr_ship_craftworld/spr_ship_craftworld.yy +++ b/sprites/spr_ship_craftworld/spr_ship_craftworld.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_craftworld", "bboxMode":0, "bbox_bottom":319, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"277fd817-4103-4272-9c5e-bf244d349ad3","name":"277fd817-4103-4272-9c5e-bf244d349ad3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"277fd817-4103-4272-9c5e-bf244d349ad3","name":"277fd817-4103-4272-9c5e-bf244d349ad3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"277fd817-4103-4272-9c5e-bf244d349ad3","path":"sprites/spr_ship_craftworld/spr_ship_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b33532c1-2896-4b70-ae77-1de4c9948658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"277fd817-4103-4272-9c5e-bf244d349ad3","path":"sprites/spr_ship_craftworld/spr_ship_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b33532c1-2896-4b70-ae77-1de4c9948658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_custodian/spr_ship_custodian.yy b/sprites/spr_ship_custodian/spr_ship_custodian.yy index 96125f8653..fff5c7295b 100644 --- a/sprites/spr_ship_custodian/spr_ship_custodian.yy +++ b/sprites/spr_ship_custodian/spr_ship_custodian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_custodian", "bboxMode":0, "bbox_bottom":222, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e58cb568-7cf6-4f96-881f-f23673f4daae","name":"e58cb568-7cf6-4f96-881f-f23673f4daae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e58cb568-7cf6-4f96-881f-f23673f4daae","name":"e58cb568-7cf6-4f96-881f-f23673f4daae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e58cb568-7cf6-4f96-881f-f23673f4daae","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1cb5bffe-8f97-4870-9150-067479ba4b19","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e58cb568-7cf6-4f96-881f-f23673f4daae","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1cb5bffe-8f97-4870-9150-067479ba4b19","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_daemon/spr_ship_daemon.yy b/sprites/spr_ship_daemon/spr_ship_daemon.yy index 02fcb04b85..a39ed98c37 100644 --- a/sprites/spr_ship_daemon/spr_ship_daemon.yy +++ b/sprites/spr_ship_daemon/spr_ship_daemon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_daemon", "bboxMode":0, "bbox_bottom":49, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","path":"sprites/spr_ship_daemon/spr_ship_daemon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0600b960-8db3-43f5-ad86-98323bda79fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","path":"sprites/spr_ship_daemon/spr_ship_daemon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0600b960-8db3-43f5-ad86-98323bda79fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_dese/spr_ship_dese.yy b/sprites/spr_ship_dese/spr_ship_dese.yy index 7d87f1738f..82e0346573 100644 --- a/sprites/spr_ship_dese/spr_ship_dese.yy +++ b/sprites/spr_ship_dese/spr_ship_dese.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_dese", "bboxMode":0, "bbox_bottom":80, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e92274f-9009-40ac-bc73-a614141501a6","name":"9e92274f-9009-40ac-bc73-a614141501a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e92274f-9009-40ac-bc73-a614141501a6","name":"9e92274f-9009-40ac-bc73-a614141501a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e92274f-9009-40ac-bc73-a614141501a6","path":"sprites/spr_ship_dese/spr_ship_dese.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ded885e-1a85-4322-86f3-622e3d240e2a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e92274f-9009-40ac-bc73-a614141501a6","path":"sprites/spr_ship_dese/spr_ship_dese.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ded885e-1a85-4322-86f3-622e3d240e2a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_deth/spr_ship_deth.yy b/sprites/spr_ship_deth/spr_ship_deth.yy index ec1c601627..f8db12b1da 100644 --- a/sprites/spr_ship_deth/spr_ship_deth.yy +++ b/sprites/spr_ship_deth/spr_ship_deth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_deth", "bboxMode":0, "bbox_bottom":79, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","path":"sprites/spr_ship_deth/spr_ship_deth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69824969-8aec-4e69-b60d-c2a00439a438","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","path":"sprites/spr_ship_deth/spr_ship_deth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69824969-8aec-4e69-b60d-c2a00439a438","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_dirge/spr_ship_dirge.yy b/sprites/spr_ship_dirge/spr_ship_dirge.yy index 0861a1375b..92155fd0cd 100644 --- a/sprites/spr_ship_dirge/spr_ship_dirge.yy +++ b/sprites/spr_ship_dirge/spr_ship_dirge.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_dirge", "bboxMode":0, "bbox_bottom":90, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5565f16-87ee-484b-a3fa-776d094d2629","name":"c5565f16-87ee-484b-a3fa-776d094d2629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5565f16-87ee-484b-a3fa-776d094d2629","name":"c5565f16-87ee-484b-a3fa-776d094d2629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5565f16-87ee-484b-a3fa-776d094d2629","path":"sprites/spr_ship_dirge/spr_ship_dirge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a80a4a-48e8-47db-a92e-23554ce30ecc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5565f16-87ee-484b-a3fa-776d094d2629","path":"sprites/spr_ship_dirge/spr_ship_dirge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a80a4a-48e8-47db-a92e-23554ce30ecc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy b/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy index 26dc0a5758..2c842669bd 100644 --- a/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy +++ b/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_dreadclaw", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","path":"sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97bff932-8634-4a28-b278-fb211a2d59fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","path":"sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97bff932-8634-4a28-b278-fb211a2d59fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_emissary/spr_ship_emissary.yy b/sprites/spr_ship_emissary/spr_ship_emissary.yy index b542535371..43fe658e40 100644 --- a/sprites/spr_ship_emissary/spr_ship_emissary.yy +++ b/sprites/spr_ship_emissary/spr_ship_emissary.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_emissary", "bboxMode":0, "bbox_bottom":115, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64bd879f-5681-42f8-a1ca-d51c0625d460","name":"64bd879f-5681-42f8-a1ca-d51c0625d460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64bd879f-5681-42f8-a1ca-d51c0625d460","name":"64bd879f-5681-42f8-a1ca-d51c0625d460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64bd879f-5681-42f8-a1ca-d51c0625d460","path":"sprites/spr_ship_emissary/spr_ship_emissary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67fac36f-c8fb-4799-a125-1ae93af67e18","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64bd879f-5681-42f8-a1ca-d51c0625d460","path":"sprites/spr_ship_emissary/spr_ship_emissary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67fac36f-c8fb-4799-a125-1ae93af67e18","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_glad/spr_ship_glad.yy b/sprites/spr_ship_glad/spr_ship_glad.yy index 572141dc6e..8f67c0bf03 100644 --- a/sprites/spr_ship_glad/spr_ship_glad.yy +++ b/sprites/spr_ship_glad/spr_ship_glad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_glad", "bboxMode":0, "bbox_bottom":29, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_gorbag/spr_ship_gorbag.yy b/sprites/spr_ship_gorbag/spr_ship_gorbag.yy index ef20f7097a..b9f750856d 100644 --- a/sprites/spr_ship_gorbag/spr_ship_gorbag.yy +++ b/sprites/spr_ship_gorbag/spr_ship_gorbag.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_gorbag", "bboxMode":0, "bbox_bottom":92, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","path":"sprites/spr_ship_gorbag/spr_ship_gorbag.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f104132a-3439-4d37-88e1-75d95f3f8607","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","path":"sprites/spr_ship_gorbag/spr_ship_gorbag.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f104132a-3439-4d37-88e1-75d95f3f8607","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_hellebore/spr_ship_hellebore.yy b/sprites/spr_ship_hellebore/spr_ship_hellebore.yy index c58946c8a1..7575709a19 100644 --- a/sprites/spr_ship_hellebore/spr_ship_hellebore.yy +++ b/sprites/spr_ship_hellebore/spr_ship_hellebore.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_hellebore", "bboxMode":0, "bbox_bottom":29, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6b68f550-f04a-441f-a440-82ad542d0a30","name":"6b68f550-f04a-441f-a440-82ad542d0a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b68f550-f04a-441f-a440-82ad542d0a30","name":"6b68f550-f04a-441f-a440-82ad542d0a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b68f550-f04a-441f-a440-82ad542d0a30","path":"sprites/spr_ship_hellebore/spr_ship_hellebore.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5969f53-a04e-459a-bcaf-8d79be1dd662","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b68f550-f04a-441f-a440-82ad542d0a30","path":"sprites/spr_ship_hellebore/spr_ship_hellebore.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5969f53-a04e-459a-bcaf-8d79be1dd662","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_hulk/spr_ship_hulk.yy b/sprites/spr_ship_hulk/spr_ship_hulk.yy index 1af5ec901e..9edd65bc16 100644 --- a/sprites/spr_ship_hulk/spr_ship_hulk.yy +++ b/sprites/spr_ship_hulk/spr_ship_hulk.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_hulk", "bboxMode":0, "bbox_bottom":407, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"81541e4e-2b46-4e16-8859-224aca1545b8","name":"81541e4e-2b46-4e16-8859-224aca1545b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81541e4e-2b46-4e16-8859-224aca1545b8","name":"81541e4e-2b46-4e16-8859-224aca1545b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81541e4e-2b46-4e16-8859-224aca1545b8","path":"sprites/spr_ship_hulk/spr_ship_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26ff0a1f-7db1-49af-b1cd-c7315bfcf762","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81541e4e-2b46-4e16-8859-224aca1545b8","path":"sprites/spr_ship_hulk/spr_ship_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26ff0a1f-7db1-49af-b1cd-c7315bfcf762","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_hunt/spr_ship_hunt.yy b/sprites/spr_ship_hunt/spr_ship_hunt.yy index d35e63257f..6375c77d2a 100644 --- a/sprites/spr_ship_hunt/spr_ship_hunt.yy +++ b/sprites/spr_ship_hunt/spr_ship_hunt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_hunt", "bboxMode":0, "bbox_bottom":23, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"691a7b56-f5f3-455c-971e-eb7d163628c2","name":"691a7b56-f5f3-455c-971e-eb7d163628c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"691a7b56-f5f3-455c-971e-eb7d163628c2","name":"691a7b56-f5f3-455c-971e-eb7d163628c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"691a7b56-f5f3-455c-971e-eb7d163628c2","path":"sprites/spr_ship_hunt/spr_ship_hunt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c1b99c0-ab70-44a8-9a5a-0738a1058783","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"691a7b56-f5f3-455c-971e-eb7d163628c2","path":"sprites/spr_ship_hunt/spr_ship_hunt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c1b99c0-ab70-44a8-9a5a-0738a1058783","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_icono/spr_ship_icono.yy b/sprites/spr_ship_icono/spr_ship_icono.yy index 0cd2646f99..3165c88287 100644 --- a/sprites/spr_ship_icono/spr_ship_icono.yy +++ b/sprites/spr_ship_icono/spr_ship_icono.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_icono", "bboxMode":0, "bbox_bottom":34, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","path":"sprites/spr_ship_icono/spr_ship_icono.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cf2dce6-1f4f-483b-8fcf-4856742320fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","path":"sprites/spr_ship_icono/spr_ship_icono.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cf2dce6-1f4f-483b-8fcf-4856742320fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_inter/spr_ship_inter.yy b/sprites/spr_ship_inter/spr_ship_inter.yy index 65425d0c97..f54842c376 100644 --- a/sprites/spr_ship_inter/spr_ship_inter.yy +++ b/sprites/spr_ship_inter/spr_ship_inter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_inter", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"393aa440-3bae-402e-af32-abeecd9a0b5c","name":"393aa440-3bae-402e-af32-abeecd9a0b5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"393aa440-3bae-402e-af32-abeecd9a0b5c","name":"393aa440-3bae-402e-af32-abeecd9a0b5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"393aa440-3bae-402e-af32-abeecd9a0b5c","path":"sprites/spr_ship_inter/spr_ship_inter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65d75e07-bd0b-4485-925e-6b0873ef009f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"393aa440-3bae-402e-af32-abeecd9a0b5c","path":"sprites/spr_ship_inter/spr_ship_inter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65d75e07-bd0b-4485-925e-6b0873ef009f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_jackal/spr_ship_jackal.yy b/sprites/spr_ship_jackal/spr_ship_jackal.yy index 5942c67b35..766b34cfda 100644 --- a/sprites/spr_ship_jackal/spr_ship_jackal.yy +++ b/sprites/spr_ship_jackal/spr_ship_jackal.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_jackal", "bboxMode":0, "bbox_bottom":103, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3063bdf1-a213-4fe3-a728-cc41b97965da","name":"3063bdf1-a213-4fe3-a728-cc41b97965da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3063bdf1-a213-4fe3-a728-cc41b97965da","name":"3063bdf1-a213-4fe3-a728-cc41b97965da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3063bdf1-a213-4fe3-a728-cc41b97965da","path":"sprites/spr_ship_jackal/spr_ship_jackal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd273b51-3692-4062-b9a7-517780b9be01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3063bdf1-a213-4fe3-a728-cc41b97965da","path":"sprites/spr_ship_jackal/spr_ship_jackal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd273b51-3692-4062-b9a7-517780b9be01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_krool/spr_ship_krool.yy b/sprites/spr_ship_krool/spr_ship_krool.yy index 65da354558..cffad18d40 100644 --- a/sprites/spr_ship_krool/spr_ship_krool.yy +++ b/sprites/spr_ship_krool/spr_ship_krool.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_krool", "bboxMode":0, "bbox_bottom":74, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","path":"sprites/spr_ship_krool/spr_ship_krool.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e7a4450f-59a6-451c-ba8f-d311b992363f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","path":"sprites/spr_ship_krool/spr_ship_krool.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e7a4450f-59a6-451c-ba8f-d311b992363f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_kroozer/spr_ship_kroozer.yy b/sprites/spr_ship_kroozer/spr_ship_kroozer.yy index 7079a91f96..81a594cafc 100644 --- a/sprites/spr_ship_kroozer/spr_ship_kroozer.yy +++ b/sprites/spr_ship_kroozer/spr_ship_kroozer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_kroozer", "bboxMode":0, "bbox_bottom":57, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c7ab190f-80bc-4a25-894a-0952346a02e3","name":"c7ab190f-80bc-4a25-894a-0952346a02e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7ab190f-80bc-4a25-894a-0952346a02e3","name":"c7ab190f-80bc-4a25-894a-0952346a02e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ab190f-80bc-4a25-894a-0952346a02e3","path":"sprites/spr_ship_kroozer/spr_ship_kroozer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7553d091-4021-4d8f-8705-9a7ea17ee8d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ab190f-80bc-4a25-894a-0952346a02e3","path":"sprites/spr_ship_kroozer/spr_ship_kroozer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7553d091-4021-4d8f-8705-9a7ea17ee8d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_leviathan/spr_ship_leviathan.yy b/sprites/spr_ship_leviathan/spr_ship_leviathan.yy index 0ec805bef7..a96a7b74cf 100644 --- a/sprites/spr_ship_leviathan/spr_ship_leviathan.yy +++ b/sprites/spr_ship_leviathan/spr_ship_leviathan.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_leviathan", "bboxMode":0, "bbox_bottom":90, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6cc70763-89ce-43c0-a254-cc94649feba6","name":"6cc70763-89ce-43c0-a254-cc94649feba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cc70763-89ce-43c0-a254-cc94649feba6","name":"6cc70763-89ce-43c0-a254-cc94649feba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc70763-89ce-43c0-a254-cc94649feba6","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0ac4187-2465-40eb-85b5-dc728746f758","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc70763-89ce-43c0-a254-cc94649feba6","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0ac4187-2465-40eb-85b5-dc728746f758","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_nem/spr_ship_nem.yy b/sprites/spr_ship_nem/spr_ship_nem.yy index 50e26038d8..4aee217c58 100644 --- a/sprites/spr_ship_nem/spr_ship_nem.yy +++ b/sprites/spr_ship_nem/spr_ship_nem.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_nem", "bboxMode":0, "bbox_bottom":91, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_protector/spr_ship_protector.yy b/sprites/spr_ship_protector/spr_ship_protector.yy index c3cd30076a..ffbed4213a 100644 --- a/sprites/spr_ship_protector/spr_ship_protector.yy +++ b/sprites/spr_ship_protector/spr_ship_protector.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_protector", "bboxMode":0, "bbox_bottom":163, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aa829dc1-929b-4987-91e0-c6059198a0ac","name":"aa829dc1-929b-4987-91e0-c6059198a0ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa829dc1-929b-4987-91e0-c6059198a0ac","name":"aa829dc1-929b-4987-91e0-c6059198a0ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa829dc1-929b-4987-91e0-c6059198a0ac","path":"sprites/spr_ship_protector/spr_ship_protector.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae69cb97-130e-449c-a631-88426f264c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa829dc1-929b-4987-91e0-c6059198a0ac","path":"sprites/spr_ship_protector/spr_ship_protector.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae69cb97-130e-449c-a631-88426f264c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_prowler/spr_ship_prowler.yy b/sprites/spr_ship_prowler/spr_ship_prowler.yy index a6bb4ca1e7..770df48f2a 100644 --- a/sprites/spr_ship_prowler/spr_ship_prowler.yy +++ b/sprites/spr_ship_prowler/spr_ship_prowler.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_prowler", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"44887184-b806-4f09-bcd1-814d58f1e37f","name":"44887184-b806-4f09-bcd1-814d58f1e37f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44887184-b806-4f09-bcd1-814d58f1e37f","name":"44887184-b806-4f09-bcd1-814d58f1e37f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44887184-b806-4f09-bcd1-814d58f1e37f","path":"sprites/spr_ship_prowler/spr_ship_prowler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"369c475b-1a5f-4ff3-94f8-14a2ff02d272","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44887184-b806-4f09-bcd1-814d58f1e37f","path":"sprites/spr_ship_prowler/spr_ship_prowler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"369c475b-1a5f-4ff3-94f8-14a2ff02d272","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_ravager/spr_ship_ravager.yy b/sprites/spr_ship_ravager/spr_ship_ravager.yy index 93af5424ef..fb0c332183 100644 --- a/sprites/spr_ship_ravager/spr_ship_ravager.yy +++ b/sprites/spr_ship_ravager/spr_ship_ravager.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_ravager", "bboxMode":0, "bbox_bottom":32, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"707cc706-dd30-4efe-a19d-4aaa095f781a","name":"707cc706-dd30-4efe-a19d-4aaa095f781a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"707cc706-dd30-4efe-a19d-4aaa095f781a","name":"707cc706-dd30-4efe-a19d-4aaa095f781a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"707cc706-dd30-4efe-a19d-4aaa095f781a","path":"sprites/spr_ship_ravager/spr_ship_ravager.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d47814c5-4403-42e6-a7e1-813d00520084","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"707cc706-dd30-4efe-a19d-4aaa095f781a","path":"sprites/spr_ship_ravager/spr_ship_ravager.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d47814c5-4403-42e6-a7e1-813d00520084","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy b/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy index 2e418882f3..19c898dfce 100644 --- a/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy +++ b/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_razorfiend", "bboxMode":0, "bbox_bottom":88, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e4561a1-64f7-4e04-b03c-13b5699b5686","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e4561a1-64f7-4e04-b03c-13b5699b5686","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_reaper/spr_ship_reaper.yy b/sprites/spr_ship_reaper/spr_ship_reaper.yy index b02d77c1b5..654b32ffe7 100644 --- a/sprites/spr_ship_reaper/spr_ship_reaper.yy +++ b/sprites/spr_ship_reaper/spr_ship_reaper.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_reaper", "bboxMode":0, "bbox_bottom":133, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","path":"sprites/spr_ship_reaper/spr_ship_reaper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"039617f9-7696-438d-bdab-4e9fcf4ded4b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","path":"sprites/spr_ship_reaper/spr_ship_reaper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"039617f9-7696-438d-bdab-4e9fcf4ded4b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_shadow/spr_ship_shadow.yy b/sprites/spr_ship_shadow/spr_ship_shadow.yy index 6e0fe26314..7980676a38 100644 --- a/sprites/spr_ship_shadow/spr_ship_shadow.yy +++ b/sprites/spr_ship_shadow/spr_ship_shadow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_shadow", "bboxMode":0, "bbox_bottom":107, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","path":"sprites/spr_ship_shadow/spr_ship_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3bf9d86d-79ff-4645-87d1-9c999e8b1c1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","path":"sprites/spr_ship_shadow/spr_ship_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3bf9d86d-79ff-4645-87d1-9c999e8b1c1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_shields/spr_ship_shields.yy b/sprites/spr_ship_shields/spr_ship_shields.yy index e317a0f306..6939078681 100644 --- a/sprites/spr_ship_shields/spr_ship_shields.yy +++ b/sprites/spr_ship_shields/spr_ship_shields.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_shields", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_shields/spr_ship_shields.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_shields/spr_ship_shields.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_shroud/spr_ship_shroud.yy b/sprites/spr_ship_shroud/spr_ship_shroud.yy index 0ee2f0e56c..d9143bad03 100644 --- a/sprites/spr_ship_shroud/spr_ship_shroud.yy +++ b/sprites/spr_ship_shroud/spr_ship_shroud.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_shroud", "bboxMode":0, "bbox_bottom":134, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","path":"sprites/spr_ship_shroud/spr_ship_shroud.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11e928b5-b85a-4cf4-88b6-c59c618a9f75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","path":"sprites/spr_ship_shroud/spr_ship_shroud.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11e928b5-b85a-4cf4-88b6-c59c618a9f75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_slam/spr_ship_slam.yy b/sprites/spr_ship_slam/spr_ship_slam.yy index 0064e6edd5..2ef5b5dff5 100644 --- a/sprites/spr_ship_slam/spr_ship_slam.yy +++ b/sprites/spr_ship_slam/spr_ship_slam.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_slam", "bboxMode":0, "bbox_bottom":72, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc3eb73e-f4d8-43c8-8e66-26a1d3da703f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc3eb73e-f4d8-43c8-8e66-26a1d3da703f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_song/spr_ship_song.yy b/sprites/spr_ship_song/spr_ship_song.yy index 7bf1268299..3b0b109fbd 100644 --- a/sprites/spr_ship_song/spr_ship_song.yy +++ b/sprites/spr_ship_song/spr_ship_song.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_song", "bboxMode":0, "bbox_bottom":144, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","path":"sprites/spr_ship_song/spr_ship_song.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c049868-56f8-4a4a-b66e-0a379b5bd341","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","path":"sprites/spr_ship_song/spr_ship_song.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c049868-56f8-4a4a-b66e-0a379b5bd341","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_stalker/spr_ship_stalker.yy b/sprites/spr_ship_stalker/spr_ship_stalker.yy index 74c4e1ba27..01012e222c 100644 --- a/sprites/spr_ship_stalker/spr_ship_stalker.yy +++ b/sprites/spr_ship_stalker/spr_ship_stalker.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_stalker", "bboxMode":0, "bbox_bottom":40, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","path":"sprites/spr_ship_stalker/spr_ship_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a4010b0-a750-414c-a074-7960ed916a8b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","path":"sprites/spr_ship_stalker/spr_ship_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a4010b0-a750-414c-a074-7960ed916a8b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_stri/spr_ship_stri.yy b/sprites/spr_ship_stri/spr_ship_stri.yy index 23cd650996..134b41cd10 100644 --- a/sprites/spr_ship_stri/spr_ship_stri.yy +++ b/sprites/spr_ship_stri/spr_ship_stri.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_stri", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_stri/spr_ship_stri.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_stri/spr_ship_stri.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_sword/spr_ship_sword.yy b/sprites/spr_ship_sword/spr_ship_sword.yy index 8724fc38f1..bc0c935800 100644 --- a/sprites/spr_ship_sword/spr_ship_sword.yy +++ b/sprites/spr_ship_sword/spr_ship_sword.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_sword", "bboxMode":0, "bbox_bottom":22, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b0f97522-d3a1-44a4-955a-d60e67613c61","name":"b0f97522-d3a1-44a4-955a-d60e67613c61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0f97522-d3a1-44a4-955a-d60e67613c61","name":"b0f97522-d3a1-44a4-955a-d60e67613c61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0f97522-d3a1-44a4-955a-d60e67613c61","path":"sprites/spr_ship_sword/spr_ship_sword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a9df30a-a4ff-4310-981b-fd2b9038034a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0f97522-d3a1-44a4-955a-d60e67613c61","path":"sprites/spr_ship_sword/spr_ship_sword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a9df30a-a4ff-4310-981b-fd2b9038034a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_th/spr_ship_th.yy b/sprites/spr_ship_th/spr_ship_th.yy index c63e4499b4..67ef0f9262 100644 --- a/sprites/spr_ship_th/spr_ship_th.yy +++ b/sprites/spr_ship_th/spr_ship_th.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_th", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","path":"sprites/spr_ship_th/spr_ship_th.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04c54e34-ade2-4147-82b0-3f873c34c30a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","path":"sprites/spr_ship_th/spr_ship_th.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04c54e34-ade2-4147-82b0-3f873c34c30a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_veng/spr_ship_veng.yy b/sprites/spr_ship_veng/spr_ship_veng.yy index a29eda5f94..0f9682df11 100644 --- a/sprites/spr_ship_veng/spr_ship_veng.yy +++ b/sprites/spr_ship_veng/spr_ship_veng.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_veng", "bboxMode":0, "bbox_bottom":58, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"127ec400-7ba9-4185-8a45-4c9a23e595a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"127ec400-7ba9-4185-8a45-4c9a23e595a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_void/spr_ship_void.yy b/sprites/spr_ship_void/spr_ship_void.yy index 84b427d583..f84483ae71 100644 --- a/sprites/spr_ship_void/spr_ship_void.yy +++ b/sprites/spr_ship_void/spr_ship_void.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_void", "bboxMode":0, "bbox_bottom":151, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","path":"sprites/spr_ship_void/spr_ship_void.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"712cdbb6-4651-48ff-ab35-b7c717708be8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","path":"sprites/spr_ship_void/spr_ship_void.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"712cdbb6-4651-48ff-ab35-b7c717708be8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_warden/spr_ship_warden.yy b/sprites/spr_ship_warden/spr_ship_warden.yy index e1af6526fb..6c1786db0f 100644 --- a/sprites/spr_ship_warden/spr_ship_warden.yy +++ b/sprites/spr_ship_warden/spr_ship_warden.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_warden", "bboxMode":0, "bbox_bottom":70, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a1ad8039-e998-4feb-a162-38d6960fe860","name":"a1ad8039-e998-4feb-a162-38d6960fe860","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a1ad8039-e998-4feb-a162-38d6960fe860","name":"a1ad8039-e998-4feb-a162-38d6960fe860","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1ad8039-e998-4feb-a162-38d6960fe860","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f81da50e-d3bb-4920-a16f-40b833647603","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1ad8039-e998-4feb-a162-38d6960fe860","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f81da50e-d3bb-4920-a16f-40b833647603","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_shutter_button/spr_shutter_button.yy b/sprites/spr_shutter_button/spr_shutter_button.yy index 3e0d4ff753..f2087345f2 100644 --- a/sprites/spr_shutter_button/spr_shutter_button.yy +++ b/sprites/spr_shutter_button/spr_shutter_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_shutter_button", "bboxMode":0, "bbox_bottom":505, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a33f3820-f817-47b2-93f6-e09657a03620","name":"a33f3820-f817-47b2-93f6-e09657a03620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aea54f21-da01-4b3e-9c86-4eea4991976a","name":"aea54f21-da01-4b3e-9c86-4eea4991976a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b44ab3a-cd61-4236-9265-0539c255cabf","name":"2b44ab3a-cd61-4236-9265-0539c255cabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14089c53-1775-4c86-81db-815184b41de3","name":"14089c53-1775-4c86-81db-815184b41de3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a33f3820-f817-47b2-93f6-e09657a03620","name":"a33f3820-f817-47b2-93f6-e09657a03620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aea54f21-da01-4b3e-9c86-4eea4991976a","name":"aea54f21-da01-4b3e-9c86-4eea4991976a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b44ab3a-cd61-4236-9265-0539c255cabf","name":"2b44ab3a-cd61-4236-9265-0539c255cabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14089c53-1775-4c86-81db-815184b41de3","name":"14089c53-1775-4c86-81db-815184b41de3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"131c5b6e-7e6d-4009-9f41-8c682fdbe6fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a33f3820-f817-47b2-93f6-e09657a03620","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b2f33da-9466-442e-9b49-a8be14781d23","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aea54f21-da01-4b3e-9c86-4eea4991976a","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"42f184d7-359c-409a-86f2-4fb35d8de685","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b44ab3a-cd61-4236-9265-0539c255cabf","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f847a9bf-64e9-41a5-8c31-b4b1085f5841","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b65eff6-9705-4575-b40b-fe35ca5b6b5e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4045f3a4-6d84-4fc7-aa09-6af816c64206","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14089c53-1775-4c86-81db-815184b41de3","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8850346-d50b-45ab-a5d3-417dcfbe9311","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131c5b6e-7e6d-4009-9f41-8c682fdbe6fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a33f3820-f817-47b2-93f6-e09657a03620","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b2f33da-9466-442e-9b49-a8be14781d23","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aea54f21-da01-4b3e-9c86-4eea4991976a","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"42f184d7-359c-409a-86f2-4fb35d8de685","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b44ab3a-cd61-4236-9265-0539c255cabf","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f847a9bf-64e9-41a5-8c31-b4b1085f5841","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b65eff6-9705-4575-b40b-fe35ca5b6b5e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4045f3a4-6d84-4fc7-aa09-6af816c64206","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14089c53-1775-4c86-81db-815184b41de3","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8850346-d50b-45ab-a5d3-417dcfbe9311","IsCreationKey":false,"Key":6.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_sister_hospitaler/spr_sister_hospitaler.yy b/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy index cb91167053..4f8ff89929 100644 --- a/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy +++ b/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sister_hospitaler", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5988268a-350a-499e-a70b-6cb6849b5f91","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5988268a-350a-499e-a70b-6cb6849b5f91","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sister_of_battle/spr_sister_of_battle.yy b/sprites/spr_sister_of_battle/spr_sister_of_battle.yy index 68c5aa00b5..ffce2a0e5e 100644 --- a/sprites/spr_sister_of_battle/spr_sister_of_battle.yy +++ b/sprites/spr_sister_of_battle/spr_sister_of_battle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sister_of_battle", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ae300a7c-eb85-4b95-aded-5820a4156d85","name":"ae300a7c-eb85-4b95-aded-5820a4156d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae300a7c-eb85-4b95-aded-5820a4156d85","name":"ae300a7c-eb85-4b95-aded-5820a4156d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae300a7c-eb85-4b95-aded-5820a4156d85","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ed3578e-7db9-4027-bb0f-ec3180e86658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae300a7c-eb85-4b95-aded-5820a4156d85","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ed3578e-7db9-4027-bb0f-ec3180e86658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_skitarii/spr_skitarii.yy b/sprites/spr_skitarii/spr_skitarii.yy index 61fa473789..07fa112b3b 100644 --- a/sprites/spr_skitarii/spr_skitarii.yy +++ b/sprites/spr_skitarii/spr_skitarii.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_skitarii", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","path":"sprites/spr_skitarii/spr_skitarii.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c9f3812-394f-42f9-bb3c-d22560aa6c92","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","path":"sprites/spr_skitarii/spr_skitarii.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c9f3812-394f-42f9-bb3c-d22560aa6c92","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_skull_on_chain/spr_skull_on_chain.yy b/sprites/spr_skull_on_chain/spr_skull_on_chain.yy index d5a6000d7d..8512da9e70 100644 --- a/sprites/spr_skull_on_chain/spr_skull_on_chain.yy +++ b/sprites/spr_skull_on_chain/spr_skull_on_chain.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_skull_on_chain", "bboxMode":0, "bbox_bottom":39, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d6e7ff8-cb18-4100-9159-42068b16e4c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d6e7ff8-cb18-4100-9159-42068b16e4c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_skulls_belt/spr_skulls_belt.yy b/sprites/spr_skulls_belt/spr_skulls_belt.yy index c87de44ac5..bdc90db20b 100644 --- a/sprites/spr_skulls_belt/spr_skulls_belt.yy +++ b/sprites/spr_skulls_belt/spr_skulls_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_skulls_belt", "bboxMode":0, "bbox_bottom":104, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"037f80d3-2475-45e9-9eea-477515faed6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"037f80d3-2475-45e9-9eea-477515faed6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_slate_2/spr_slate_2.yy b/sprites/spr_slate_2/spr_slate_2.yy index 8339762259..23a68f879f 100644 --- a/sprites/spr_slate_2/spr_slate_2.yy +++ b/sprites/spr_slate_2/spr_slate_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_slate_2", "bboxMode":0, "bbox_bottom":417, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"58154a86-8657-4704-884c-466b6abbd78b","name":"58154a86-8657-4704-884c-466b6abbd78b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da3ce017-7535-4db9-a251-65f496434a8d","name":"da3ce017-7535-4db9-a251-65f496434a8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e082e106-f541-4c95-8004-18ff816e3609","name":"e082e106-f541-4c95-8004-18ff816e3609","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b072440-87d3-4d45-b8ab-894956f7df0c","name":"7b072440-87d3-4d45-b8ab-894956f7df0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58154a86-8657-4704-884c-466b6abbd78b","name":"58154a86-8657-4704-884c-466b6abbd78b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da3ce017-7535-4db9-a251-65f496434a8d","name":"da3ce017-7535-4db9-a251-65f496434a8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e082e106-f541-4c95-8004-18ff816e3609","name":"e082e106-f541-4c95-8004-18ff816e3609","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b072440-87d3-4d45-b8ab-894956f7df0c","name":"7b072440-87d3-4d45-b8ab-894956f7df0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"caac8738-2aca-40a9-9ca5-6b67e73f3f53","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58154a86-8657-4704-884c-466b6abbd78b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c0d605b5-5836-450b-94a2-3b35505908ab","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04b94baa-e3c6-4a28-b9fa-a49c76f2ff8d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da3ce017-7535-4db9-a251-65f496434a8d","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3399fee2-a76a-4850-9fa5-bc2fc3a77313","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7893b14b-0c17-4422-a83c-faa224efe77d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e082e106-f541-4c95-8004-18ff816e3609","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6986fa2-28f3-4e7f-88d9-76f787d3b10c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"390e46d1-0ccd-42b3-8e62-03b0311775a7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b072440-87d3-4d45-b8ab-894956f7df0c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"997d7151-a105-438a-b205-d685a0ff0489","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a916ded-cadb-41f7-9fb3-2748557af882","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bfdb174a-4cda-4108-a52d-9be62ca8b763","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"caac8738-2aca-40a9-9ca5-6b67e73f3f53","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58154a86-8657-4704-884c-466b6abbd78b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c0d605b5-5836-450b-94a2-3b35505908ab","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04b94baa-e3c6-4a28-b9fa-a49c76f2ff8d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da3ce017-7535-4db9-a251-65f496434a8d","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3399fee2-a76a-4850-9fa5-bc2fc3a77313","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7893b14b-0c17-4422-a83c-faa224efe77d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e082e106-f541-4c95-8004-18ff816e3609","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6986fa2-28f3-4e7f-88d9-76f787d3b10c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"390e46d1-0ccd-42b3-8e62-03b0311775a7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b072440-87d3-4d45-b8ab-894956f7df0c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"997d7151-a105-438a-b205-d685a0ff0489","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a916ded-cadb-41f7-9fb3-2748557af882","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bfdb174a-4cda-4108-a52d-9be62ca8b763","IsCreationKey":false,"Key":9.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_sororitas1/spr_sororitas1.yy b/sprites/spr_sororitas1/spr_sororitas1.yy index d8a4bfd561..e41d1c24bd 100644 --- a/sprites/spr_sororitas1/spr_sororitas1.yy +++ b/sprites/spr_sororitas1/spr_sororitas1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sororitas1", "bboxMode":0, "bbox_bottom":230, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66086a6e-1b58-4594-801d-a5e38212e3ad","name":"66086a6e-1b58-4594-801d-a5e38212e3ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66086a6e-1b58-4594-801d-a5e38212e3ad","name":"66086a6e-1b58-4594-801d-a5e38212e3ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5effdf5d-1256-4cb9-8f03-14870afd2ebe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66086a6e-1b58-4594-801d-a5e38212e3ad","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d607d68-908c-419e-bea3-0ddb206bf1bf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5effdf5d-1256-4cb9-8f03-14870afd2ebe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66086a6e-1b58-4594-801d-a5e38212e3ad","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d607d68-908c-419e-bea3-0ddb206bf1bf","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_space_bg/spr_space_bg.yy b/sprites/spr_space_bg/spr_space_bg.yy index ac58dc7061..c3afd6da65 100644 --- a/sprites/spr_space_bg/spr_space_bg.yy +++ b/sprites/spr_space_bg/spr_space_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_space_bg", "bboxMode":0, "bbox_bottom":959, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","path":"sprites/spr_space_bg/spr_space_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c537d8f6-0233-4c6b-b155-7dc19778ee2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","path":"sprites/spr_space_bg/spr_space_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c537d8f6-0233-4c6b-b155-7dc19778ee2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_special_helm/spr_special_helm.yy b/sprites/spr_special_helm/spr_special_helm.yy index edc4532213..a316e8b055 100644 --- a/sprites/spr_special_helm/spr_special_helm.yy +++ b/sprites/spr_special_helm/spr_special_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_special_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_special_helm/spr_special_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"29377d0a-8ebc-44cf-a0ff-6122525f31aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_special_helm/spr_special_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"29377d0a-8ebc-44cf-a0ff-6122525f31aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_star/spr_star.yy b/sprites/spr_star/spr_star.yy index 202a96a2af..44240d6e5e 100644 --- a/sprites/spr_star/spr_star.yy +++ b/sprites/spr_star/spr_star.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star", "bboxMode":0, "bbox_bottom":72, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"282c87ae-537d-4711-a30b-867b90772a06","name":"282c87ae-537d-4711-a30b-867b90772a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c2c97573-50d7-4380-97e7-912a14586164","name":"c2c97573-50d7-4380-97e7-912a14586164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38b74789-1504-4070-ad76-e81c8093ef03","name":"38b74789-1504-4070-ad76-e81c8093ef03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"282c87ae-537d-4711-a30b-867b90772a06","name":"282c87ae-537d-4711-a30b-867b90772a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2c97573-50d7-4380-97e7-912a14586164","name":"c2c97573-50d7-4380-97e7-912a14586164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38b74789-1504-4070-ad76-e81c8093ef03","name":"38b74789-1504-4070-ad76-e81c8093ef03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"676cefc3-1d44-4b87-82a3-2be0a63f5ba6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"282c87ae-537d-4711-a30b-867b90772a06","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1403b62b-f2e9-46c8-9a38-eb371632c278","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e38b42a0-fdb5-483e-96e5-9202be8febe0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2c97573-50d7-4380-97e7-912a14586164","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a26c70c-4898-4592-b517-859992da0a34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38b74789-1504-4070-ad76-e81c8093ef03","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e938f3b-04a3-49eb-a82c-9ea5eb79b86b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05e516f5-df1d-461e-a970-8f8ee2d3bd29","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"676cefc3-1d44-4b87-82a3-2be0a63f5ba6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"282c87ae-537d-4711-a30b-867b90772a06","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1403b62b-f2e9-46c8-9a38-eb371632c278","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e38b42a0-fdb5-483e-96e5-9202be8febe0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2c97573-50d7-4380-97e7-912a14586164","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a26c70c-4898-4592-b517-859992da0a34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38b74789-1504-4070-ad76-e81c8093ef03","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e938f3b-04a3-49eb-a82c-9ea5eb79b86b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","path":"sprites/spr_star/spr_star.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05e516f5-df1d-461e-a970-8f8ee2d3bd29","IsCreationKey":false,"Key":5.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_star_hulk/spr_star_hulk.yy b/sprites/spr_star_hulk/spr_star_hulk.yy index 2e27b25b38..86320406dc 100644 --- a/sprites/spr_star_hulk/spr_star_hulk.yy +++ b/sprites/spr_star_hulk/spr_star_hulk.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star_hulk", "bboxMode":0, "bbox_bottom":21, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"16de02a6-5396-4e08-a02f-fd696ada6e19","name":"16de02a6-5396-4e08-a02f-fd696ada6e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16de02a6-5396-4e08-a02f-fd696ada6e19","name":"16de02a6-5396-4e08-a02f-fd696ada6e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16de02a6-5396-4e08-a02f-fd696ada6e19","path":"sprites/spr_star_hulk/spr_star_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75469e35-9e31-4205-864f-c31c0e2e7edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16de02a6-5396-4e08-a02f-fd696ada6e19","path":"sprites/spr_star_hulk/spr_star_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75469e35-9e31-4205-864f-c31c0e2e7edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_star_pulse/spr_star_pulse.yy b/sprites/spr_star_pulse/spr_star_pulse.yy index 8f2bd4ce7c..815942bbb9 100644 --- a/sprites/spr_star_pulse/spr_star_pulse.yy +++ b/sprites/spr_star_pulse/spr_star_pulse.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star_pulse", "bboxMode":0, "bbox_bottom":172, @@ -12,42 +12,42 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b17570c1-c47a-44d2-b51b-126fc579948d","name":"b17570c1-c47a-44d2-b51b-126fc579948d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0777e751-6431-464d-b099-418effdbd3a1","name":"0777e751-6431-464d-b099-418effdbd3a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea9ead90-c343-4b79-9686-7ec1be403072","name":"ea9ead90-c343-4b79-9686-7ec1be403072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99cde262-86c1-4089-96d9-b8b54aa96b82","name":"99cde262-86c1-4089-96d9-b8b54aa96b82","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d094549a-5d8e-42fe-a706-fc7bc673123b","name":"d094549a-5d8e-42fe-a706-fc7bc673123b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7009f93-222f-46bb-84d1-12a94037855b","name":"f7009f93-222f-46bb-84d1-12a94037855b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72206475-ad68-4919-9969-2de3db0e18bc","name":"72206475-ad68-4919-9969-2de3db0e18bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"568395ee-201e-45aa-9611-258858807004","name":"568395ee-201e-45aa-9611-258858807004","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d036c9cb-4a41-4864-8113-d520943c398c","name":"d036c9cb-4a41-4864-8113-d520943c398c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1981546-9720-4545-a78f-2b6bc11c32f4","name":"f1981546-9720-4545-a78f-2b6bc11c32f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"896295c8-c0e5-48b8-af68-18eb27b600f2","name":"896295c8-c0e5-48b8-af68-18eb27b600f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4529e739-ef42-43ed-8520-b8702a46b840","name":"4529e739-ef42-43ed-8520-b8702a46b840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a156d4d7-b489-4793-b1dc-69f1046127f4","name":"a156d4d7-b489-4793-b1dc-69f1046127f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b17570c1-c47a-44d2-b51b-126fc579948d","name":"b17570c1-c47a-44d2-b51b-126fc579948d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0777e751-6431-464d-b099-418effdbd3a1","name":"0777e751-6431-464d-b099-418effdbd3a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea9ead90-c343-4b79-9686-7ec1be403072","name":"ea9ead90-c343-4b79-9686-7ec1be403072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99cde262-86c1-4089-96d9-b8b54aa96b82","name":"99cde262-86c1-4089-96d9-b8b54aa96b82","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d094549a-5d8e-42fe-a706-fc7bc673123b","name":"d094549a-5d8e-42fe-a706-fc7bc673123b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7009f93-222f-46bb-84d1-12a94037855b","name":"f7009f93-222f-46bb-84d1-12a94037855b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72206475-ad68-4919-9969-2de3db0e18bc","name":"72206475-ad68-4919-9969-2de3db0e18bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"568395ee-201e-45aa-9611-258858807004","name":"568395ee-201e-45aa-9611-258858807004","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d036c9cb-4a41-4864-8113-d520943c398c","name":"d036c9cb-4a41-4864-8113-d520943c398c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1981546-9720-4545-a78f-2b6bc11c32f4","name":"f1981546-9720-4545-a78f-2b6bc11c32f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"896295c8-c0e5-48b8-af68-18eb27b600f2","name":"896295c8-c0e5-48b8-af68-18eb27b600f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4529e739-ef42-43ed-8520-b8702a46b840","name":"4529e739-ef42-43ed-8520-b8702a46b840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a156d4d7-b489-4793-b1dc-69f1046127f4","name":"a156d4d7-b489-4793-b1dc-69f1046127f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -103,114 +103,42 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b17570c1-c47a-44d2-b51b-126fc579948d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"022aa52b-6dcf-4392-ba1b-c135a09fb45b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0777e751-6431-464d-b099-418effdbd3a1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ed53312-bf9a-4cd2-862a-13c542640202","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6edff08-437d-4ce7-a8c0-d505859e7f60","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea9ead90-c343-4b79-9686-7ec1be403072","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"339b3224-c7b4-4038-b63a-c47b7e8c714b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b712de29-3b00-4ecb-bed9-a462d3ac5db4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99cde262-86c1-4089-96d9-b8b54aa96b82","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3a282a9-1b54-48ed-a31d-383bf7aa2570","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d094549a-5d8e-42fe-a706-fc7bc673123b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c43e5851-8ca3-4cf1-82b0-56edfa8bcef1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28b0e804-a08a-4e7d-bdb0-cca10a53c611","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8dfeaee9-9b0f-4e18-806f-c9ef09a9fdb1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7009f93-222f-46bb-84d1-12a94037855b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f1711c68-311f-4f81-9607-87c5cfad5eaf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75aeec36-56f3-4dc7-b4c9-e2c7719e997f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72206475-ad68-4919-9969-2de3db0e18bc","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b64f550e-ffd3-40ca-8b69-5b160dd0aab7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04bd8c72-3118-4ed1-b208-c8ac4880e000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b5ea088-5d42-4613-a0ec-071190cf32ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"568395ee-201e-45aa-9611-258858807004","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ecb80c0b-8492-4e25-89f0-a70b67f448b9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70321b1b-d944-482d-80c6-8075c413c313","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9b0f7b4-8c3f-4227-a8c6-5fa5ac9f7e41","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95ba5536-93a6-444e-b7a9-a3e4b64e7e61","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02a19f5a-045d-4731-9040-e7fff02841bb","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05b9c39e-3d12-46db-8165-bdbfd2803879","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69e1440d-58bd-435d-a21a-aed34aa20da6","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d036c9cb-4a41-4864-8113-d520943c398c","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d191695b-32c4-4118-966f-df1022efd415","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1981546-9720-4545-a78f-2b6bc11c32f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e51ed73-fa84-444e-8685-768804493025","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7cfa1d74-7dda-4f30-8473-b912f6ab8527","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4c44ea2-10a7-4d06-b956-29b9c1590ecc","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d9ef554-3d8e-4ea3-a3f8-f6753696fd68","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85f84d1a-91fa-42c5-a570-ede9ac2de9d5","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a83bbd8-53e2-45dc-a8e3-3a44e3d96301","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0db64db2-476d-48b3-9870-6807a514bc1a","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ce1af65-e4f0-4527-8b5b-a3950b8fb3e3","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"896295c8-c0e5-48b8-af68-18eb27b600f2","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc914f29-e38a-4e8c-9882-003d1af471b1","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f6977aa-07f2-4021-8442-027421b15871","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a26c223e-e49e-42e7-a245-8d8cb339920d","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4529e739-ef42-43ed-8520-b8702a46b840","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dda2b9c8-c8e0-4e78-a9bf-783b63564baa","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4783230-51be-41b8-8b71-a27d32398c5d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a156d4d7-b489-4793-b1dc-69f1046127f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b9c0da2-e18b-4a4d-91ea-643fe9c5d9a1","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b17570c1-c47a-44d2-b51b-126fc579948d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"022aa52b-6dcf-4392-ba1b-c135a09fb45b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0777e751-6431-464d-b099-418effdbd3a1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ed53312-bf9a-4cd2-862a-13c542640202","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6edff08-437d-4ce7-a8c0-d505859e7f60","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea9ead90-c343-4b79-9686-7ec1be403072","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"339b3224-c7b4-4038-b63a-c47b7e8c714b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b712de29-3b00-4ecb-bed9-a462d3ac5db4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99cde262-86c1-4089-96d9-b8b54aa96b82","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3a282a9-1b54-48ed-a31d-383bf7aa2570","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d094549a-5d8e-42fe-a706-fc7bc673123b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c43e5851-8ca3-4cf1-82b0-56edfa8bcef1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28b0e804-a08a-4e7d-bdb0-cca10a53c611","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8dfeaee9-9b0f-4e18-806f-c9ef09a9fdb1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7009f93-222f-46bb-84d1-12a94037855b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f1711c68-311f-4f81-9607-87c5cfad5eaf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75aeec36-56f3-4dc7-b4c9-e2c7719e997f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72206475-ad68-4919-9969-2de3db0e18bc","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b64f550e-ffd3-40ca-8b69-5b160dd0aab7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04bd8c72-3118-4ed1-b208-c8ac4880e000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b5ea088-5d42-4613-a0ec-071190cf32ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"568395ee-201e-45aa-9611-258858807004","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ecb80c0b-8492-4e25-89f0-a70b67f448b9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70321b1b-d944-482d-80c6-8075c413c313","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9b0f7b4-8c3f-4227-a8c6-5fa5ac9f7e41","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95ba5536-93a6-444e-b7a9-a3e4b64e7e61","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02a19f5a-045d-4731-9040-e7fff02841bb","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05b9c39e-3d12-46db-8165-bdbfd2803879","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69e1440d-58bd-435d-a21a-aed34aa20da6","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d036c9cb-4a41-4864-8113-d520943c398c","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d191695b-32c4-4118-966f-df1022efd415","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1981546-9720-4545-a78f-2b6bc11c32f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e51ed73-fa84-444e-8685-768804493025","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7cfa1d74-7dda-4f30-8473-b912f6ab8527","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4c44ea2-10a7-4d06-b956-29b9c1590ecc","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d9ef554-3d8e-4ea3-a3f8-f6753696fd68","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85f84d1a-91fa-42c5-a570-ede9ac2de9d5","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a83bbd8-53e2-45dc-a8e3-3a44e3d96301","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0db64db2-476d-48b3-9870-6807a514bc1a","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ce1af65-e4f0-4527-8b5b-a3950b8fb3e3","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"896295c8-c0e5-48b8-af68-18eb27b600f2","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc914f29-e38a-4e8c-9882-003d1af471b1","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f6977aa-07f2-4021-8442-027421b15871","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a26c223e-e49e-42e7-a245-8d8cb339920d","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4529e739-ef42-43ed-8520-b8702a46b840","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dda2b9c8-c8e0-4e78-a9bf-783b63564baa","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4783230-51be-41b8-8b71-a27d32398c5d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a156d4d7-b489-4793-b1dc-69f1046127f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b9c0da2-e18b-4a4d-91ea-643fe9c5d9a1","IsCreationKey":false,"Key":35.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":{ diff --git a/sprites/spr_star_screen/spr_star_screen.yy b/sprites/spr_star_screen/spr_star_screen.yy index e048d90e08..a586e372a4 100644 --- a/sprites/spr_star_screen/spr_star_screen.yy +++ b/sprites/spr_star_screen/spr_star_screen.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star_screen", "bboxMode":0, "bbox_bottom":293, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b40bc04c-5756-4025-969a-8000b0e6781c","name":"b40bc04c-5756-4025-969a-8000b0e6781c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38363157-05ad-48d2-95a0-1566c8e597be","name":"38363157-05ad-48d2-95a0-1566c8e597be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"525040f2-1ff1-449c-bad6-f578ef258589","name":"525040f2-1ff1-449c-bad6-f578ef258589","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"45dbbde0-3065-4dc4-b203-e27a80367595","name":"45dbbde0-3065-4dc4-b203-e27a80367595","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c5567e6-4464-474d-b78f-43a163963db2","name":"3c5567e6-4464-474d-b78f-43a163963db2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8247b76b-beb3-4777-9099-01fd1da955ba","name":"8247b76b-beb3-4777-9099-01fd1da955ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b40bc04c-5756-4025-969a-8000b0e6781c","name":"b40bc04c-5756-4025-969a-8000b0e6781c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38363157-05ad-48d2-95a0-1566c8e597be","name":"38363157-05ad-48d2-95a0-1566c8e597be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"525040f2-1ff1-449c-bad6-f578ef258589","name":"525040f2-1ff1-449c-bad6-f578ef258589","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45dbbde0-3065-4dc4-b203-e27a80367595","name":"45dbbde0-3065-4dc4-b203-e27a80367595","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c5567e6-4464-474d-b78f-43a163963db2","name":"3c5567e6-4464-474d-b78f-43a163963db2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8247b76b-beb3-4777-9099-01fd1da955ba","name":"8247b76b-beb3-4777-9099-01fd1da955ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b40bc04c-5756-4025-969a-8000b0e6781c","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c270aba7-52e1-4066-b249-c2e38393c822","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38363157-05ad-48d2-95a0-1566c8e597be","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d2a1e23-3854-4b5e-9dc3-07e987869bb0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"525040f2-1ff1-449c-bad6-f578ef258589","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6cd1343-e1c9-4304-be44-1657aacb8513","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad8ca15e-fd60-4c87-a6a3-6451a9a31df2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45dbbde0-3065-4dc4-b203-e27a80367595","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7020ba6d-e494-4724-b6ed-3dfb967fb190","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c5567e6-4464-474d-b78f-43a163963db2","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cc9e0c9-e2a0-4261-8c89-fa25331ec4db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8247b76b-beb3-4777-9099-01fd1da955ba","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02333eb2-854d-402d-842f-f68af649ee42","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b40bc04c-5756-4025-969a-8000b0e6781c","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c270aba7-52e1-4066-b249-c2e38393c822","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38363157-05ad-48d2-95a0-1566c8e597be","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d2a1e23-3854-4b5e-9dc3-07e987869bb0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"525040f2-1ff1-449c-bad6-f578ef258589","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6cd1343-e1c9-4304-be44-1657aacb8513","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad8ca15e-fd60-4c87-a6a3-6451a9a31df2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45dbbde0-3065-4dc4-b203-e27a80367595","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7020ba6d-e494-4724-b6ed-3dfb967fb190","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c5567e6-4464-474d-b78f-43a163963db2","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cc9e0c9-e2a0-4261-8c89-fa25331ec4db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8247b76b-beb3-4777-9099-01fd1da955ba","path":"sprites/spr_star_screen/spr_star_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02333eb2-854d-402d-842f-f68af649ee42","IsCreationKey":false,"Key":6.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_strength_icon/spr_strength_icon.yy b/sprites/spr_strength_icon/spr_strength_icon.yy index c3ecee1bde..8729f1e97a 100644 --- a/sprites/spr_strength_icon/spr_strength_icon.yy +++ b/sprites/spr_strength_icon/spr_strength_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_strength_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","path":"sprites/spr_strength_icon/spr_strength_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f495221-4734-4736-b81f-5356718081ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","path":"sprites/spr_strength_icon/spr_strength_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f495221-4734-4736-b81f-5356718081ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy b/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy index d6cb43692b..4ba89741ec 100644 --- a/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy +++ b/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sw_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b39094a-4165-436a-b7e9-7abd097e059b","name":"8b39094a-4165-436a-b7e9-7abd097e059b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b39094a-4165-436a-b7e9-7abd097e059b","name":"8b39094a-4165-436a-b7e9-7abd097e059b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44c4d073-b234-4412-b6f5-bfc150b3810b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b39094a-4165-436a-b7e9-7abd097e059b","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee3331fc-28ea-4a9e-b855-5a7083e36d58","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44c4d073-b234-4412-b6f5-bfc150b3810b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b39094a-4165-436a-b7e9-7abd097e059b","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3331fc-28ea-4a9e-b855-5a7083e36d58","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_sw_mk6_helm/spr_sw_mk6_helm.yy b/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy index b084a0a0f6..f20c9b957d 100644 --- a/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy +++ b/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sw_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bb72a259-1e38-4149-8200-f6a5c4b33850","name":"bb72a259-1e38-4149-8200-f6a5c4b33850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb72a259-1e38-4149-8200-f6a5c4b33850","name":"bb72a259-1e38-4149-8200-f6a5c4b33850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb72a259-1e38-4149-8200-f6a5c4b33850","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c902c7a-223b-4233-9dc3-c191de3e4085","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5570e42c-c74a-4c08-854d-b63a2516f277","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb72a259-1e38-4149-8200-f6a5c4b33850","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c902c7a-223b-4233-9dc3-c191de3e4085","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5570e42c-c74a-4c08-854d-b63a2516f277","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_sw_mk7_helm/spr_sw_mk7_helm.yy b/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy index a69877a592..927d4c1e75 100644 --- a/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy +++ b/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sw_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"189e3236-d097-4322-8122-3e48d302a028","name":"189e3236-d097-4322-8122-3e48d302a028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"189e3236-d097-4322-8122-3e48d302a028","name":"189e3236-d097-4322-8122-3e48d302a028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"189e3236-d097-4322-8122-3e48d302a028","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca779862-985c-4a3f-9364-35773b53070d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5de7c416-d037-453b-a42d-7a20173dd605","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"189e3236-d097-4322-8122-3e48d302a028","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca779862-985c-4a3f-9364-35773b53070d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5de7c416-d037-453b-a42d-7a20173dd605","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_sword_pendant/spr_sword_pendant.yy b/sprites/spr_sword_pendant/spr_sword_pendant.yy index 929cd8ef53..6fa466365e 100644 --- a/sprites/spr_sword_pendant/spr_sword_pendant.yy +++ b/sprites/spr_sword_pendant/spr_sword_pendant.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sword_pendant", "bboxMode":0, "bbox_bottom":25, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fce0aede-094a-47b8-be8e-8f04a9807531","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fce0aede-094a-47b8-be8e-8f04a9807531","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy b/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy index 622844353d..e157dec361 100644 --- a/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy +++ b/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros2_colors", "bboxMode":0, "bbox_bottom":259, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0bcfa324-70be-491f-9c81-e421ae10e401","name":"0bcfa324-70be-491f-9c81-e421ae10e401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f3656b9-6717-4477-b5d1-05235b9bd903","name":"1f3656b9-6717-4477-b5d1-05235b9bd903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"543bf910-3b46-44a3-b42d-585dec34b2e9","name":"543bf910-3b46-44a3-b42d-585dec34b2e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0bcfa324-70be-491f-9c81-e421ae10e401","name":"0bcfa324-70be-491f-9c81-e421ae10e401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f3656b9-6717-4477-b5d1-05235b9bd903","name":"1f3656b9-6717-4477-b5d1-05235b9bd903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"543bf910-3b46-44a3-b42d-585dec34b2e9","name":"543bf910-3b46-44a3-b42d-585dec34b2e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c41f3900-dc12-4b49-b98b-0d7a170baf03","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85c89a55-0327-4971-80ce-3366386f4218","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5acd614e-59ae-470d-801a-c8adbb073f8e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c086917-1259-4e08-bf38-0ea689d5711c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bcfa324-70be-491f-9c81-e421ae10e401","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e364c448-758c-4a68-928f-88638a34ea3f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8419621f-a2f0-42cf-b98d-b404fffaa3f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f3656b9-6717-4477-b5d1-05235b9bd903","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"613095cf-4896-472c-93d2-8e788859056d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"543bf910-3b46-44a3-b42d-585dec34b2e9","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67109820-6a6a-4c70-bf3e-d19a71229201","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed8a8b8c-e81b-4607-8f51-36a892833bc2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f3cc6f8-a073-4de5-ab24-7c85adbed67c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee316a3e-0794-43c9-9602-1d5b9a1337cc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c41f3900-dc12-4b49-b98b-0d7a170baf03","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85c89a55-0327-4971-80ce-3366386f4218","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5acd614e-59ae-470d-801a-c8adbb073f8e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c086917-1259-4e08-bf38-0ea689d5711c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bcfa324-70be-491f-9c81-e421ae10e401","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e364c448-758c-4a68-928f-88638a34ea3f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8419621f-a2f0-42cf-b98d-b404fffaa3f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f3656b9-6717-4477-b5d1-05235b9bd903","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"613095cf-4896-472c-93d2-8e788859056d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"543bf910-3b46-44a3-b42d-585dec34b2e9","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67109820-6a6a-4c70-bf3e-d19a71229201","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed8a8b8c-e81b-4607-8f51-36a892833bc2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f3cc6f8-a073-4de5-ab24-7c85adbed67c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee316a3e-0794-43c9-9602-1d5b9a1337cc","IsCreationKey":false,"Key":10.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_tartaros_arms/spr_tartaros_arms.yy b/sprites/spr_tartaros_arms/spr_tartaros_arms.yy index b482e5c5dc..37e43b3451 100644 --- a/sprites/spr_tartaros_arms/spr_tartaros_arms.yy +++ b/sprites/spr_tartaros_arms/spr_tartaros_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_arms", "bboxMode":0, "bbox_bottom":178, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"72c8c22c-c531-4432-b060-e05b68525d15","name":"72c8c22c-c531-4432-b060-e05b68525d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72c8c22c-c531-4432-b060-e05b68525d15","name":"72c8c22c-c531-4432-b060-e05b68525d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72c8c22c-c531-4432-b060-e05b68525d15","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6bb2b66-a648-4395-a38d-c93170a269e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72c8c22c-c531-4432-b060-e05b68525d15","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6bb2b66-a648-4395-a38d-c93170a269e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros_chest/spr_tartaros_chest.yy b/sprites/spr_tartaros_chest/spr_tartaros_chest.yy index 67c1722d8f..f478936088 100644 --- a/sprites/spr_tartaros_chest/spr_tartaros_chest.yy +++ b/sprites/spr_tartaros_chest/spr_tartaros_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_chest", "bboxMode":0, "bbox_bottom":124, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1fba91e-ad9a-43f5-9563-4660af64f354","name":"c1fba91e-ad9a-43f5-9563-4660af64f354","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1fba91e-ad9a-43f5-9563-4660af64f354","name":"c1fba91e-ad9a-43f5-9563-4660af64f354","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"614d5587-3f3b-4727-832e-9a4a26b4e261","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fc80f31-12c7-4a2b-8b28-b89867d9f9d7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"226750b9-f6d5-4984-a641-3e83f01f49d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4342a328-5f7a-4eb1-9741-993a5add8e13","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fba91e-ad9a-43f5-9563-4660af64f354","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3b1e77f-e553-4d71-b0d1-17a80320e88e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"614d5587-3f3b-4727-832e-9a4a26b4e261","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fc80f31-12c7-4a2b-8b28-b89867d9f9d7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"226750b9-f6d5-4984-a641-3e83f01f49d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4342a328-5f7a-4eb1-9741-993a5add8e13","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fba91e-ad9a-43f5-9563-4660af64f354","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3b1e77f-e553-4d71-b0d1-17a80320e88e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros_colors/spr_tartaros_colors.yy b/sprites/spr_tartaros_colors/spr_tartaros_colors.yy index 0b84ec4fd5..566896eba2 100644 --- a/sprites/spr_tartaros_colors/spr_tartaros_colors.yy +++ b/sprites/spr_tartaros_colors/spr_tartaros_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_colors", "bboxMode":0, "bbox_bottom":231, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5426d439-bb49-4082-84f2-452c2d01792d","name":"5426d439-bb49-4082-84f2-452c2d01792d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"532e1c80-fbc6-423b-b4b7-054831518ddb","name":"532e1c80-fbc6-423b-b4b7-054831518ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5426d439-bb49-4082-84f2-452c2d01792d","name":"5426d439-bb49-4082-84f2-452c2d01792d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"532e1c80-fbc6-423b-b4b7-054831518ddb","name":"532e1c80-fbc6-423b-b4b7-054831518ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34b77065-59f1-48fd-bbff-25801600d196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5426d439-bb49-4082-84f2-452c2d01792d","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53780185-be8b-46ac-912d-7c692f3f010b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1866eb17-5b89-4bd2-828c-3538411f9ad2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"216105e0-d4c9-4ecc-bdf8-3f2847611871","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7918b408-3607-4ae0-bdbf-9d8fb59221a2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3eca94f8-cb12-4785-b37b-97cf40cac3b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7971b6c4-b7bd-4dbc-a538-fcef7c030333","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"532e1c80-fbc6-423b-b4b7-054831518ddb","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"788ca99e-a175-4c13-a67c-3588c28d7096","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a5c67d6-8638-4da5-9708-42645eca8cc1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6d5d89e-ff91-442b-95ca-096f4946bc98","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34b77065-59f1-48fd-bbff-25801600d196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5426d439-bb49-4082-84f2-452c2d01792d","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53780185-be8b-46ac-912d-7c692f3f010b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1866eb17-5b89-4bd2-828c-3538411f9ad2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"216105e0-d4c9-4ecc-bdf8-3f2847611871","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7918b408-3607-4ae0-bdbf-9d8fb59221a2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3eca94f8-cb12-4785-b37b-97cf40cac3b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7971b6c4-b7bd-4dbc-a538-fcef7c030333","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"532e1c80-fbc6-423b-b4b7-054831518ddb","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"788ca99e-a175-4c13-a67c-3588c28d7096","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a5c67d6-8638-4da5-9708-42645eca8cc1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6d5d89e-ff91-442b-95ca-096f4946bc98","IsCreationKey":false,"Key":9.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":{ diff --git a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy index cae9cf8490..0bc2a54da2 100644 --- a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy +++ b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_complex", "bboxMode":0, "bbox_bottom":204, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"200ce5df-a2aa-43be-8768-a74ae1023185","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"200ce5df-a2aa-43be-8768-a74ae1023185","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy b/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy index 9816929fd4..5bb2c636b3 100644 --- a/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy +++ b/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_faceplate", "bboxMode":0, "bbox_bottom":68, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1bbe2e76-e507-418e-8883-0db45afc0631","name":"1bbe2e76-e507-418e-8883-0db45afc0631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d2594043-39aa-46d0-b252-cce3b13f1f83","name":"d2594043-39aa-46d0-b252-cce3b13f1f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1bbe2e76-e507-418e-8883-0db45afc0631","name":"1bbe2e76-e507-418e-8883-0db45afc0631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2594043-39aa-46d0-b252-cce3b13f1f83","name":"d2594043-39aa-46d0-b252-cce3b13f1f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bbe2e76-e507-418e-8883-0db45afc0631","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ad15b71-232e-4b9e-af97-b93727f87d22","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2594043-39aa-46d0-b252-cce3b13f1f83","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3780d8c2-ec67-452f-99ba-bd70998da1b4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bbe2e76-e507-418e-8883-0db45afc0631","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ad15b71-232e-4b9e-af97-b93727f87d22","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2594043-39aa-46d0-b252-cce3b13f1f83","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3780d8c2-ec67-452f-99ba-bd70998da1b4","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_tartaros_gorget/spr_tartaros_gorget.yy b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy index d40c80760d..8d992146aa 100644 --- a/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy +++ b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_gorget", "bboxMode":0, "bbox_bottom":87, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7183111f-9020-46b1-8c8d-6f3863650227","name":"7183111f-9020-46b1-8c8d-6f3863650227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7183111f-9020-46b1-8c8d-6f3863650227","name":"7183111f-9020-46b1-8c8d-6f3863650227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9235ed8a-8884-482b-beb0-ca7bd8d76034","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7183111f-9020-46b1-8c8d-6f3863650227","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"239b9ef2-147e-4638-b8bf-9fb260690813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"060a888c-3c91-4a53-8080-9c7158db2809","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"17f13e4b-ebf1-48e5-a312-bc3f5a8ff078","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9235ed8a-8884-482b-beb0-ca7bd8d76034","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7183111f-9020-46b1-8c8d-6f3863650227","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"239b9ef2-147e-4638-b8bf-9fb260690813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"060a888c-3c91-4a53-8080-9c7158db2809","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"17f13e4b-ebf1-48e5-a312-bc3f5a8ff078","IsCreationKey":false,"Key":3.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_tartaros_head_variants/spr_tartaros_head_variants.yy b/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy index 15f958ab85..9772841dbc 100644 --- a/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy +++ b/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_head_variants", "bboxMode":0, "bbox_bottom":68, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","IsCreationKey":false,"Key":3.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_tartaros_left_arm/spr_tartaros_left_arm.yy b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy index d98b23c650..e4bb833db9 100644 --- a/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy +++ b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_left_arm", "bboxMode":0, "bbox_bottom":169, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b145eebe-c835-41cf-bd87-3c3bea207624","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b145eebe-c835-41cf-bd87-3c3bea207624","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy b/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy index f71672f665..4f8a51c7ac 100644 --- a/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy +++ b/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_left_leg", "bboxMode":0, "bbox_bottom":259, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"653c4b23-ec3f-4d49-ae10-5c7e4e5be38b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1883bea-ff73-4dff-b321-2056492825f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11a92fc7-841a-4ccb-b540-46106925949c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b7991bc-e7c7-4705-bc58-08069621d87a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8adf71b2-d631-415c-b16f-a35ad4e63d75","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"653c4b23-ec3f-4d49-ae10-5c7e4e5be38b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1883bea-ff73-4dff-b321-2056492825f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11a92fc7-841a-4ccb-b540-46106925949c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b7991bc-e7c7-4705-bc58-08069621d87a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8adf71b2-d631-415c-b16f-a35ad4e63d75","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy b/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy index 371f86a4f8..14b3cdffc5 100644 --- a/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy +++ b/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_left_trim", "bboxMode":0, "bbox_bottom":179, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,24 +75,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87c67940-615a-4e4c-96cf-ace9b6595aec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6512c5fb-4688-450e-910f-44cf16e2beaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba4e548a-d091-462f-b13c-22072470a25f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"558d01e7-d386-4e7d-b377-e2a5a8bcf3ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e02a6d09-d97e-4137-a1cb-faf4a8a7120d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88356a81-e2c1-4885-a67f-5d82110bef59","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87c67940-615a-4e4c-96cf-ace9b6595aec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6512c5fb-4688-450e-910f-44cf16e2beaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba4e548a-d091-462f-b13c-22072470a25f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"558d01e7-d386-4e7d-b377-e2a5a8bcf3ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e02a6d09-d97e-4137-a1cb-faf4a8a7120d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88356a81-e2c1-4885-a67f-5d82110bef59","IsCreationKey":false,"Key":5.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_tartaros_right_arm/spr_tartaros_right_arm.yy b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy index 2a33d0c455..1e03b05d9b 100644 --- a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy +++ b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_right_arm", "bboxMode":0, "bbox_bottom":169, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy b/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy index db9ca928b9..7715afa3be 100644 --- a/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy +++ b/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_right_leg", "bboxMode":0, "bbox_bottom":259, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b89831c0-4b54-41e5-ad80-4d838fe31550","name":"b89831c0-4b54-41e5-ad80-4d838fe31550","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"392ae0b5-e73f-4011-a77c-8cf14df79212","name":"392ae0b5-e73f-4011-a77c-8cf14df79212","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f31258fb-8e42-40fa-9abe-d50ce4077249","name":"f31258fb-8e42-40fa-9abe-d50ce4077249","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b89831c0-4b54-41e5-ad80-4d838fe31550","name":"b89831c0-4b54-41e5-ad80-4d838fe31550","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"392ae0b5-e73f-4011-a77c-8cf14df79212","name":"392ae0b5-e73f-4011-a77c-8cf14df79212","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f31258fb-8e42-40fa-9abe-d50ce4077249","name":"f31258fb-8e42-40fa-9abe-d50ce4077249","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33b4a69d-c4a8-4d97-b35c-86e75a42672f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89831c0-4b54-41e5-ad80-4d838fe31550","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4aa238e1-d30d-41d0-8a60-6f15dbe70cd1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"392ae0b5-e73f-4011-a77c-8cf14df79212","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93472bf0-431a-46f8-ad3c-040210e0bd9e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f31258fb-8e42-40fa-9abe-d50ce4077249","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b458f2e1-0c00-407a-bf09-7a64ef6bf3e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b8fc32b-fe8a-41b2-8970-72f6bd2a6892","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33b4a69d-c4a8-4d97-b35c-86e75a42672f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89831c0-4b54-41e5-ad80-4d838fe31550","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4aa238e1-d30d-41d0-8a60-6f15dbe70cd1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"392ae0b5-e73f-4011-a77c-8cf14df79212","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93472bf0-431a-46f8-ad3c-040210e0bd9e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f31258fb-8e42-40fa-9abe-d50ce4077249","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b458f2e1-0c00-407a-bf09-7a64ef6bf3e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b8fc32b-fe8a-41b2-8970-72f6bd2a6892","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy b/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy index c4056ee666..db1811217f 100644 --- a/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy +++ b/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_right_trim", "bboxMode":0, "bbox_bottom":179, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76deae19-d9fc-4802-8db5-0ee21731ef01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c445da5a-43c3-45e6-b38d-aca5f22fd53b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10585c1e-d18e-4e00-9ea7-0ba35ccfd87c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc5d7569-0411-4194-845d-954de995277f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0423a612-f90c-42e1-8c56-e4dbe243a6fb","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a280a15-1721-43d4-a285-202541575345","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76deae19-d9fc-4802-8db5-0ee21731ef01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c445da5a-43c3-45e6-b38d-aca5f22fd53b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10585c1e-d18e-4e00-9ea7-0ba35ccfd87c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc5d7569-0411-4194-845d-954de995277f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0423a612-f90c-42e1-8c56-e4dbe243a6fb","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a280a15-1721-43d4-a285-202541575345","IsCreationKey":false,"Key":5.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_tartaros_wep_fix/spr_tartaros_wep_fix.yy b/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy index 59d048a09b..3c612bd174 100644 --- a/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy +++ b/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_wep_fix", "bboxMode":0, "bbox_bottom":121, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a5005ac-6216-44bc-b706-2bd323adfdca","name":"8a5005ac-6216-44bc-b706-2bd323adfdca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0e289447-ea02-402e-bbb6-93bf479dd88b","name":"0e289447-ea02-402e-bbb6-93bf479dd88b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc96bc38-34b5-4115-974e-6be49247a8d8","name":"fc96bc38-34b5-4115-974e-6be49247a8d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dabfefca-b76d-4d72-911a-69234fe7e85e","name":"dabfefca-b76d-4d72-911a-69234fe7e85e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"366cf225-a6ef-410a-822d-f0af9092e681","name":"366cf225-a6ef-410a-822d-f0af9092e681","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"349e147a-6dce-4007-a48c-60232e9137bf","name":"349e147a-6dce-4007-a48c-60232e9137bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a5005ac-6216-44bc-b706-2bd323adfdca","name":"8a5005ac-6216-44bc-b706-2bd323adfdca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e289447-ea02-402e-bbb6-93bf479dd88b","name":"0e289447-ea02-402e-bbb6-93bf479dd88b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc96bc38-34b5-4115-974e-6be49247a8d8","name":"fc96bc38-34b5-4115-974e-6be49247a8d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dabfefca-b76d-4d72-911a-69234fe7e85e","name":"dabfefca-b76d-4d72-911a-69234fe7e85e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"366cf225-a6ef-410a-822d-f0af9092e681","name":"366cf225-a6ef-410a-822d-f0af9092e681","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"349e147a-6dce-4007-a48c-60232e9137bf","name":"349e147a-6dce-4007-a48c-60232e9137bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a5005ac-6216-44bc-b706-2bd323adfdca","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed85afa1-11fe-436b-a3ae-3497b17b914f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e289447-ea02-402e-bbb6-93bf479dd88b","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc128896-cc76-4c73-bf7f-f66d2d6a761c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc96bc38-34b5-4115-974e-6be49247a8d8","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d757176-73e1-41d5-a3c2-5416efd47f06","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6abe1c9-0906-41c5-8e32-137ad16cd932","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dabfefca-b76d-4d72-911a-69234fe7e85e","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b60fe942-8a18-4ece-9d11-8eb0cdaade49","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bac48702-3627-4115-a9ee-84a4eefee624","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"366cf225-a6ef-410a-822d-f0af9092e681","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b7cfa11-bce0-489d-93a7-5f40c6aa9e14","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"349e147a-6dce-4007-a48c-60232e9137bf","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd7d60f6-9862-4cdc-8a31-e4df4f1905cf","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a5005ac-6216-44bc-b706-2bd323adfdca","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed85afa1-11fe-436b-a3ae-3497b17b914f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e289447-ea02-402e-bbb6-93bf479dd88b","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc128896-cc76-4c73-bf7f-f66d2d6a761c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc96bc38-34b5-4115-974e-6be49247a8d8","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d757176-73e1-41d5-a3c2-5416efd47f06","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6abe1c9-0906-41c5-8e32-137ad16cd932","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dabfefca-b76d-4d72-911a-69234fe7e85e","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b60fe942-8a18-4ece-9d11-8eb0cdaade49","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bac48702-3627-4115-a9ee-84a4eefee624","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"366cf225-a6ef-410a-822d-f0af9092e681","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b7cfa11-bce0-489d-93a7-5f40c6aa9e14","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"349e147a-6dce-4007-a48c-60232e9137bf","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd7d60f6-9862-4cdc-8a31-e4df4f1905cf","IsCreationKey":false,"Key":7.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_tech_area_pad/spr_tech_area_pad.yy b/sprites/spr_tech_area_pad/spr_tech_area_pad.yy index 7236c43e8b..ff49f92fe1 100644 --- a/sprites/spr_tech_area_pad/spr_tech_area_pad.yy +++ b/sprites/spr_tech_area_pad/spr_tech_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tech_area_pad", "bboxMode":0, "bbox_bottom":157, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cc6ac14-847e-4e48-85ea-c50a7d853055","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cc6ac14-847e-4e48-85ea-c50a7d853055","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tech_belt/spr_tech_belt.yy b/sprites/spr_tech_belt/spr_tech_belt.yy index b18d5a194c..6b5e6d0613 100644 --- a/sprites/spr_tech_belt/spr_tech_belt.yy +++ b/sprites/spr_tech_belt/spr_tech_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tech_belt", "bboxMode":0, "bbox_bottom":113, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e80f57ce-b07a-4131-bc96-09b91013c0e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e80f57ce-b07a-4131-bc96-09b91013c0e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tech_face_plate/spr_tech_face_plate.yy b/sprites/spr_tech_face_plate/spr_tech_face_plate.yy index 1b08313cfe..6be78c0241 100644 --- a/sprites/spr_tech_face_plate/spr_tech_face_plate.yy +++ b/sprites/spr_tech_face_plate/spr_tech_face_plate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tech_face_plate", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a68cfe1-8533-4723-9fc1-c27fb8484d51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a68cfe1-8533-4723-9fc1-c27fb8484d51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techmarine_chest/spr_techmarine_chest.yy b/sprites/spr_techmarine_chest/spr_techmarine_chest.yy index 0a7491f813..21fcfce3b8 100644 --- a/sprites/spr_techmarine_chest/spr_techmarine_chest.yy +++ b/sprites/spr_techmarine_chest/spr_techmarine_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_chest", "bboxMode":0, "bbox_bottom":89, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b569e059-78e5-4c50-b871-22eb94b0b506","name":"b569e059-78e5-4c50-b871-22eb94b0b506","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b569e059-78e5-4c50-b871-22eb94b0b506","name":"b569e059-78e5-4c50-b871-22eb94b0b506","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b569e059-78e5-4c50-b871-22eb94b0b506","path":"sprites/spr_techmarine_chest/spr_techmarine_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8491130e-91ef-40e6-b272-88bbff923f67","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b569e059-78e5-4c50-b871-22eb94b0b506","path":"sprites/spr_techmarine_chest/spr_techmarine_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8491130e-91ef-40e6-b272-88bbff923f67","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techmarine_complex/spr_techmarine_complex.yy b/sprites/spr_techmarine_complex/spr_techmarine_complex.yy index 4cc15edf0d..7f737e710c 100644 --- a/sprites/spr_techmarine_complex/spr_techmarine_complex.yy +++ b/sprites/spr_techmarine_complex/spr_techmarine_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_techmarine_complex/spr_techmarine_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ae9f309-78c6-4606-92b1-e0f1c674862b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_techmarine_complex/spr_techmarine_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ae9f309-78c6-4606-92b1-e0f1c674862b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techmarine_core/spr_techmarine_core.yy b/sprites/spr_techmarine_core/spr_techmarine_core.yy index 78bb655f5f..44aa41efcf 100644 --- a/sprites/spr_techmarine_core/spr_techmarine_core.yy +++ b/sprites/spr_techmarine_core/spr_techmarine_core.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_core", "bboxMode":0, "bbox_bottom":259, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d51b2fb6-4915-4181-8c98-cae57deb4866","name":"d51b2fb6-4915-4181-8c98-cae57deb4866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3d110598-0228-4efe-ba5e-08cf667ed23b","name":"3d110598-0228-4efe-ba5e-08cf667ed23b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41baa262-b761-43e7-85eb-08b7824a9899","name":"41baa262-b761-43e7-85eb-08b7824a9899","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7ee93fc8-dd78-44d7-bb05-85445635e575","name":"7ee93fc8-dd78-44d7-bb05-85445635e575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a5226976-0539-4c1e-9467-9092d8ec7697","name":"a5226976-0539-4c1e-9467-9092d8ec7697","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d51b2fb6-4915-4181-8c98-cae57deb4866","name":"d51b2fb6-4915-4181-8c98-cae57deb4866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d110598-0228-4efe-ba5e-08cf667ed23b","name":"3d110598-0228-4efe-ba5e-08cf667ed23b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41baa262-b761-43e7-85eb-08b7824a9899","name":"41baa262-b761-43e7-85eb-08b7824a9899","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ee93fc8-dd78-44d7-bb05-85445635e575","name":"7ee93fc8-dd78-44d7-bb05-85445635e575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a5226976-0539-4c1e-9467-9092d8ec7697","name":"a5226976-0539-4c1e-9467-9092d8ec7697","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25cc4882-27cd-4eb3-8927-46d566e0e7b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a8a1299-9aee-4121-ba72-9229b4164ae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f6d611a-eeda-4ef8-b7d9-7d86184ba07b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51b2fb6-4915-4181-8c98-cae57deb4866","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ba5f3d8-f4b7-45d7-85fb-9fcb7142ee9c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d110598-0228-4efe-ba5e-08cf667ed23b","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69e3269e-2975-42ee-95c9-20f36bd86568","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41baa262-b761-43e7-85eb-08b7824a9899","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c92658c8-d4d4-4317-b200-9c8575a2bd45","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ee93fc8-dd78-44d7-bb05-85445635e575","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e75b9c32-73ee-4045-81ac-fbbdf654ab9b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4bd41038-2b15-43a9-a241-2531898b6533","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5226976-0539-4c1e-9467-9092d8ec7697","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2341b86a-9533-41e8-be8a-23eec3ef15de","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca8c5988-e83e-45e8-80cd-806e8a04b657","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25cc4882-27cd-4eb3-8927-46d566e0e7b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a8a1299-9aee-4121-ba72-9229b4164ae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f6d611a-eeda-4ef8-b7d9-7d86184ba07b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51b2fb6-4915-4181-8c98-cae57deb4866","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ba5f3d8-f4b7-45d7-85fb-9fcb7142ee9c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d110598-0228-4efe-ba5e-08cf667ed23b","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69e3269e-2975-42ee-95c9-20f36bd86568","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41baa262-b761-43e7-85eb-08b7824a9899","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c92658c8-d4d4-4317-b200-9c8575a2bd45","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ee93fc8-dd78-44d7-bb05-85445635e575","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e75b9c32-73ee-4045-81ac-fbbdf654ab9b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bd41038-2b15-43a9-a241-2531898b6533","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5226976-0539-4c1e-9467-9092d8ec7697","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2341b86a-9533-41e8-be8a-23eec3ef15de","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca8c5988-e83e-45e8-80cd-806e8a04b657","IsCreationKey":false,"Key":9.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_techmarine_head/spr_techmarine_head.yy b/sprites/spr_techmarine_head/spr_techmarine_head.yy index 2547bee8db..a576cfa1d5 100644 --- a/sprites/spr_techmarine_head/spr_techmarine_head.yy +++ b/sprites/spr_techmarine_head/spr_techmarine_head.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_head", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","path":"sprites/spr_techmarine_head/spr_techmarine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f17da9e-e4d9-4a1a-9efa-95332a851900","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","path":"sprites/spr_techmarine_head/spr_techmarine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f17da9e-e4d9-4a1a-9efa-95332a851900","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy b/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy index e20b77191d..5ac39ed748 100644 --- a/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy +++ b/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_left_leg", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1a391d8-2716-4aea-9397-eb2bc0265424","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1a391d8-2716-4aea-9397-eb2bc0265424","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy b/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy index 5a19a5f656..a192ea3494 100644 --- a/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy +++ b/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_left_trim", "bboxMode":0, "bbox_bottom":80, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8610019-e23e-458a-aa65-2af7f50f6808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8610019-e23e-458a-aa65-2af7f50f6808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy b/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy index c4edf5534c..841ed18538 100644 --- a/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy +++ b/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_right_leg", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fa489e4-21d5-4860-b8a0-45f9bc4cfbe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fa489e4-21d5-4860-b8a0-45f9bc4cfbe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy b/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy index 38c87de4ff..509ba39940 100644 --- a/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy +++ b/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38b42a12-0577-49fd-862f-87f307212a9e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38b42a12-0577-49fd-862f-87f307212a9e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_technology_icon/spr_technology_icon.yy b/sprites/spr_technology_icon/spr_technology_icon.yy index 7621b61176..3a3654385d 100644 --- a/sprites/spr_technology_icon/spr_technology_icon.yy +++ b/sprites/spr_technology_icon/spr_technology_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_technology_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","path":"sprites/spr_technology_icon/spr_technology_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c875136c-f820-405d-bbe3-72fa5365a15c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","path":"sprites/spr_technology_icon/spr_technology_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c875136c-f820-405d-bbe3-72fa5365a15c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techpriest/spr_techpriest.yy b/sprites/spr_techpriest/spr_techpriest.yy index 591f980331..1d583891a9 100644 --- a/sprites/spr_techpriest/spr_techpriest.yy +++ b/sprites/spr_techpriest/spr_techpriest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techpriest", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"15cd6a2d-e361-4e25-861e-4d350855c408","name":"15cd6a2d-e361-4e25-861e-4d350855c408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15cd6a2d-e361-4e25-861e-4d350855c408","name":"15cd6a2d-e361-4e25-861e-4d350855c408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15cd6a2d-e361-4e25-861e-4d350855c408","path":"sprites/spr_techpriest/spr_techpriest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf5066ba-7cb7-42ea-8018-8d5ef42ff4ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15cd6a2d-e361-4e25-861e-4d350855c408","path":"sprites/spr_techpriest/spr_techpriest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf5066ba-7cb7-42ea-8018-8d5ef42ff4ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_teeth/spr_teeth.yy b/sprites/spr_teeth/spr_teeth.yy index 313e1556a2..4824b7a8dd 100644 --- a/sprites/spr_teeth/spr_teeth.yy +++ b/sprites/spr_teeth/spr_teeth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_teeth", "bboxMode":0, "bbox_bottom":36, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0314e59f-510c-49f1-aa68-e46181aa4b51","name":"0314e59f-510c-49f1-aa68-e46181aa4b51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0314e59f-510c-49f1-aa68-e46181aa4b51","name":"0314e59f-510c-49f1-aa68-e46181aa4b51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e66df479-4ca7-4bf7-822b-3fc0248a8aa3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0314e59f-510c-49f1-aa68-e46181aa4b51","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69b23246-750d-4901-9bbc-be89ea989385","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e66df479-4ca7-4bf7-822b-3fc0248a8aa3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0314e59f-510c-49f1-aa68-e46181aa4b51","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69b23246-750d-4901-9bbc-be89ea989385","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_term_left_fur_hanging/spr_term_left_fur_hanging.yy b/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy index 468798dcd4..fdb2b346fb 100644 --- a/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy +++ b/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_term_left_fur_hanging", "bboxMode":0, "bbox_bottom":155, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97633e3e-4ebd-40db-8025-98da3c2b143c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cedac6a9-8433-4874-9826-4e74be9a9e2b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1b564d7-57a3-40f7-923e-4160b723d7d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6f50b1f-956f-44e6-9523-5db8a5e3256b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97633e3e-4ebd-40db-8025-98da3c2b143c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cedac6a9-8433-4874-9826-4e74be9a9e2b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1b564d7-57a3-40f7-923e-4160b723d7d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6f50b1f-956f-44e6-9523-5db8a5e3256b","IsCreationKey":false,"Key":3.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_term_right_fur_hanging/spr_term_right_fur_hanging.yy b/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy index 0df527690b..6008420f7c 100644 --- a/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy +++ b/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_term_right_fur_hanging", "bboxMode":0, "bbox_bottom":155, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47ed6b6a-ba69-4655-b4b6-17efb8e432a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26bb37d5-04d2-4575-9670-987d78702f28","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e197228-ad48-480d-90c7-2072036bcf55","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59b70244-1420-4cad-89ef-a92f6b074fd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47ed6b6a-ba69-4655-b4b6-17efb8e432a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26bb37d5-04d2-4575-9670-987d78702f28","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e197228-ad48-480d-90c7-2072036bcf55","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59b70244-1420-4cad-89ef-a92f6b074fd2","IsCreationKey":false,"Key":3.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_termi_wep_fix/spr_termi_wep_fix.yy b/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy index 339bba7996..867ecfa1a7 100644 --- a/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy +++ b/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_termi_wep_fix", "bboxMode":0, "bbox_bottom":139, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7f5060d-befd-419e-978e-26f94b09df6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5087a9dd-196d-445f-9d19-3b9102cea74f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39ae0826-1777-409f-9b0c-762605a42bcd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24f060a5-653f-4c12-b358-84f0e969b4b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eef702d1-4ab0-489b-9e99-97967d25ae95","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01f21f77-4c70-4a7c-a6fa-92ec378523e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33828376-57c0-46da-89d5-bae01389c0ab","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"beb051e3-4f2f-473c-b6d4-25240a448170","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7f5060d-befd-419e-978e-26f94b09df6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5087a9dd-196d-445f-9d19-3b9102cea74f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39ae0826-1777-409f-9b0c-762605a42bcd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24f060a5-653f-4c12-b358-84f0e969b4b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eef702d1-4ab0-489b-9e99-97967d25ae95","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01f21f77-4c70-4a7c-a6fa-92ec378523e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33828376-57c0-46da-89d5-bae01389c0ab","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"beb051e3-4f2f-473c-b6d4-25240a448170","IsCreationKey":false,"Key":7.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_terminator2_colors/spr_terminator2_colors.yy b/sprites/spr_terminator2_colors/spr_terminator2_colors.yy index 4362f1ca99..e81fa73bb9 100644 --- a/sprites/spr_terminator2_colors/spr_terminator2_colors.yy +++ b/sprites/spr_terminator2_colors/spr_terminator2_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator2_colors", "bboxMode":0, "bbox_bottom":231, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15d6e70e-8247-486a-8771-f55c9188252c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"333955e2-646a-4678-90de-02bdb66acbae","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"758eda71-efce-4d1f-86b0-7c09df9b3aea","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"351d45da-f5a1-42b3-a9b7-2ce5b4d193eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3c46260-ff1e-4bf1-85f7-c7903dbf8513","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2619edd9-345d-453f-a40c-71ad1c64b88b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30c72042-f5e7-4073-a52f-925da8c7edf2","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"14ac3aed-c026-47e2-8c23-dcd2ae00b98c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cb57dc31-66bb-42b4-b17d-7d02635b9562","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cdf5e5c-fc40-4b60-b9cb-c120abb54761","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6fcb211-2e05-4940-8086-0bd3b0be05ed","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33f97624-918b-460c-bfe4-b461a4e66276","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15d6e70e-8247-486a-8771-f55c9188252c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"333955e2-646a-4678-90de-02bdb66acbae","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"758eda71-efce-4d1f-86b0-7c09df9b3aea","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"351d45da-f5a1-42b3-a9b7-2ce5b4d193eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3c46260-ff1e-4bf1-85f7-c7903dbf8513","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2619edd9-345d-453f-a40c-71ad1c64b88b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30c72042-f5e7-4073-a52f-925da8c7edf2","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"14ac3aed-c026-47e2-8c23-dcd2ae00b98c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cb57dc31-66bb-42b4-b17d-7d02635b9562","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cdf5e5c-fc40-4b60-b9cb-c120abb54761","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6fcb211-2e05-4940-8086-0bd3b0be05ed","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33f97624-918b-460c-bfe4-b461a4e66276","IsCreationKey":false,"Key":11.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_terminator3_colors/spr_terminator3_colors.yy b/sprites/spr_terminator3_colors/spr_terminator3_colors.yy index 38fceee5e5..e87e378d0a 100644 --- a/sprites/spr_terminator3_colors/spr_terminator3_colors.yy +++ b/sprites/spr_terminator3_colors/spr_terminator3_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator3_colors", "bboxMode":0, "bbox_bottom":259, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c839fec-817d-4ad9-ace8-1447ac216a20","name":"8c839fec-817d-4ad9-ace8-1447ac216a20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"49d3f799-75d7-4265-8808-dda0f3c715b2","name":"49d3f799-75d7-4265-8808-dda0f3c715b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2efb5d92-2428-42cd-89e7-be4069186f6b","name":"2efb5d92-2428-42cd-89e7-be4069186f6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d8b94b8-297f-427c-9561-544ca75f5f93","name":"0d8b94b8-297f-427c-9561-544ca75f5f93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f485d637-9734-449b-b878-674a7bf45002","name":"f485d637-9734-449b-b878-674a7bf45002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb04902e-b65b-4002-af27-3bf803bac80a","name":"bb04902e-b65b-4002-af27-3bf803bac80a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66a3a618-8916-41e7-8773-6f81850bf428","name":"66a3a618-8916-41e7-8773-6f81850bf428","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55e4eb93-91e3-4251-a610-7a88ef44e295","name":"55e4eb93-91e3-4251-a610-7a88ef44e295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c839fec-817d-4ad9-ace8-1447ac216a20","name":"8c839fec-817d-4ad9-ace8-1447ac216a20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49d3f799-75d7-4265-8808-dda0f3c715b2","name":"49d3f799-75d7-4265-8808-dda0f3c715b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2efb5d92-2428-42cd-89e7-be4069186f6b","name":"2efb5d92-2428-42cd-89e7-be4069186f6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d8b94b8-297f-427c-9561-544ca75f5f93","name":"0d8b94b8-297f-427c-9561-544ca75f5f93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f485d637-9734-449b-b878-674a7bf45002","name":"f485d637-9734-449b-b878-674a7bf45002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb04902e-b65b-4002-af27-3bf803bac80a","name":"bb04902e-b65b-4002-af27-3bf803bac80a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66a3a618-8916-41e7-8773-6f81850bf428","name":"66a3a618-8916-41e7-8773-6f81850bf428","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55e4eb93-91e3-4251-a610-7a88ef44e295","name":"55e4eb93-91e3-4251-a610-7a88ef44e295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"568febcf-ab7f-4a87-b5c0-735a58b1b9d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c839fec-817d-4ad9-ace8-1447ac216a20","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"846e9905-1def-45d8-bb7c-5fdb5825102e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d3f799-75d7-4265-8808-dda0f3c715b2","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eafd5b88-2fb5-44b7-9676-b8ff110d59ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2efb5d92-2428-42cd-89e7-be4069186f6b","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e21150b8-8296-4101-b8cb-41c1afd8bbfc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6084a88b-01b6-41fd-91bf-3aea97f8d78c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d8b94b8-297f-427c-9561-544ca75f5f93","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06ebf596-560c-48c8-ac9c-ecacf45b2cee","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f485d637-9734-449b-b878-674a7bf45002","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd1adfdd-e046-4734-9496-5123b9733a3e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb04902e-b65b-4002-af27-3bf803bac80a","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a651216-c6e5-41d6-aca8-a9c5e3f6090c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66a3a618-8916-41e7-8773-6f81850bf428","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a089cf52-ca81-41d6-97ae-9599874de3bd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e4eb93-91e3-4251-a610-7a88ef44e295","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c54f96e-b78f-4a27-ac45-b600d7239fea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"568febcf-ab7f-4a87-b5c0-735a58b1b9d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c839fec-817d-4ad9-ace8-1447ac216a20","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"846e9905-1def-45d8-bb7c-5fdb5825102e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d3f799-75d7-4265-8808-dda0f3c715b2","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eafd5b88-2fb5-44b7-9676-b8ff110d59ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2efb5d92-2428-42cd-89e7-be4069186f6b","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e21150b8-8296-4101-b8cb-41c1afd8bbfc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6084a88b-01b6-41fd-91bf-3aea97f8d78c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d8b94b8-297f-427c-9561-544ca75f5f93","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06ebf596-560c-48c8-ac9c-ecacf45b2cee","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f485d637-9734-449b-b878-674a7bf45002","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd1adfdd-e046-4734-9496-5123b9733a3e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb04902e-b65b-4002-af27-3bf803bac80a","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a651216-c6e5-41d6-aca8-a9c5e3f6090c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66a3a618-8916-41e7-8773-6f81850bf428","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a089cf52-ca81-41d6-97ae-9599874de3bd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e4eb93-91e3-4251-a610-7a88ef44e295","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c54f96e-b78f-4a27-ac45-b600d7239fea","IsCreationKey":false,"Key":9.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_terminator_arms/spr_terminator_arms.yy b/sprites/spr_terminator_arms/spr_terminator_arms.yy index b512d6092a..b43aa11ab9 100644 --- a/sprites/spr_terminator_arms/spr_terminator_arms.yy +++ b/sprites/spr_terminator_arms/spr_terminator_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_arms", "bboxMode":0, "bbox_bottom":170, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"daf2e325-3fef-4afd-8c05-47a593d56b46","name":"daf2e325-3fef-4afd-8c05-47a593d56b46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daf2e325-3fef-4afd-8c05-47a593d56b46","name":"daf2e325-3fef-4afd-8c05-47a593d56b46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,24 +74,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cae7e18c-f5e7-4d50-8455-689d9f07259e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f758ccb5-a5a2-4ba8-826a-d935358c0750","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97dafcc0-9581-43e8-9b5a-3b85dcce74b7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33ca7639-cb77-432a-983c-83471f91f6ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d6d9eef-0cb3-4ce9-b9be-cb53d0a55eac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf2e325-3fef-4afd-8c05-47a593d56b46","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f618068-e910-457d-a3f3-bb9b274821f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cae7e18c-f5e7-4d50-8455-689d9f07259e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f758ccb5-a5a2-4ba8-826a-d935358c0750","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97dafcc0-9581-43e8-9b5a-3b85dcce74b7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33ca7639-cb77-432a-983c-83471f91f6ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d6d9eef-0cb3-4ce9-b9be-cb53d0a55eac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf2e325-3fef-4afd-8c05-47a593d56b46","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f618068-e910-457d-a3f3-bb9b274821f5","IsCreationKey":false,"Key":5.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_terminator_chap/spr_terminator_chap.yy b/sprites/spr_terminator_chap/spr_terminator_chap.yy index e1a0fdf32a..62042c56bf 100644 --- a/sprites/spr_terminator_chap/spr_terminator_chap.yy +++ b/sprites/spr_terminator_chap/spr_terminator_chap.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_chap", "bboxMode":0, "bbox_bottom":231, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"230c632b-8b24-4edd-be9b-3b70311fede3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e30d48bc-b249-4c2c-8797-ac883a14cfa1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92ef3eef-ea36-4c59-bcb2-61ce66d885c1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3ff366b-1d0a-45c4-a250-955c5934a1f1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83303542-6444-4807-b269-79920c8d5df9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"66d85fca-2193-4a3a-8f67-de3d3f8922dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea0f1fe6-fe3d-4ec0-b0f6-73fa978ed634","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2cc2aa60-cff6-47b5-aa55-58f9710ba1ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b44f8488-ca89-4feb-8ecb-da711bef2914","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c014eae2-8bcb-4344-9475-1ef52c9b4dc4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4a840c4-e82f-4893-9b83-03cc66741b24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c711e59-d9af-4da6-a07d-12138197879b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"230c632b-8b24-4edd-be9b-3b70311fede3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e30d48bc-b249-4c2c-8797-ac883a14cfa1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92ef3eef-ea36-4c59-bcb2-61ce66d885c1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3ff366b-1d0a-45c4-a250-955c5934a1f1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83303542-6444-4807-b269-79920c8d5df9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"66d85fca-2193-4a3a-8f67-de3d3f8922dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea0f1fe6-fe3d-4ec0-b0f6-73fa978ed634","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2cc2aa60-cff6-47b5-aa55-58f9710ba1ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b44f8488-ca89-4feb-8ecb-da711bef2914","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c014eae2-8bcb-4344-9475-1ef52c9b4dc4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4a840c4-e82f-4893-9b83-03cc66741b24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c711e59-d9af-4da6-a07d-12138197879b","IsCreationKey":false,"Key":11.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_terminator_colors/spr_terminator_colors.yy b/sprites/spr_terminator_colors/spr_terminator_colors.yy index 57ce5b8168..2874cfee78 100644 --- a/sprites/spr_terminator_colors/spr_terminator_colors.yy +++ b/sprites/spr_terminator_colors/spr_terminator_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_colors", "bboxMode":0, "bbox_bottom":231, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fcaca781-a900-4083-84c4-7f2a75eac321","name":"fcaca781-a900-4083-84c4-7f2a75eac321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"808a543b-f546-43fd-8c27-2819a37091e4","name":"808a543b-f546-43fd-8c27-2819a37091e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b803a6b-b887-4855-bf65-c4b658859507","name":"3b803a6b-b887-4855-bf65-c4b658859507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ad1367f6-3787-419c-afa0-72a8892b8b60","name":"ad1367f6-3787-419c-afa0-72a8892b8b60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b2b44691-5048-4d17-a254-0346bf451baa","name":"b2b44691-5048-4d17-a254-0346bf451baa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24589d5c-b88d-4827-923f-ec967cf9be73","name":"24589d5c-b88d-4827-923f-ec967cf9be73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcaca781-a900-4083-84c4-7f2a75eac321","name":"fcaca781-a900-4083-84c4-7f2a75eac321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"808a543b-f546-43fd-8c27-2819a37091e4","name":"808a543b-f546-43fd-8c27-2819a37091e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b803a6b-b887-4855-bf65-c4b658859507","name":"3b803a6b-b887-4855-bf65-c4b658859507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ad1367f6-3787-419c-afa0-72a8892b8b60","name":"ad1367f6-3787-419c-afa0-72a8892b8b60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2b44691-5048-4d17-a254-0346bf451baa","name":"b2b44691-5048-4d17-a254-0346bf451baa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24589d5c-b88d-4827-923f-ec967cf9be73","name":"24589d5c-b88d-4827-923f-ec967cf9be73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcaca781-a900-4083-84c4-7f2a75eac321","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bfe7026a-90f3-4a8f-bb25-41c7fba9dc0b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"808a543b-f546-43fd-8c27-2819a37091e4","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ae4b2fa-fb4f-4166-97c3-11383620af61","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b803a6b-b887-4855-bf65-c4b658859507","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61289444-32c6-413b-9141-4c5f2e798dc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad1367f6-3787-419c-afa0-72a8892b8b60","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f2f4c8a-388a-4719-b904-8d7d0624cd3b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2b44691-5048-4d17-a254-0346bf451baa","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c818b3bc-0a48-4247-b3c7-e0a3051361a3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24589d5c-b88d-4827-923f-ec967cf9be73","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec550e3a-2927-4fcc-bfa9-65c11f93f979","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47150cad-f2df-4feb-bf6e-93583cafaae5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c1fa22b-94ff-4bcb-a006-d1ace0cea132","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1590e362-11fa-4259-b686-c4b8aaf76429","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37a23ee8-2217-45cf-856e-ccc2de0266ea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcaca781-a900-4083-84c4-7f2a75eac321","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bfe7026a-90f3-4a8f-bb25-41c7fba9dc0b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"808a543b-f546-43fd-8c27-2819a37091e4","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ae4b2fa-fb4f-4166-97c3-11383620af61","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b803a6b-b887-4855-bf65-c4b658859507","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61289444-32c6-413b-9141-4c5f2e798dc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad1367f6-3787-419c-afa0-72a8892b8b60","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f2f4c8a-388a-4719-b904-8d7d0624cd3b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2b44691-5048-4d17-a254-0346bf451baa","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c818b3bc-0a48-4247-b3c7-e0a3051361a3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24589d5c-b88d-4827-923f-ec967cf9be73","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec550e3a-2927-4fcc-bfa9-65c11f93f979","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47150cad-f2df-4feb-bf6e-93583cafaae5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c1fa22b-94ff-4bcb-a006-d1ace0cea132","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1590e362-11fa-4259-b686-c4b8aaf76429","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37a23ee8-2217-45cf-856e-ccc2de0266ea","IsCreationKey":false,"Key":9.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_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy b/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy index f01c241b5a..d84f269ab1 100644 --- a/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy +++ b/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arm_hidden_left", "bboxMode":0, "bbox_bottom":111, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf842654-6328-43ef-8ca1-e08413ff4d7f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf842654-6328-43ef-8ca1-e08413ff4d7f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy b/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy index e23fd435ce..9477551e70 100644 --- a/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy +++ b/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arm_hidden_right", "bboxMode":0, "bbox_bottom":111, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94ffb408-3cda-47a2-a578-63fe4f6cbb8c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94ffb408-3cda-47a2-a578-63fe4f6cbb8c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy b/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy index dc09c6f962..cb639298fa 100644 --- a/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy +++ b/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arms_upper_left", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"164674aa-5a00-48ec-8be0-d61e90a3902e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"164674aa-5a00-48ec-8be0-d61e90a3902e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy b/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy index 813a485f4f..f2cb3f7f68 100644 --- a/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy +++ b/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arms_upper_right", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b4c9688-dfe5-4837-b62a-be5562d846e3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b4c9688-dfe5-4837-b62a-be5562d846e3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_hands/spr_terminator_hands.yy b/sprites/spr_terminator_hands/spr_terminator_hands.yy index a6291464cf..e3f8761e1b 100644 --- a/sprites/spr_terminator_hands/spr_terminator_hands.yy +++ b/sprites/spr_terminator_hands/spr_terminator_hands.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_hands", "bboxMode":0, "bbox_bottom":170, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e7f88754-373e-4c98-b38b-01592d149b7f","name":"e7f88754-373e-4c98-b38b-01592d149b7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2d84098c-5069-4226-bf10-452f97e7bc36","name":"2d84098c-5069-4226-bf10-452f97e7bc36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f25745b4-f637-4dc0-b247-5ed451b3d993","name":"f25745b4-f637-4dc0-b247-5ed451b3d993","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d226d814-c4b6-4e08-a965-e240faedfb37","name":"d226d814-c4b6-4e08-a965-e240faedfb37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"60a62808-3182-4af9-8fd4-270907296914","name":"60a62808-3182-4af9-8fd4-270907296914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7f88754-373e-4c98-b38b-01592d149b7f","name":"e7f88754-373e-4c98-b38b-01592d149b7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d84098c-5069-4226-bf10-452f97e7bc36","name":"2d84098c-5069-4226-bf10-452f97e7bc36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f25745b4-f637-4dc0-b247-5ed451b3d993","name":"f25745b4-f637-4dc0-b247-5ed451b3d993","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d226d814-c4b6-4e08-a965-e240faedfb37","name":"d226d814-c4b6-4e08-a965-e240faedfb37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60a62808-3182-4af9-8fd4-270907296914","name":"60a62808-3182-4af9-8fd4-270907296914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7f88754-373e-4c98-b38b-01592d149b7f","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffaa650d-4969-43f0-9503-b08d22a74013","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d84098c-5069-4226-bf10-452f97e7bc36","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d2a749b-6f7e-47c5-830f-569d5c64dc0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c65edbe1-4212-4661-9faf-d1270db576cc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2964c64c-a1e2-4763-bba6-a3ef3f32e6e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78f97633-afc9-4c33-856e-6659dbc7c6e5","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c7bd0a8-2f7e-4d98-ac98-7647b7d675f7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a944bf98-a036-4ecc-afd7-1987e62f78f3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f25745b4-f637-4dc0-b247-5ed451b3d993","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"653d9ae6-2cdb-411f-b2fd-47e04abfe186","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67ab9298-07a3-42f3-a2d7-5a59455df6b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d226d814-c4b6-4e08-a965-e240faedfb37","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc7a3a36-b779-40d6-b240-3a38616306ca","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de1cf54a-f77d-4692-9d6e-a84c4af4b970","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60a62808-3182-4af9-8fd4-270907296914","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"29910d4b-d509-441b-ac03-d6940e4c88e3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7f88754-373e-4c98-b38b-01592d149b7f","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffaa650d-4969-43f0-9503-b08d22a74013","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d84098c-5069-4226-bf10-452f97e7bc36","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d2a749b-6f7e-47c5-830f-569d5c64dc0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c65edbe1-4212-4661-9faf-d1270db576cc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2964c64c-a1e2-4763-bba6-a3ef3f32e6e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78f97633-afc9-4c33-856e-6659dbc7c6e5","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c7bd0a8-2f7e-4d98-ac98-7647b7d675f7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a944bf98-a036-4ecc-afd7-1987e62f78f3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f25745b4-f637-4dc0-b247-5ed451b3d993","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"653d9ae6-2cdb-411f-b2fd-47e04abfe186","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67ab9298-07a3-42f3-a2d7-5a59455df6b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d226d814-c4b6-4e08-a965-e240faedfb37","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc7a3a36-b779-40d6-b240-3a38616306ca","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de1cf54a-f77d-4692-9d6e-a84c4af4b970","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60a62808-3182-4af9-8fd4-270907296914","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"29910d4b-d509-441b-ac03-d6940e4c88e3","IsCreationKey":false,"Key":11.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_terminator_laurel/spr_terminator_laurel.yy b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy index 50e954824c..d6d59991e4 100644 --- a/sprites/spr_terminator_laurel/spr_terminator_laurel.yy +++ b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_laurel", "bboxMode":0, "bbox_bottom":57, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_terminator_laurel/spr_terminator_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84173a53-3c37-4c03-b242-f4e857a650c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_terminator_laurel/spr_terminator_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84173a53-3c37-4c03-b242-f4e857a650c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy b/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy index 594cb01199..a7b34a35d9 100644 --- a/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy +++ b/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_metal_tabbard", "bboxMode":0, "bbox_bottom":242, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","path":"sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b74fa8a-8bb3-4e09-9855-486e46b09445","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","path":"sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b74fa8a-8bb3-4e09-9855-486e46b09445","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tooltip1/spr_tooltip1.yy b/sprites/spr_tooltip1/spr_tooltip1.yy index 73347d0f66..b4f5bb6cd9 100644 --- a/sprites/spr_tooltip1/spr_tooltip1.yy +++ b/sprites/spr_tooltip1/spr_tooltip1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tooltip1", "bboxMode":0, "bbox_bottom":131, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5f227bbe-a460-4056-9458-870160c7d5c8","name":"5f227bbe-a460-4056-9458-870160c7d5c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f227bbe-a460-4056-9458-870160c7d5c8","name":"5f227bbe-a460-4056-9458-870160c7d5c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f227bbe-a460-4056-9458-870160c7d5c8","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d4cb579-532d-443e-a19e-68eccd123a6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89661a80-ab67-4782-a17c-0375bbaf582d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f227bbe-a460-4056-9458-870160c7d5c8","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d4cb579-532d-443e-a19e-68eccd123a6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89661a80-ab67-4782-a17c-0375bbaf582d","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_torpedo/spr_torpedo.yy b/sprites/spr_torpedo/spr_torpedo.yy index ec01c2c2b5..a524800ffa 100644 --- a/sprites/spr_torpedo/spr_torpedo.yy +++ b/sprites/spr_torpedo/spr_torpedo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_torpedo", "bboxMode":0, "bbox_bottom":7, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6871a763-b22c-4883-89d4-c6acba0cf229","name":"6871a763-b22c-4883-89d4-c6acba0cf229","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6871a763-b22c-4883-89d4-c6acba0cf229","name":"6871a763-b22c-4883-89d4-c6acba0cf229","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6871a763-b22c-4883-89d4-c6acba0cf229","path":"sprites/spr_torpedo/spr_torpedo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3db329f9-e41b-4f3a-81f9-53caee66e1f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6871a763-b22c-4883-89d4-c6acba0cf229","path":"sprites/spr_torpedo/spr_torpedo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3db329f9-e41b-4f3a-81f9-53caee66e1f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_torpedo_board/spr_torpedo_board.yy b/sprites/spr_torpedo_board/spr_torpedo_board.yy index 9880d05dd2..31f08c49fd 100644 --- a/sprites/spr_torpedo_board/spr_torpedo_board.yy +++ b/sprites/spr_torpedo_board/spr_torpedo_board.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_torpedo_board", "bboxMode":0, "bbox_bottom":11, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dfa16445-7acd-4ae3-8091-96d05ce59546","name":"dfa16445-7acd-4ae3-8091-96d05ce59546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfa16445-7acd-4ae3-8091-96d05ce59546","name":"dfa16445-7acd-4ae3-8091-96d05ce59546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfa16445-7acd-4ae3-8091-96d05ce59546","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13fc9487-2cf1-4cc6-b4fe-155e29ad4ca9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfa16445-7acd-4ae3-8091-96d05ce59546","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13fc9487-2cf1-4cc6-b4fe-155e29ad4ca9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ui_but_1/spr_ui_but_1.yy b/sprites/spr_ui_but_1/spr_ui_but_1.yy index 71432ef41d..b4627f3501 100644 --- a/sprites/spr_ui_but_1/spr_ui_but_1.yy +++ b/sprites/spr_ui_but_1/spr_ui_but_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_1", "bboxMode":0, "bbox_bottom":42, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"adada15b-9e9b-4a92-88b9-7418b297a89f","name":"adada15b-9e9b-4a92-88b9-7418b297a89f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"54c75ea1-53a2-4903-b512-cadd4950cb27","name":"54c75ea1-53a2-4903-b512-cadd4950cb27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3af7d883-39a3-415f-bd13-2bda3e760c66","name":"3af7d883-39a3-415f-bd13-2bda3e760c66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4999508-ec82-4b20-bb80-c76f281711fb","name":"f4999508-ec82-4b20-bb80-c76f281711fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21434961-aaa1-416e-8888-0757f0f6ddae","name":"21434961-aaa1-416e-8888-0757f0f6ddae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"97d12877-7427-4885-a031-30f4f30017be","name":"97d12877-7427-4885-a031-30f4f30017be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e128c96e-d1ed-4894-a53a-aae834b9d903","name":"e128c96e-d1ed-4894-a53a-aae834b9d903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9909c3c8-1249-421a-9f37-e54a6276e0df","name":"9909c3c8-1249-421a-9f37-e54a6276e0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d23878c9-1647-4718-944c-21aa313bc7e1","name":"d23878c9-1647-4718-944c-21aa313bc7e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0fef5db-974e-492e-8780-db5188a55a08","name":"e0fef5db-974e-492e-8780-db5188a55a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7962988f-ba97-4ab0-854e-014da9ad5acd","name":"7962988f-ba97-4ab0-854e-014da9ad5acd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7515219-dffa-4275-bb96-170d3f9c727c","name":"b7515219-dffa-4275-bb96-170d3f9c727c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1628e434-61cb-4106-8789-9f3c47db7a90","name":"1628e434-61cb-4106-8789-9f3c47db7a90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"adada15b-9e9b-4a92-88b9-7418b297a89f","name":"adada15b-9e9b-4a92-88b9-7418b297a89f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"54c75ea1-53a2-4903-b512-cadd4950cb27","name":"54c75ea1-53a2-4903-b512-cadd4950cb27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3af7d883-39a3-415f-bd13-2bda3e760c66","name":"3af7d883-39a3-415f-bd13-2bda3e760c66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4999508-ec82-4b20-bb80-c76f281711fb","name":"f4999508-ec82-4b20-bb80-c76f281711fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21434961-aaa1-416e-8888-0757f0f6ddae","name":"21434961-aaa1-416e-8888-0757f0f6ddae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97d12877-7427-4885-a031-30f4f30017be","name":"97d12877-7427-4885-a031-30f4f30017be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e128c96e-d1ed-4894-a53a-aae834b9d903","name":"e128c96e-d1ed-4894-a53a-aae834b9d903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9909c3c8-1249-421a-9f37-e54a6276e0df","name":"9909c3c8-1249-421a-9f37-e54a6276e0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d23878c9-1647-4718-944c-21aa313bc7e1","name":"d23878c9-1647-4718-944c-21aa313bc7e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0fef5db-974e-492e-8780-db5188a55a08","name":"e0fef5db-974e-492e-8780-db5188a55a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7962988f-ba97-4ab0-854e-014da9ad5acd","name":"7962988f-ba97-4ab0-854e-014da9ad5acd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7515219-dffa-4275-bb96-170d3f9c727c","name":"b7515219-dffa-4275-bb96-170d3f9c727c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1628e434-61cb-4106-8789-9f3c47db7a90","name":"1628e434-61cb-4106-8789-9f3c47db7a90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"adada15b-9e9b-4a92-88b9-7418b297a89f","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"080ebb22-a2ff-4ebe-a0d4-6043111e28ed","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c124125-0489-4f4f-b8c4-71ff09d9b1c4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"54c75ea1-53a2-4903-b512-cadd4950cb27","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5317e36a-0b7c-42f7-b0c9-06cf928260e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3af7d883-39a3-415f-bd13-2bda3e760c66","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c80677e6-1d14-441c-b6d2-e74a13309d69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"387a500e-d698-46ae-bcc4-04a5a69fda99","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15c75a0f-f0f2-40b0-8811-999fe25f18a4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4fcd619f-8e03-4075-809d-60865a3596c5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4999508-ec82-4b20-bb80-c76f281711fb","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d7c65fe-a6f0-4873-b563-03f38fd2f0eb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19fd6272-d87c-4085-b34c-15c903ffbf03","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21434961-aaa1-416e-8888-0757f0f6ddae","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef51cec7-852f-476f-97ab-c9d03f9e9302","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a9cd7e9-eccc-4434-bf6e-fe014ef69ece","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97d12877-7427-4885-a031-30f4f30017be","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a01148f-6b67-4401-95ff-f995408bc13f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e128c96e-d1ed-4894-a53a-aae834b9d903","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a34b877-55d0-4c94-a5a2-151beac5369d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9909c3c8-1249-421a-9f37-e54a6276e0df","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff37e96d-ca69-4ad8-84ef-6b5d57497e71","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9e8f02a-6474-4434-ab59-3a08395d9477","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baab1585-3631-442d-96a9-c5fe07c43fd5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96085a69-cce7-4af0-8f77-2d805ebe24e8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23878c9-1647-4718-944c-21aa313bc7e1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f448b033-1869-4141-8113-339a55a01fe7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39eafe35-924a-4608-8d94-e2c82159a660","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0fef5db-974e-492e-8780-db5188a55a08","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c7f71d9-9d4a-4de8-8ab3-34557dc0fcef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7962988f-ba97-4ab0-854e-014da9ad5acd","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3125b75e-2216-418d-913e-3ad58c1c3647","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7515219-dffa-4275-bb96-170d3f9c727c","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d222029-c724-4c2c-9965-0d1af3e85e3a","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97644162-9a37-471f-8679-8e87deac23db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1628e434-61cb-4106-8789-9f3c47db7a90","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89472afa-526e-45a2-b2ec-777729447035","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f422d94-9d62-4e97-902f-10ebdf436c36","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"adada15b-9e9b-4a92-88b9-7418b297a89f","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"080ebb22-a2ff-4ebe-a0d4-6043111e28ed","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c124125-0489-4f4f-b8c4-71ff09d9b1c4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"54c75ea1-53a2-4903-b512-cadd4950cb27","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5317e36a-0b7c-42f7-b0c9-06cf928260e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3af7d883-39a3-415f-bd13-2bda3e760c66","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c80677e6-1d14-441c-b6d2-e74a13309d69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"387a500e-d698-46ae-bcc4-04a5a69fda99","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15c75a0f-f0f2-40b0-8811-999fe25f18a4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4fcd619f-8e03-4075-809d-60865a3596c5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4999508-ec82-4b20-bb80-c76f281711fb","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d7c65fe-a6f0-4873-b563-03f38fd2f0eb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19fd6272-d87c-4085-b34c-15c903ffbf03","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21434961-aaa1-416e-8888-0757f0f6ddae","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef51cec7-852f-476f-97ab-c9d03f9e9302","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a9cd7e9-eccc-4434-bf6e-fe014ef69ece","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97d12877-7427-4885-a031-30f4f30017be","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a01148f-6b67-4401-95ff-f995408bc13f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e128c96e-d1ed-4894-a53a-aae834b9d903","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a34b877-55d0-4c94-a5a2-151beac5369d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9909c3c8-1249-421a-9f37-e54a6276e0df","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff37e96d-ca69-4ad8-84ef-6b5d57497e71","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9e8f02a-6474-4434-ab59-3a08395d9477","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baab1585-3631-442d-96a9-c5fe07c43fd5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96085a69-cce7-4af0-8f77-2d805ebe24e8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23878c9-1647-4718-944c-21aa313bc7e1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f448b033-1869-4141-8113-339a55a01fe7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39eafe35-924a-4608-8d94-e2c82159a660","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0fef5db-974e-492e-8780-db5188a55a08","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c7f71d9-9d4a-4de8-8ab3-34557dc0fcef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7962988f-ba97-4ab0-854e-014da9ad5acd","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3125b75e-2216-418d-913e-3ad58c1c3647","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7515219-dffa-4275-bb96-170d3f9c727c","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0d222029-c724-4c2c-9965-0d1af3e85e3a","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97644162-9a37-471f-8679-8e87deac23db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1628e434-61cb-4106-8789-9f3c47db7a90","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89472afa-526e-45a2-b2ec-777729447035","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f422d94-9d62-4e97-902f-10ebdf436c36","IsCreationKey":false,"Key":24.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_ui_but_2/spr_ui_but_2.yy b/sprites/spr_ui_but_2/spr_ui_but_2.yy index 44132ab460..15c27c0740 100644 --- a/sprites/spr_ui_but_2/spr_ui_but_2.yy +++ b/sprites/spr_ui_but_2/spr_ui_but_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_2", "bboxMode":0, "bbox_bottom":42, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8934fb74-73bd-475b-861c-676b2d824e46","name":"8934fb74-73bd-475b-861c-676b2d824e46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7961d161-e69c-4ac0-a866-ab2a984bde10","name":"7961d161-e69c-4ac0-a866-ab2a984bde10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"571878b9-29aa-47d6-b8df-932284191e73","name":"571878b9-29aa-47d6-b8df-932284191e73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9983ba7c-f2d3-4251-b544-963e79996dde","name":"9983ba7c-f2d3-4251-b544-963e79996dde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3e144b78-28e5-48e6-8de3-912b34723b01","name":"3e144b78-28e5-48e6-8de3-912b34723b01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eded6056-0881-483a-88f3-7b96675b4b25","name":"eded6056-0881-483a-88f3-7b96675b4b25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57217e6c-a521-4c47-bc25-445da6c139ad","name":"57217e6c-a521-4c47-bc25-445da6c139ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3975b47a-b5f7-4655-b87f-befe9792e54a","name":"3975b47a-b5f7-4655-b87f-befe9792e54a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b31b0fb5-db84-404b-a44d-b79c6335e558","name":"b31b0fb5-db84-404b-a44d-b79c6335e558","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8934fb74-73bd-475b-861c-676b2d824e46","name":"8934fb74-73bd-475b-861c-676b2d824e46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7961d161-e69c-4ac0-a866-ab2a984bde10","name":"7961d161-e69c-4ac0-a866-ab2a984bde10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"571878b9-29aa-47d6-b8df-932284191e73","name":"571878b9-29aa-47d6-b8df-932284191e73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9983ba7c-f2d3-4251-b544-963e79996dde","name":"9983ba7c-f2d3-4251-b544-963e79996dde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e144b78-28e5-48e6-8de3-912b34723b01","name":"3e144b78-28e5-48e6-8de3-912b34723b01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eded6056-0881-483a-88f3-7b96675b4b25","name":"eded6056-0881-483a-88f3-7b96675b4b25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57217e6c-a521-4c47-bc25-445da6c139ad","name":"57217e6c-a521-4c47-bc25-445da6c139ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3975b47a-b5f7-4655-b87f-befe9792e54a","name":"3975b47a-b5f7-4655-b87f-befe9792e54a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b31b0fb5-db84-404b-a44d-b79c6335e558","name":"b31b0fb5-db84-404b-a44d-b79c6335e558","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd9d7c36-60e2-4bd3-be78-b67018db5d9c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2b5e04f-52a3-484c-a3f0-e6248e39e813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"924a4af9-4c80-41a0-b53d-269d9796df02","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8ef31f9c-031d-45a0-9c1e-0a6114bbf70e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4161c65-77b3-4556-9c62-2d5ee9f4a274","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e90cf8ec-2c8f-4040-8533-1e43a1942caf","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8934fb74-73bd-475b-861c-676b2d824e46","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b3aed46-abd7-4417-a706-e9b7d1ecf67d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d7b27dc-edab-4fbe-ad50-b1e370e70dde","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f042eddf-f0a8-4180-8737-b9e1ebe614a0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc3600a6-1d5e-44f3-ba63-ac970d1fea3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7961d161-e69c-4ac0-a866-ab2a984bde10","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db4ef68c-62f0-4933-9862-cbef7d042477","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac1759c6-e84c-4c55-b545-92e2927a1ebe","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"571878b9-29aa-47d6-b8df-932284191e73","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7480413c-78e0-45aa-8638-58a4d121a5d8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57971459-6928-41cb-8b9b-31aa3fd9d766","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9983ba7c-f2d3-4251-b544-963e79996dde","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe199c40-a75c-472d-876b-8e544bfec907","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d018fda9-188b-401c-bbbd-b7ea3121d3fc","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e144b78-28e5-48e6-8de3-912b34723b01","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eea97408-c808-4495-a31e-9d40bf72985d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eded6056-0881-483a-88f3-7b96675b4b25","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19820bcd-6fbc-43a0-9804-cbaf52f76eaa","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a54e2959-e2d1-446d-bac5-1cb762394580","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57217e6c-a521-4c47-bc25-445da6c139ad","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6942a962-7fc6-4ffb-9a52-0aa8c4900f2d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3975b47a-b5f7-4655-b87f-befe9792e54a","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"282e4378-7cd1-460d-92b9-73077dd0e036","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b31b0fb5-db84-404b-a44d-b79c6335e558","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"447a9809-421a-44dd-a408-7b293f9360ee","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e39939f5-f1e1-477d-90b3-72625a9ffa3c","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8444770-1893-4ada-a497-251014444a65","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f7b482-fca6-443f-9aa9-610217617d22","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd9d7c36-60e2-4bd3-be78-b67018db5d9c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2b5e04f-52a3-484c-a3f0-e6248e39e813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"924a4af9-4c80-41a0-b53d-269d9796df02","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8ef31f9c-031d-45a0-9c1e-0a6114bbf70e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4161c65-77b3-4556-9c62-2d5ee9f4a274","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e90cf8ec-2c8f-4040-8533-1e43a1942caf","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8934fb74-73bd-475b-861c-676b2d824e46","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b3aed46-abd7-4417-a706-e9b7d1ecf67d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d7b27dc-edab-4fbe-ad50-b1e370e70dde","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f042eddf-f0a8-4180-8737-b9e1ebe614a0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc3600a6-1d5e-44f3-ba63-ac970d1fea3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7961d161-e69c-4ac0-a866-ab2a984bde10","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db4ef68c-62f0-4933-9862-cbef7d042477","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac1759c6-e84c-4c55-b545-92e2927a1ebe","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"571878b9-29aa-47d6-b8df-932284191e73","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7480413c-78e0-45aa-8638-58a4d121a5d8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57971459-6928-41cb-8b9b-31aa3fd9d766","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9983ba7c-f2d3-4251-b544-963e79996dde","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe199c40-a75c-472d-876b-8e544bfec907","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d018fda9-188b-401c-bbbd-b7ea3121d3fc","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e144b78-28e5-48e6-8de3-912b34723b01","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eea97408-c808-4495-a31e-9d40bf72985d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eded6056-0881-483a-88f3-7b96675b4b25","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19820bcd-6fbc-43a0-9804-cbaf52f76eaa","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a54e2959-e2d1-446d-bac5-1cb762394580","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57217e6c-a521-4c47-bc25-445da6c139ad","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6942a962-7fc6-4ffb-9a52-0aa8c4900f2d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3975b47a-b5f7-4655-b87f-befe9792e54a","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"282e4378-7cd1-460d-92b9-73077dd0e036","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b31b0fb5-db84-404b-a44d-b79c6335e558","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"447a9809-421a-44dd-a408-7b293f9360ee","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e39939f5-f1e1-477d-90b3-72625a9ffa3c","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8444770-1893-4ada-a497-251014444a65","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f7b482-fca6-443f-9aa9-610217617d22","IsCreationKey":false,"Key":24.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_ui_but_3/spr_ui_but_3.yy b/sprites/spr_ui_but_3/spr_ui_but_3.yy index ff2c5f5737..32d0e16aa3 100644 --- a/sprites/spr_ui_but_3/spr_ui_but_3.yy +++ b/sprites/spr_ui_but_3/spr_ui_but_3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_3", "bboxMode":0, "bbox_bottom":42, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b19c1bfa-e650-45a0-952b-5bc202e55225","name":"b19c1bfa-e650-45a0-952b-5bc202e55225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd82b965-6df6-46d3-9a66-859a2456e495","name":"dd82b965-6df6-46d3-9a66-859a2456e495","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a8bff66-e1fe-4372-857b-af4c482695a0","name":"9a8bff66-e1fe-4372-857b-af4c482695a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf4461ea-6979-4ce1-a17f-707abfba8624","name":"cf4461ea-6979-4ce1-a17f-707abfba8624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d587773-f96a-4919-b748-8cf7e449442f","name":"8d587773-f96a-4919-b748-8cf7e449442f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"62fd7750-714b-4738-a2af-d1d703c4a01e","name":"62fd7750-714b-4738-a2af-d1d703c4a01e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cae631bf-8006-40ac-a71a-3057c3db5a25","name":"cae631bf-8006-40ac-a71a-3057c3db5a25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"13daf569-0fcb-4609-97c0-e08b74ed424e","name":"13daf569-0fcb-4609-97c0-e08b74ed424e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"037906f6-019f-4e8a-9813-2677c37e344e","name":"037906f6-019f-4e8a-9813-2677c37e344e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a485b00d-a08c-4159-945f-c0eebba537e9","name":"a485b00d-a08c-4159-945f-c0eebba537e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"61663474-1b43-4f7b-b61a-cf3b8f161094","name":"61663474-1b43-4f7b-b61a-cf3b8f161094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3608284-8d42-45d8-b55f-2478c344446a","name":"a3608284-8d42-45d8-b55f-2478c344446a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9d2a174c-84ab-4de9-acab-903b907a162e","name":"9d2a174c-84ab-4de9-acab-903b907a162e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b19c1bfa-e650-45a0-952b-5bc202e55225","name":"b19c1bfa-e650-45a0-952b-5bc202e55225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd82b965-6df6-46d3-9a66-859a2456e495","name":"dd82b965-6df6-46d3-9a66-859a2456e495","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a8bff66-e1fe-4372-857b-af4c482695a0","name":"9a8bff66-e1fe-4372-857b-af4c482695a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf4461ea-6979-4ce1-a17f-707abfba8624","name":"cf4461ea-6979-4ce1-a17f-707abfba8624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d587773-f96a-4919-b748-8cf7e449442f","name":"8d587773-f96a-4919-b748-8cf7e449442f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"62fd7750-714b-4738-a2af-d1d703c4a01e","name":"62fd7750-714b-4738-a2af-d1d703c4a01e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cae631bf-8006-40ac-a71a-3057c3db5a25","name":"cae631bf-8006-40ac-a71a-3057c3db5a25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13daf569-0fcb-4609-97c0-e08b74ed424e","name":"13daf569-0fcb-4609-97c0-e08b74ed424e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"037906f6-019f-4e8a-9813-2677c37e344e","name":"037906f6-019f-4e8a-9813-2677c37e344e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a485b00d-a08c-4159-945f-c0eebba537e9","name":"a485b00d-a08c-4159-945f-c0eebba537e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61663474-1b43-4f7b-b61a-cf3b8f161094","name":"61663474-1b43-4f7b-b61a-cf3b8f161094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3608284-8d42-45d8-b55f-2478c344446a","name":"a3608284-8d42-45d8-b55f-2478c344446a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d2a174c-84ab-4de9-acab-903b907a162e","name":"9d2a174c-84ab-4de9-acab-903b907a162e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7197cc09-b4e2-45c8-b193-db10e25a1c6c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6bac2a03-c27e-4f03-ae42-2f3f3a3a6a06","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19c1bfa-e650-45a0-952b-5bc202e55225","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d5decf9-eee2-4b1c-8203-038116df0f88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bc2842a-946b-4461-85ad-9472e1eec1f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd82b965-6df6-46d3-9a66-859a2456e495","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec1a80bf-faf4-481a-aa21-7841856b7162","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a8bff66-e1fe-4372-857b-af4c482695a0","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"484943a7-f851-4366-8f11-50dd26c77e0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf4461ea-6979-4ce1-a17f-707abfba8624","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26a52af6-802b-4cad-80d7-76fb09994b88","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f5ae753-0dbc-47a8-940b-b175b269f2a0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e40f725-c0e0-453e-9590-2dfc6afcf51e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d587773-f96a-4919-b748-8cf7e449442f","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f634dde-74b5-4f03-85d2-e74c0e67e21b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62fd7750-714b-4738-a2af-d1d703c4a01e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"300f25a6-06d8-458c-998c-78886def1d25","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae631bf-8006-40ac-a71a-3057c3db5a25","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9a461f15-a50a-4068-afda-a4411fb8a7ee","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13daf569-0fcb-4609-97c0-e08b74ed424e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e37b8a3c-0740-49fa-9f21-fc0e073c281e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57ddaaf6-a52a-4776-8e6c-f8ee6fe03d13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"037906f6-019f-4e8a-9813-2677c37e344e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9a03f7c-6d9e-416b-99f0-db6bd007e5fb","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d833322-7d0f-4548-91e6-ca8c2f1da2c8","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"788e8986-a7ce-4358-ba9e-446326b0ee2f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c8da750b-a83c-4bfa-a62a-27a2fb4449bf","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a485b00d-a08c-4159-945f-c0eebba537e9","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"669b4f36-62bc-442e-8603-c13a8092b880","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3bc03858-9781-4b26-8124-ceb72e85f05a","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08c2532c-f0de-4494-b15c-f6a37c82af09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61663474-1b43-4f7b-b61a-cf3b8f161094","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88aaa8b6-49f3-4ec7-bbca-324de3244128","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3608284-8d42-45d8-b55f-2478c344446a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63a06827-b3ad-48cb-bab0-700b21d29b5f","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d2a174c-84ab-4de9-acab-903b907a162e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7bbbb64-9be2-40ea-bd5b-37220eb1b71b","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6651953-2d6f-4025-9383-a3b639dafe8f","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7197cc09-b4e2-45c8-b193-db10e25a1c6c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6bac2a03-c27e-4f03-ae42-2f3f3a3a6a06","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19c1bfa-e650-45a0-952b-5bc202e55225","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d5decf9-eee2-4b1c-8203-038116df0f88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bc2842a-946b-4461-85ad-9472e1eec1f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd82b965-6df6-46d3-9a66-859a2456e495","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec1a80bf-faf4-481a-aa21-7841856b7162","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a8bff66-e1fe-4372-857b-af4c482695a0","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"484943a7-f851-4366-8f11-50dd26c77e0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf4461ea-6979-4ce1-a17f-707abfba8624","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26a52af6-802b-4cad-80d7-76fb09994b88","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f5ae753-0dbc-47a8-940b-b175b269f2a0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e40f725-c0e0-453e-9590-2dfc6afcf51e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d587773-f96a-4919-b748-8cf7e449442f","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f634dde-74b5-4f03-85d2-e74c0e67e21b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"62fd7750-714b-4738-a2af-d1d703c4a01e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"300f25a6-06d8-458c-998c-78886def1d25","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae631bf-8006-40ac-a71a-3057c3db5a25","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9a461f15-a50a-4068-afda-a4411fb8a7ee","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13daf569-0fcb-4609-97c0-e08b74ed424e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e37b8a3c-0740-49fa-9f21-fc0e073c281e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57ddaaf6-a52a-4776-8e6c-f8ee6fe03d13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"037906f6-019f-4e8a-9813-2677c37e344e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9a03f7c-6d9e-416b-99f0-db6bd007e5fb","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d833322-7d0f-4548-91e6-ca8c2f1da2c8","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"788e8986-a7ce-4358-ba9e-446326b0ee2f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c8da750b-a83c-4bfa-a62a-27a2fb4449bf","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a485b00d-a08c-4159-945f-c0eebba537e9","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"669b4f36-62bc-442e-8603-c13a8092b880","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3bc03858-9781-4b26-8124-ceb72e85f05a","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08c2532c-f0de-4494-b15c-f6a37c82af09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61663474-1b43-4f7b-b61a-cf3b8f161094","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88aaa8b6-49f3-4ec7-bbca-324de3244128","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3608284-8d42-45d8-b55f-2478c344446a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63a06827-b3ad-48cb-bab0-700b21d29b5f","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d2a174c-84ab-4de9-acab-903b907a162e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7bbbb64-9be2-40ea-bd5b-37220eb1b71b","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6651953-2d6f-4025-9383-a3b639dafe8f","IsCreationKey":false,"Key":24.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_ui_but_4/spr_ui_but_4.yy b/sprites/spr_ui_but_4/spr_ui_but_4.yy index 9e7f73fc15..874ada82d1 100644 --- a/sprites/spr_ui_but_4/spr_ui_but_4.yy +++ b/sprites/spr_ui_but_4/spr_ui_but_4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_4", "bboxMode":0, "bbox_bottom":41, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6b06cfff-b6d2-4974-be71-68067158ef33","name":"6b06cfff-b6d2-4974-be71-68067158ef33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a2ae2bd-e045-4557-8327-36f557c329aa","name":"3a2ae2bd-e045-4557-8327-36f557c329aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f3cfe30-a3f9-498a-94de-82f115c28652","name":"7f3cfe30-a3f9-498a-94de-82f115c28652","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"124dd8de-1a4a-47a2-9696-e4c05204c065","name":"124dd8de-1a4a-47a2-9696-e4c05204c065","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc4bc30c-179d-4671-b776-19e72103d392","name":"bc4bc30c-179d-4671-b776-19e72103d392","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7888771d-9a42-4932-aed2-90f3bf880b2d","name":"7888771d-9a42-4932-aed2-90f3bf880b2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e50159e-2391-44fa-a0d9-15767963df6f","name":"2e50159e-2391-44fa-a0d9-15767963df6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01f0604a-68c1-4941-b6c7-a164010680ca","name":"01f0604a-68c1-4941-b6c7-a164010680ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"65b176bb-5474-4930-b447-8832faf16571","name":"65b176bb-5474-4930-b447-8832faf16571","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e211daf3-d0eb-4a0e-8783-6684ad819022","name":"e211daf3-d0eb-4a0e-8783-6684ad819022","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b06cfff-b6d2-4974-be71-68067158ef33","name":"6b06cfff-b6d2-4974-be71-68067158ef33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a2ae2bd-e045-4557-8327-36f557c329aa","name":"3a2ae2bd-e045-4557-8327-36f557c329aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f3cfe30-a3f9-498a-94de-82f115c28652","name":"7f3cfe30-a3f9-498a-94de-82f115c28652","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"124dd8de-1a4a-47a2-9696-e4c05204c065","name":"124dd8de-1a4a-47a2-9696-e4c05204c065","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc4bc30c-179d-4671-b776-19e72103d392","name":"bc4bc30c-179d-4671-b776-19e72103d392","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7888771d-9a42-4932-aed2-90f3bf880b2d","name":"7888771d-9a42-4932-aed2-90f3bf880b2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e50159e-2391-44fa-a0d9-15767963df6f","name":"2e50159e-2391-44fa-a0d9-15767963df6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01f0604a-68c1-4941-b6c7-a164010680ca","name":"01f0604a-68c1-4941-b6c7-a164010680ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"65b176bb-5474-4930-b447-8832faf16571","name":"65b176bb-5474-4930-b447-8832faf16571","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e211daf3-d0eb-4a0e-8783-6684ad819022","name":"e211daf3-d0eb-4a0e-8783-6684ad819022","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"411f19cb-ce7b-482f-96b9-31835411993a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daa8a33a-c566-40e2-a1a4-bb7c88a424dd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3efbd178-cde1-413f-a6f5-5a144c592311","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c62d52d-4378-4e1e-992f-6a5176a62c55","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b06cfff-b6d2-4974-be71-68067158ef33","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58092874-4226-475c-b084-de7983bba446","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80959158-4fb7-4724-948a-1b44e36df2b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a2ae2bd-e045-4557-8327-36f557c329aa","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a928b0f6-11f0-4132-b09c-eeb528d8ce3a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f3cfe30-a3f9-498a-94de-82f115c28652","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06d4e678-f2b1-47f9-99ad-5b49bb44aaf3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"609f9913-5913-48f5-a8a3-984e074c1e4d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c00d552-9c3b-4b72-96ef-db5722628b56","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"124dd8de-1a4a-47a2-9696-e4c05204c065","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38150b07-3784-4397-bb1f-89c4a55b7cfb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee750f0c-dc38-4cba-be12-458c3e2cfc70","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ba36882-78b9-4fd8-ac93-a1e0effbec9c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4bc30c-179d-4671-b776-19e72103d392","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"520923c2-217a-4510-b30f-f65b4b1e3b13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c0d87ff7-6e0e-4ac3-9146-de27c2995580","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06cdef33-822e-4d79-9238-279fbba5edfe","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7888771d-9a42-4932-aed2-90f3bf880b2d","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27f5ee17-b1d8-4220-b643-42ed7e70817c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df181df8-d7d3-4786-bedd-5142b4f0c90c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e50159e-2391-44fa-a0d9-15767963df6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8faa552-bb10-4f2b-9913-75f20518a305","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01f0604a-68c1-4941-b6c7-a164010680ca","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0f71e53-9dc3-440b-b3c5-dc3da4aaf80d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f0c56f4-2c53-4bce-9692-b7491176547c","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f695d0d-cc52-4c54-aa8f-cbc52ec0d1a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abcd421f-5a21-47ec-a3ff-44abe4458df8","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"65b176bb-5474-4930-b447-8832faf16571","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81b935b7-128d-4eee-9353-e124f71cc21a","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e211daf3-d0eb-4a0e-8783-6684ad819022","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d5f929b-9a02-4aad-9973-00fa19030d75","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"411f19cb-ce7b-482f-96b9-31835411993a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daa8a33a-c566-40e2-a1a4-bb7c88a424dd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3efbd178-cde1-413f-a6f5-5a144c592311","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c62d52d-4378-4e1e-992f-6a5176a62c55","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b06cfff-b6d2-4974-be71-68067158ef33","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58092874-4226-475c-b084-de7983bba446","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80959158-4fb7-4724-948a-1b44e36df2b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a2ae2bd-e045-4557-8327-36f557c329aa","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a928b0f6-11f0-4132-b09c-eeb528d8ce3a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f3cfe30-a3f9-498a-94de-82f115c28652","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06d4e678-f2b1-47f9-99ad-5b49bb44aaf3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"609f9913-5913-48f5-a8a3-984e074c1e4d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c00d552-9c3b-4b72-96ef-db5722628b56","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"124dd8de-1a4a-47a2-9696-e4c05204c065","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38150b07-3784-4397-bb1f-89c4a55b7cfb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee750f0c-dc38-4cba-be12-458c3e2cfc70","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ba36882-78b9-4fd8-ac93-a1e0effbec9c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4bc30c-179d-4671-b776-19e72103d392","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"520923c2-217a-4510-b30f-f65b4b1e3b13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c0d87ff7-6e0e-4ac3-9146-de27c2995580","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06cdef33-822e-4d79-9238-279fbba5edfe","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7888771d-9a42-4932-aed2-90f3bf880b2d","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27f5ee17-b1d8-4220-b643-42ed7e70817c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df181df8-d7d3-4786-bedd-5142b4f0c90c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e50159e-2391-44fa-a0d9-15767963df6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8faa552-bb10-4f2b-9913-75f20518a305","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01f0604a-68c1-4941-b6c7-a164010680ca","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0f71e53-9dc3-440b-b3c5-dc3da4aaf80d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f0c56f4-2c53-4bce-9692-b7491176547c","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f695d0d-cc52-4c54-aa8f-cbc52ec0d1a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abcd421f-5a21-47ec-a3ff-44abe4458df8","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"65b176bb-5474-4930-b447-8832faf16571","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81b935b7-128d-4eee-9353-e124f71cc21a","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e211daf3-d0eb-4a0e-8783-6684ad819022","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d5f929b-9a02-4aad-9973-00fa19030d75","IsCreationKey":false,"Key":24.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_ui_hov_1/spr_ui_hov_1.yy b/sprites/spr_ui_hov_1/spr_ui_hov_1.yy index b9750d56e1..88ff0507ed 100644 --- a/sprites/spr_ui_hov_1/spr_ui_hov_1.yy +++ b/sprites/spr_ui_hov_1/spr_ui_hov_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_1", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","path":"sprites/spr_ui_hov_1/spr_ui_hov_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26cb05a6-2933-4a19-be70-e7d873a80e52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","path":"sprites/spr_ui_hov_1/spr_ui_hov_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26cb05a6-2933-4a19-be70-e7d873a80e52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ui_hov_2/spr_ui_hov_2.yy b/sprites/spr_ui_hov_2/spr_ui_hov_2.yy index 96db48963a..f039921690 100644 --- a/sprites/spr_ui_hov_2/spr_ui_hov_2.yy +++ b/sprites/spr_ui_hov_2/spr_ui_hov_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_2", "bboxMode":0, "bbox_bottom":40, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e370036d-36fe-4307-b289-976fd9062928","name":"e370036d-36fe-4307-b289-976fd9062928","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e370036d-36fe-4307-b289-976fd9062928","name":"e370036d-36fe-4307-b289-976fd9062928","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e370036d-36fe-4307-b289-976fd9062928","path":"sprites/spr_ui_hov_2/spr_ui_hov_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3334c5e1-3e66-4ea4-8778-d7165ffb448c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e370036d-36fe-4307-b289-976fd9062928","path":"sprites/spr_ui_hov_2/spr_ui_hov_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3334c5e1-3e66-4ea4-8778-d7165ffb448c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ui_hov_3/spr_ui_hov_3.yy b/sprites/spr_ui_hov_3/spr_ui_hov_3.yy index ba4a361dd9..7bec610aa5 100644 --- a/sprites/spr_ui_hov_3/spr_ui_hov_3.yy +++ b/sprites/spr_ui_hov_3/spr_ui_hov_3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_3", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","path":"sprites/spr_ui_hov_3/spr_ui_hov_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff8a594e-c2e7-464e-b33f-aaf90999c6ab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","path":"sprites/spr_ui_hov_3/spr_ui_hov_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff8a594e-c2e7-464e-b33f-aaf90999c6ab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ui_hov_4/spr_ui_hov_4.yy b/sprites/spr_ui_hov_4/spr_ui_hov_4.yy index 8518f36e4e..01ecf23b1f 100644 --- a/sprites/spr_ui_hov_4/spr_ui_hov_4.yy +++ b/sprites/spr_ui_hov_4/spr_ui_hov_4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_4", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","path":"sprites/spr_ui_hov_4/spr_ui_hov_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61089074-401d-4028-bc16-4e504e1a2eb6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","path":"sprites/spr_ui_hov_4/spr_ui_hov_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61089074-401d-4028-bc16-4e504e1a2eb6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy index 9799674a26..c91080a28d 100644 --- a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy +++ b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_backpack", "bboxMode":0, "bbox_bottom":37, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8e269d92-a1bd-4360-9ab3-d9310feae634","name":"8e269d92-a1bd-4360-9ab3-d9310feae634","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e269d92-a1bd-4360-9ab3-d9310feae634","name":"8e269d92-a1bd-4360-9ab3-d9310feae634","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e269d92-a1bd-4360-9ab3-d9310feae634","path":"sprites/spr_ultra_backpack/spr_ultra_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b49ae84-efc3-48ec-9248-151c7c19f24c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e269d92-a1bd-4360-9ab3-d9310feae634","path":"sprites/spr_ultra_backpack/spr_ultra_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b49ae84-efc3-48ec-9248-151c7c19f24c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ultra_belt/spr_ultra_belt.yy b/sprites/spr_ultra_belt/spr_ultra_belt.yy index 78a2cdf309..0a502588e5 100644 --- a/sprites/spr_ultra_belt/spr_ultra_belt.yy +++ b/sprites/spr_ultra_belt/spr_ultra_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_belt", "bboxMode":0, "bbox_bottom":164, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_belt/spr_ultra_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b724e95-f10f-4ea0-888a-549bb453f7be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_belt/spr_ultra_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b724e95-f10f-4ea0-888a-549bb453f7be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy b/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy index f67b24f5af..582a6b9bb7 100644 --- a/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy +++ b/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_honor_guard", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c90a81d-cb09-420f-9d3e-a2717d044ee8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da164d7e-dcc6-41fb-890d-2599cfa5ddf8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31138557-a4ef-465c-99bd-789c14b16264","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c90a81d-cb09-420f-9d3e-a2717d044ee8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da164d7e-dcc6-41fb-890d-2599cfa5ddf8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31138557-a4ef-465c-99bd-789c14b16264","IsCreationKey":false,"Key":2.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_ultra_honor_guard2/spr_ultra_honor_guard2.yy b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy index 5162c3dee2..df4b1772fa 100644 --- a/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy +++ b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_honor_guard2", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2991de12-c521-4ae7-b522-93889e9d98df","name":"2991de12-c521-4ae7-b522-93889e9d98df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2991de12-c521-4ae7-b522-93889e9d98df","name":"2991de12-c521-4ae7-b522-93889e9d98df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,15 +77,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c034e8b-987f-41d4-af0c-8aa2e09e5602","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2991de12-c521-4ae7-b522-93889e9d98df","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"131b933f-5eb2-468c-ab2d-c38317e7486f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be563dc1-21f3-489a-94ce-944fa3185a0f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c034e8b-987f-41d4-af0c-8aa2e09e5602","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2991de12-c521-4ae7-b522-93889e9d98df","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131b933f-5eb2-468c-ab2d-c38317e7486f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be563dc1-21f3-489a-94ce-944fa3185a0f","IsCreationKey":false,"Key":2.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_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy index 9bd8ce6e12..456cc70939 100644 --- a/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy +++ b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_right_shoulder_hanging", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b9642de9-3f72-4a7c-b92b-bbb1da41f352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9642de9-3f72-4a7c-b92b-bbb1da41f352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ultra_tassels/spr_ultra_tassels.yy b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy index c49ae9c078..79dca46634 100644 --- a/sprites/spr_ultra_tassels/spr_ultra_tassels.yy +++ b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_tassels", "bboxMode":0, "bbox_bottom":23, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b63153c-72b6-4b61-a54e-91c447e89091","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b63153c-72b6-4b61-a54e-91c447e89091","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy b/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy index 39f772fcca..f57da1db34 100644 --- a/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy +++ b/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_um_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbbaa29f-f078-4bb6-b016-3dea79733535","name":"dbbaa29f-f078-4bb6-b016-3dea79733535","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbbaa29f-f078-4bb6-b016-3dea79733535","name":"dbbaa29f-f078-4bb6-b016-3dea79733535","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd995780-905a-4fd2-994a-da7c0e54abf5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbbaa29f-f078-4bb6-b016-3dea79733535","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1803705e-b04d-49c6-8502-f2e093464157","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd995780-905a-4fd2-994a-da7c0e54abf5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbbaa29f-f078-4bb6-b016-3dea79733535","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1803705e-b04d-49c6-8502-f2e093464157","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_um_mk6_helm/spr_um_mk6_helm.yy b/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy index cbf616c1e8..207c229307 100644 --- a/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy +++ b/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_um_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"123e63f4-8786-4da9-80c0-eed2c2787aee","name":"123e63f4-8786-4da9-80c0-eed2c2787aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"123e63f4-8786-4da9-80c0-eed2c2787aee","name":"123e63f4-8786-4da9-80c0-eed2c2787aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5891a35a-57e8-4258-8689-2ad35315f960","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"123e63f4-8786-4da9-80c0-eed2c2787aee","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"334c5b1d-c7e3-4507-8389-bfc24b3f72bd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5891a35a-57e8-4258-8689-2ad35315f960","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"123e63f4-8786-4da9-80c0-eed2c2787aee","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"334c5b1d-c7e3-4507-8389-bfc24b3f72bd","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_um_mk7_helm/spr_um_mk7_helm.yy b/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy index 65070b033b..b50b3637b1 100644 --- a/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy +++ b/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_um_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35cad202-64b0-4c42-9e1b-8e0763a24590","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"046ff00a-8c12-467b-809f-e646aa3cd3a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35cad202-64b0-4c42-9e1b-8e0763a24590","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"046ff00a-8c12-467b-809f-e646aa3cd3a3","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_view_small/spr_view_small.yy b/sprites/spr_view_small/spr_view_small.yy index 64c9edaca1..0d10cf3803 100644 --- a/sprites/spr_view_small/spr_view_small.yy +++ b/sprites/spr_view_small/spr_view_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_view_small", "bboxMode":0, "bbox_bottom":9, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"044440c9-d329-4c30-ba70-5a2c9f23292a","name":"044440c9-d329-4c30-ba70-5a2c9f23292a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"044440c9-d329-4c30-ba70-5a2c9f23292a","name":"044440c9-d329-4c30-ba70-5a2c9f23292a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"044440c9-d329-4c30-ba70-5a2c9f23292a","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c3202c5a-6b87-4d2b-a168-f5cf52f95634","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e4933e1-4e75-431e-bf92-5aad96fc0535","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"044440c9-d329-4c30-ba70-5a2c9f23292a","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c3202c5a-6b87-4d2b-a168-f5cf52f95634","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e4933e1-4e75-431e-bf92-5aad96fc0535","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":{ diff --git a/sprites/spr_warp_level_icon/spr_warp_level_icon.yy b/sprites/spr_warp_level_icon/spr_warp_level_icon.yy index 4293e5972e..19f698600a 100644 --- a/sprites/spr_warp_level_icon/spr_warp_level_icon.yy +++ b/sprites/spr_warp_level_icon/spr_warp_level_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_warp_level_icon", "bboxMode":0, "bbox_bottom":62, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89ce9d96-cb84-4577-9b51-09f273069236","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adaedfb1-be72-4784-9929-7a52ad3f6807","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb3df69a-aa7e-408b-bfef-1dc28a7406cf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee80c0e6-271a-41bc-ac1c-aae420931a80","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89ce9d96-cb84-4577-9b51-09f273069236","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"adaedfb1-be72-4784-9929-7a52ad3f6807","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb3df69a-aa7e-408b-bfef-1dc28a7406cf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee80c0e6-271a-41bc-ac1c-aae420931a80","IsCreationKey":false,"Key":3.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_warp_storm/spr_warp_storm.yy b/sprites/spr_warp_storm/spr_warp_storm.yy index b7e23e0631..9d61e5085f 100644 --- a/sprites/spr_warp_storm/spr_warp_storm.yy +++ b/sprites/spr_warp_storm/spr_warp_storm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_warp_storm", "bboxMode":0, "bbox_bottom":89, @@ -12,63 +12,63 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"001dd472-8ab4-44d2-857c-71cf6472fadd","name":"001dd472-8ab4-44d2-857c-71cf6472fadd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7812180-2591-44d2-a367-4a4e5159130d","name":"b7812180-2591-44d2-a367-4a4e5159130d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15800b58-edc0-496c-8195-459145884aed","name":"15800b58-edc0-496c-8195-459145884aed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"47f748bd-33d0-49da-9208-46164b6aa6cb","name":"47f748bd-33d0-49da-9208-46164b6aa6cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e581d13e-93fb-40ae-b19e-16d38a3217df","name":"e581d13e-93fb-40ae-b19e-16d38a3217df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"121911da-5579-46f2-b971-a6cc9da0a7b2","name":"121911da-5579-46f2-b971-a6cc9da0a7b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55e57ab6-5985-4329-9d0d-32a05dde7774","name":"55e57ab6-5985-4329-9d0d-32a05dde7774","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"661f3ddd-9963-417c-81e1-794259b20aaa","name":"661f3ddd-9963-417c-81e1-794259b20aaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35bb266c-48a5-498b-8386-866a264b4397","name":"35bb266c-48a5-498b-8386-866a264b4397","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b9c7128-f748-48de-b091-803704177c56","name":"1b9c7128-f748-48de-b091-803704177c56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3879639-cd44-49bf-aac7-57c56e75f00a","name":"e3879639-cd44-49bf-aac7-57c56e75f00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7274cf6-c9f9-4622-8690-b8934364bc08","name":"d7274cf6-c9f9-4622-8690-b8934364bc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e096e0cb-49ca-489a-822d-adb750e9f30a","name":"e096e0cb-49ca-489a-822d-adb750e9f30a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ca4762c-fa6c-41f9-b365-78f92b122102","name":"1ca4762c-fa6c-41f9-b365-78f92b122102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfedc27a-a776-448b-9370-0ce0dc899e44","name":"dfedc27a-a776-448b-9370-0ce0dc899e44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"90f1bc52-4b49-4104-b25b-192ba372a072","name":"90f1bc52-4b49-4104-b25b-192ba372a072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39edf8d3-2669-4256-8150-4c784b28c518","name":"39edf8d3-2669-4256-8150-4c784b28c518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6afb60f5-0470-4681-86c3-256940a372a7","name":"6afb60f5-0470-4681-86c3-256940a372a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"823b1414-4a78-4745-9234-0f5df53e74cc","name":"823b1414-4a78-4745-9234-0f5df53e74cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83fb8bf3-a467-4679-be90-6f5833b64f26","name":"83fb8bf3-a467-4679-be90-6f5833b64f26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b76958d1-6360-41df-8352-7cb6850d1100","name":"b76958d1-6360-41df-8352-7cb6850d1100","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a025e794-d660-4430-a914-cd4b735734db","name":"a025e794-d660-4430-a914-cd4b735734db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"001dd472-8ab4-44d2-857c-71cf6472fadd","name":"001dd472-8ab4-44d2-857c-71cf6472fadd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7812180-2591-44d2-a367-4a4e5159130d","name":"b7812180-2591-44d2-a367-4a4e5159130d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15800b58-edc0-496c-8195-459145884aed","name":"15800b58-edc0-496c-8195-459145884aed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"47f748bd-33d0-49da-9208-46164b6aa6cb","name":"47f748bd-33d0-49da-9208-46164b6aa6cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e581d13e-93fb-40ae-b19e-16d38a3217df","name":"e581d13e-93fb-40ae-b19e-16d38a3217df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"121911da-5579-46f2-b971-a6cc9da0a7b2","name":"121911da-5579-46f2-b971-a6cc9da0a7b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55e57ab6-5985-4329-9d0d-32a05dde7774","name":"55e57ab6-5985-4329-9d0d-32a05dde7774","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"661f3ddd-9963-417c-81e1-794259b20aaa","name":"661f3ddd-9963-417c-81e1-794259b20aaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35bb266c-48a5-498b-8386-866a264b4397","name":"35bb266c-48a5-498b-8386-866a264b4397","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b9c7128-f748-48de-b091-803704177c56","name":"1b9c7128-f748-48de-b091-803704177c56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3879639-cd44-49bf-aac7-57c56e75f00a","name":"e3879639-cd44-49bf-aac7-57c56e75f00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7274cf6-c9f9-4622-8690-b8934364bc08","name":"d7274cf6-c9f9-4622-8690-b8934364bc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e096e0cb-49ca-489a-822d-adb750e9f30a","name":"e096e0cb-49ca-489a-822d-adb750e9f30a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ca4762c-fa6c-41f9-b365-78f92b122102","name":"1ca4762c-fa6c-41f9-b365-78f92b122102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfedc27a-a776-448b-9370-0ce0dc899e44","name":"dfedc27a-a776-448b-9370-0ce0dc899e44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90f1bc52-4b49-4104-b25b-192ba372a072","name":"90f1bc52-4b49-4104-b25b-192ba372a072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39edf8d3-2669-4256-8150-4c784b28c518","name":"39edf8d3-2669-4256-8150-4c784b28c518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6afb60f5-0470-4681-86c3-256940a372a7","name":"6afb60f5-0470-4681-86c3-256940a372a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"823b1414-4a78-4745-9234-0f5df53e74cc","name":"823b1414-4a78-4745-9234-0f5df53e74cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83fb8bf3-a467-4679-be90-6f5833b64f26","name":"83fb8bf3-a467-4679-be90-6f5833b64f26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b76958d1-6360-41df-8352-7cb6850d1100","name":"b76958d1-6360-41df-8352-7cb6850d1100","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a025e794-d660-4430-a914-cd4b735734db","name":"a025e794-d660-4430-a914-cd4b735734db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -124,177 +124,63 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"001dd472-8ab4-44d2-857c-71cf6472fadd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc0213e9-0f07-4f37-bcc0-59d734fcc547","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7812180-2591-44d2-a367-4a4e5159130d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9c16fe8-62b2-480f-bb59-23522e6c9155","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82ba1773-23d9-482c-a199-1d042d22b8a2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c22a8424-dbc7-47b9-832d-e4a7d7e6c0cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15800b58-edc0-496c-8195-459145884aed","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cfed53ee-1707-4303-80aa-334236fbff87","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddbc2049-164d-4c14-8f1a-fffe11f83710","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47f748bd-33d0-49da-9208-46164b6aa6cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de342073-23a5-4a54-a0fd-52288c702a2d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff42abb4-2dc9-4d5c-8748-7e65b61ed85d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f6777da-2fa6-4f33-b6f2-6ad9f8e0b5b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1681c32-37d4-4c3f-b957-b1d96a110dac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bb3c0f0-1e42-4e91-8698-493bde9659d1","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70559650-b60d-4cb3-8348-2bd34811ab23","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581d13e-93fb-40ae-b19e-16d38a3217df","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5654832b-c20d-45ac-a0a8-6f5639238060","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"516921ed-fc1f-401f-9cc4-a8b101d332ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9821bcb1-27ba-4391-a995-993c20bb45bd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d1f5ba6-9212-4283-970b-88c2cf1031b0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"121911da-5579-46f2-b971-a6cc9da0a7b2","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a16c0ec9-5a5e-4847-a3b9-55195e11e22d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85f3e091-2afa-4213-baa2-765dc2453c24","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e57ab6-5985-4329-9d0d-32a05dde7774","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e9c3f45-7582-455d-9e6e-a1b2242a2c13","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffb6cacf-c077-445a-aefc-b9c843d1b7e8","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ee80225-8f0d-4f9e-bca0-c6a5f8e9c290","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"661f3ddd-9963-417c-81e1-794259b20aaa","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bee71346-7830-4757-8201-8a7eef780e20","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47e8acd1-546e-4481-bda0-49c2c7637c94","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35bb266c-48a5-498b-8386-866a264b4397","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06791d29-0924-4ebd-8dcb-840e31b8e679","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b9c7128-f748-48de-b091-803704177c56","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a49d31e5-e7db-4323-bc62-c30f7d1a6a15","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3879639-cd44-49bf-aac7-57c56e75f00a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"222cd3d0-81f1-4200-94ec-804f7cb67c97","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e3c5b8a-db72-44e2-8aee-028dc208f855","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"938b0f67-9fe6-4514-82be-e8a8aa1ba1a3","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85d58801-0661-44d8-9385-a2a9269f833f","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd615b80-86de-453e-a55f-902d5a7e79ec","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04964e4b-5fc5-4052-86e1-449e86854587","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc7bbb99-44a3-4101-9d14-1fc6fa70944d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fea695af-8be0-4e93-979f-44179b4bd03c","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6f2012f-cb6b-48ba-a217-e9eb61564848","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7274cf6-c9f9-4622-8690-b8934364bc08","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d335ee2-98b4-4c47-8010-68f24ba1998a","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e1e5bd2-a0c2-4e7a-905e-6281a1ad8443","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4eb452a-1654-4cd3-bd9b-3fea7dfa9e3e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e096e0cb-49ca-489a-822d-adb750e9f30a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94f8b21e-3f7c-440a-acf2-feac47ae2440","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f618c26-b531-489d-88ff-9f512843fabc","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c774f978-8b5b-46a3-9792-e7b689aa0876","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ca4762c-fa6c-41f9-b365-78f92b122102","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2236f732-976a-48a1-8ac7-4b0ec0a0b011","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfedc27a-a776-448b-9370-0ce0dc899e44","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33d60de5-7b19-429e-a2a9-a3766e7b6c37","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f1bc52-4b49-4104-b25b-192ba372a072","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8477deb9-517b-496e-91cd-3bceb9508b29","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"757787a7-2519-45c0-b048-b58ac607cafd","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98c8fb73-a99d-4ab2-8c4a-8f41505916d8","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6319c0d3-7730-4f13-8117-29bf1d8863c2","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41baf1dc-d4d9-425f-844e-9587420504bb","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45cd24f6-6851-4042-a0b9-c6b268fef1f0","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb5399b0-9447-4211-b852-b735a0fe43f9","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f919bf3f-c9fc-40c8-a568-537a6dc1a476","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39edf8d3-2669-4256-8150-4c784b28c518","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe5c46b8-8e03-43a0-9355-1d3d9d22809c","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb60f5-0470-4681-86c3-256940a372a7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"545913ed-e73c-4262-b149-932369ff4b33","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e5590cf-7d4b-488d-beea-6906b5ad8381","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"823b1414-4a78-4745-9234-0f5df53e74cc","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b196899-8812-4c1e-85ec-d93ee27fdef6","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fb8bf3-a467-4679-be90-6f5833b64f26","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0f6cc36-a783-4220-ac9f-e02df0d5e39d","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b76958d1-6360-41df-8352-7cb6850d1100","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"057783d5-4726-41c2-9bf3-203247453f94","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a025e794-d660-4430-a914-cd4b735734db","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e000970-be30-436b-a58d-b6ad3bfc468d","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"001dd472-8ab4-44d2-857c-71cf6472fadd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc0213e9-0f07-4f37-bcc0-59d734fcc547","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7812180-2591-44d2-a367-4a4e5159130d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9c16fe8-62b2-480f-bb59-23522e6c9155","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82ba1773-23d9-482c-a199-1d042d22b8a2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c22a8424-dbc7-47b9-832d-e4a7d7e6c0cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15800b58-edc0-496c-8195-459145884aed","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cfed53ee-1707-4303-80aa-334236fbff87","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddbc2049-164d-4c14-8f1a-fffe11f83710","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47f748bd-33d0-49da-9208-46164b6aa6cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de342073-23a5-4a54-a0fd-52288c702a2d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff42abb4-2dc9-4d5c-8748-7e65b61ed85d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f6777da-2fa6-4f33-b6f2-6ad9f8e0b5b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1681c32-37d4-4c3f-b957-b1d96a110dac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bb3c0f0-1e42-4e91-8698-493bde9659d1","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70559650-b60d-4cb3-8348-2bd34811ab23","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581d13e-93fb-40ae-b19e-16d38a3217df","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5654832b-c20d-45ac-a0a8-6f5639238060","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"516921ed-fc1f-401f-9cc4-a8b101d332ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9821bcb1-27ba-4391-a995-993c20bb45bd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d1f5ba6-9212-4283-970b-88c2cf1031b0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"121911da-5579-46f2-b971-a6cc9da0a7b2","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a16c0ec9-5a5e-4847-a3b9-55195e11e22d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85f3e091-2afa-4213-baa2-765dc2453c24","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e57ab6-5985-4329-9d0d-32a05dde7774","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e9c3f45-7582-455d-9e6e-a1b2242a2c13","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffb6cacf-c077-445a-aefc-b9c843d1b7e8","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ee80225-8f0d-4f9e-bca0-c6a5f8e9c290","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"661f3ddd-9963-417c-81e1-794259b20aaa","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bee71346-7830-4757-8201-8a7eef780e20","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47e8acd1-546e-4481-bda0-49c2c7637c94","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35bb266c-48a5-498b-8386-866a264b4397","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06791d29-0924-4ebd-8dcb-840e31b8e679","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b9c7128-f748-48de-b091-803704177c56","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a49d31e5-e7db-4323-bc62-c30f7d1a6a15","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3879639-cd44-49bf-aac7-57c56e75f00a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"222cd3d0-81f1-4200-94ec-804f7cb67c97","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e3c5b8a-db72-44e2-8aee-028dc208f855","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"938b0f67-9fe6-4514-82be-e8a8aa1ba1a3","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85d58801-0661-44d8-9385-a2a9269f833f","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd615b80-86de-453e-a55f-902d5a7e79ec","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04964e4b-5fc5-4052-86e1-449e86854587","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc7bbb99-44a3-4101-9d14-1fc6fa70944d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fea695af-8be0-4e93-979f-44179b4bd03c","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6f2012f-cb6b-48ba-a217-e9eb61564848","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7274cf6-c9f9-4622-8690-b8934364bc08","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d335ee2-98b4-4c47-8010-68f24ba1998a","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e1e5bd2-a0c2-4e7a-905e-6281a1ad8443","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4eb452a-1654-4cd3-bd9b-3fea7dfa9e3e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e096e0cb-49ca-489a-822d-adb750e9f30a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94f8b21e-3f7c-440a-acf2-feac47ae2440","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f618c26-b531-489d-88ff-9f512843fabc","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c774f978-8b5b-46a3-9792-e7b689aa0876","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ca4762c-fa6c-41f9-b365-78f92b122102","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2236f732-976a-48a1-8ac7-4b0ec0a0b011","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfedc27a-a776-448b-9370-0ce0dc899e44","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33d60de5-7b19-429e-a2a9-a3766e7b6c37","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f1bc52-4b49-4104-b25b-192ba372a072","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8477deb9-517b-496e-91cd-3bceb9508b29","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"757787a7-2519-45c0-b048-b58ac607cafd","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98c8fb73-a99d-4ab2-8c4a-8f41505916d8","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6319c0d3-7730-4f13-8117-29bf1d8863c2","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41baf1dc-d4d9-425f-844e-9587420504bb","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45cd24f6-6851-4042-a0b9-c6b268fef1f0","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb5399b0-9447-4211-b852-b735a0fe43f9","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f919bf3f-c9fc-40c8-a568-537a6dc1a476","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39edf8d3-2669-4256-8150-4c784b28c518","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe5c46b8-8e03-43a0-9355-1d3d9d22809c","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb60f5-0470-4681-86c3-256940a372a7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"545913ed-e73c-4262-b149-932369ff4b33","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e5590cf-7d4b-488d-beea-6906b5ad8381","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"823b1414-4a78-4745-9234-0f5df53e74cc","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b196899-8812-4c1e-85ec-d93ee27fdef6","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fb8bf3-a467-4679-be90-6f5833b64f26","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0f6cc36-a783-4220-ac9f-e02df0d5e39d","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b76958d1-6360-41df-8352-7cb6850d1100","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"057783d5-4726-41c2-9bf3-203247453f94","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a025e794-d660-4430-a914-cd4b735734db","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e000970-be30-436b-a58d-b6ad3bfc468d","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_assca/spr_weapon_assca.yy b/sprites/spr_weapon_assca/spr_weapon_assca.yy index ef8f28aafa..03789cc90e 100644 --- a/sprites/spr_weapon_assca/spr_weapon_assca.yy +++ b/sprites/spr_weapon_assca/spr_weapon_assca.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_assca", "bboxMode":0, "bbox_bottom":181, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a70e668f-46f5-4a71-adcd-b6ccda209baf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"904595b0-7b9a-4da8-81d1-1f2b0191245c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a70e668f-46f5-4a71-adcd-b6ccda209baf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"904595b0-7b9a-4da8-81d1-1f2b0191245c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy index 82919e06e6..1ddf815fef 100644 --- a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy +++ b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_autocannon", "bboxMode":0, "bbox_bottom":188, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ed06758-6cd0-4527-9927-973e6e725413","name":"2ed06758-6cd0-4527-9927-973e6e725413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ed06758-6cd0-4527-9927-973e6e725413","name":"2ed06758-6cd0-4527-9927-973e6e725413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ed06758-6cd0-4527-9927-973e6e725413","path":"sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9022dec-ead4-4be3-bd89-24d1a6fa9782","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ed06758-6cd0-4527-9927-973e6e725413","path":"sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9022dec-ead4-4be3-bd89-24d1a6fa9782","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy index 512595a5b8..d720811d75 100644 --- a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy +++ b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_autocannon2", "bboxMode":0, "bbox_bottom":269, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55f330f1-2ff0-4f47-b37b-c68126f5ee37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55f330f1-2ff0-4f47-b37b-c68126f5ee37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_blank/spr_weapon_blank.yy b/sprites/spr_weapon_blank/spr_weapon_blank.yy index cafa8b7e9c..17a7680e33 100644 --- a/sprites/spr_weapon_blank/spr_weapon_blank.yy +++ b/sprites/spr_weapon_blank/spr_weapon_blank.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_blank", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","path":"sprites/spr_weapon_blank/spr_weapon_blank.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"637be8ff-668a-4e8e-b6bb-0ad812ba2aea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","path":"sprites/spr_weapon_blank/spr_weapon_blank.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"637be8ff-668a-4e8e-b6bb-0ad812ba2aea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_boarding/spr_weapon_boarding.yy b/sprites/spr_weapon_boarding/spr_weapon_boarding.yy index b0885c72f6..7cb589803d 100644 --- a/sprites/spr_weapon_boarding/spr_weapon_boarding.yy +++ b/sprites/spr_weapon_boarding/spr_weapon_boarding.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boarding", "bboxMode":0, "bbox_bottom":221, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c633911-5e02-436d-a544-2990dee696c7","name":"8c633911-5e02-436d-a544-2990dee696c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78efcc98-51d3-4128-bf26-28a0f57243ea","name":"78efcc98-51d3-4128-bf26-28a0f57243ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c633911-5e02-436d-a544-2990dee696c7","name":"8c633911-5e02-436d-a544-2990dee696c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78efcc98-51d3-4128-bf26-28a0f57243ea","name":"78efcc98-51d3-4128-bf26-28a0f57243ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"511cc112-62e5-435d-aaf5-1cf7d8c9f862","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c633911-5e02-436d-a544-2990dee696c7","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0869fef-9abb-49aa-bc3e-10c9f6f85865","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78efcc98-51d3-4128-bf26-28a0f57243ea","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bd72083-8186-40fb-a39d-e2816ed306fa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5596390f-1d0c-49a4-8c8d-073828523967","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"511cc112-62e5-435d-aaf5-1cf7d8c9f862","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c633911-5e02-436d-a544-2990dee696c7","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0869fef-9abb-49aa-bc3e-10c9f6f85865","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78efcc98-51d3-4128-bf26-28a0f57243ea","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bd72083-8186-40fb-a39d-e2816ed306fa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5596390f-1d0c-49a4-8c8d-073828523967","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_bolter/spr_weapon_bolter.yy b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy index 03522382e3..0c06d42df1 100644 --- a/sprites/spr_weapon_bolter/spr_weapon_bolter.yy +++ b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_bolter", "bboxMode":0, "bbox_bottom":186, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f0fec53-317a-4842-bc53-a72fcbb31466","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f0fec53-317a-4842-bc53-a72fcbb31466","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy b/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy index ca61f285fe..6dc78e478f 100644 --- a/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy +++ b/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boltpis", "bboxMode":0, "bbox_bottom":157, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c722af6-a209-4472-8eb0-1060349ba7d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c722af6-a209-4472-8eb0-1060349ba7d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy b/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy index 4a46b0a0ad..8efd6f9373 100644 --- a/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy +++ b/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boltstorm_gauntlet", "bboxMode":0, "bbox_bottom":188, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2388d3e-d30e-46b1-a568-dd53914a27be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97a52d30-b572-4541-8f4c-46d0ee48254e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2388d3e-d30e-46b1-a568-dd53914a27be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97a52d30-b572-4541-8f4c-46d0ee48254e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy b/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy index 4939741bd6..707c2bfb55 100644 --- a/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy +++ b/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boltstorm_gauntlet_small", "bboxMode":0, "bbox_bottom":182, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9997dd8-c5ac-4a1a-817d-9fd94e568823","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed24bd0a-4896-40c9-838c-cc10b1e39025","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9997dd8-c5ac-4a1a-817d-9fd94e568823","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed24bd0a-4896-40c9-838c-cc10b1e39025","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy b/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy index 6acc547264..43f7308d14 100644 --- a/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy +++ b/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chainfist", "bboxMode":0, "bbox_bottom":238, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"33dc232c-077a-436b-a8c8-a0f1d5790709","name":"33dc232c-077a-436b-a8c8-a0f1d5790709","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33dc232c-077a-436b-a8c8-a0f1d5790709","name":"33dc232c-077a-436b-a8c8-a0f1d5790709","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33dc232c-077a-436b-a8c8-a0f1d5790709","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aca1500-1e46-48ba-8d39-8832199ad865","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad3078d7-4d64-4c24-b5db-17c175c043d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33dc232c-077a-436b-a8c8-a0f1d5790709","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aca1500-1e46-48ba-8d39-8832199ad865","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad3078d7-4d64-4c24-b5db-17c175c043d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy b/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy index 0e5097c879..a951407ccf 100644 --- a/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy +++ b/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chainfist_small", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64a7d678-a244-456b-b317-31f452cd6459","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eb962ec-d2a6-41ba-b53d-b74c98fa6374","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64a7d678-a244-456b-b317-31f452cd6459","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eb962ec-d2a6-41ba-b53d-b74c98fa6374","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy index 20751a496b..8d4b35744d 100644 --- a/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy +++ b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chaxe", "bboxMode":0, "bbox_bottom":218, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c650843-7b9c-42f1-a8b5-86dfe07f4222","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c650843-7b9c-42f1-a8b5-86dfe07f4222","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy index 9b4e4d5827..946b1ce5d3 100644 --- a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy +++ b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chsword", "bboxMode":0, "bbox_bottom":222, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"877d958c-0ba3-4cf7-b6c6-61d21827c596","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"877d958c-0ba3-4cf7-b6c6-61d21827c596","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_colors/spr_weapon_colors.yy b/sprites/spr_weapon_colors/spr_weapon_colors.yy index bf5dbf26ce..121ad35f6b 100644 --- a/sprites/spr_weapon_colors/spr_weapon_colors.yy +++ b/sprites/spr_weapon_colors/spr_weapon_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_colors", "bboxMode":0, "bbox_bottom":230, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50502d0a-b361-459e-8c5b-7430a68f0599","name":"50502d0a-b361-459e-8c5b-7430a68f0599","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8420bbe7-ec74-473b-b6d8-775b6c217447","name":"8420bbe7-ec74-473b-b6d8-775b6c217447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50502d0a-b361-459e-8c5b-7430a68f0599","name":"50502d0a-b361-459e-8c5b-7430a68f0599","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8420bbe7-ec74-473b-b6d8-775b6c217447","name":"8420bbe7-ec74-473b-b6d8-775b6c217447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e5a82c97-521e-49f1-ae7d-1c6cdc38c3fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50502d0a-b361-459e-8c5b-7430a68f0599","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6fbbe5d-1522-44ee-8aeb-a63323355a15","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8420bbe7-ec74-473b-b6d8-775b6c217447","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41137b6f-df33-45c8-b42e-8e28dd5fd26d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e5a82c97-521e-49f1-ae7d-1c6cdc38c3fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50502d0a-b361-459e-8c5b-7430a68f0599","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6fbbe5d-1522-44ee-8aeb-a63323355a15","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8420bbe7-ec74-473b-b6d8-775b6c217447","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41137b6f-df33-45c8-b42e-8e28dd5fd26d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy index dcfc7e4c3d..25f684f289 100644 --- a/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy +++ b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_comflamer", "bboxMode":0, "bbox_bottom":214, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b484c45-0fb4-4a0e-9361-40cc333730bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b484c45-0fb4-4a0e-9361-40cc333730bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy b/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy index c5905aa976..dbae71492f 100644 --- a/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy +++ b/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_comgrav", "bboxMode":0, "bbox_bottom":190, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa3e98b7-e1af-483f-a0e2-4bb9b2eaa6a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa3e98b7-e1af-483f-a0e2-4bb9b2eaa6a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_commelta/spr_weapon_commelta.yy b/sprites/spr_weapon_commelta/spr_weapon_commelta.yy index 6c995b7646..bb1f2b882c 100644 --- a/sprites/spr_weapon_commelta/spr_weapon_commelta.yy +++ b/sprites/spr_weapon_commelta/spr_weapon_commelta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_commelta", "bboxMode":0, "bbox_bottom":193, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46d36c12-1869-4661-9233-2359ea03459a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46d36c12-1869-4661-9233-2359ea03459a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_complas/spr_weapon_complas.yy b/sprites/spr_weapon_complas/spr_weapon_complas.yy index a2d32dd693..823e0f07a0 100644 --- a/sprites/spr_weapon_complas/spr_weapon_complas.yy +++ b/sprites/spr_weapon_complas/spr_weapon_complas.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_complas", "bboxMode":0, "bbox_bottom":188, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e5740de-eb74-4f25-9419-097f6d429f97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e5740de-eb74-4f25-9419-097f6d429f97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy index c7ab92734a..314a1a2410 100644 --- a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy +++ b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_crozarc", "bboxMode":0, "bbox_bottom":216, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9eab9f74-15b4-456c-8c7c-ae59842340a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24773002-9e70-4bb6-8e4e-25af34700cd4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9eab9f74-15b4-456c-8c7c-ae59842340a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24773002-9e70-4bb6-8e4e-25af34700cd4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy index 9cea05b3ce..511a4b8061 100644 --- a/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy +++ b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_eldsword", "bboxMode":0, "bbox_bottom":211, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"75b84618-33d2-48de-be45-cbf2383a7323","name":"75b84618-33d2-48de-be45-cbf2383a7323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75b84618-33d2-48de-be45-cbf2383a7323","name":"75b84618-33d2-48de-be45-cbf2383a7323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75b84618-33d2-48de-be45-cbf2383a7323","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15ac1141-71a9-490d-ab55-2df178b0cd36","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0cdb8b25-52a3-4a26-8d12-8518e68d6995","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75b84618-33d2-48de-be45-cbf2383a7323","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15ac1141-71a9-490d-ab55-2df178b0cd36","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0cdb8b25-52a3-4a26-8d12-8518e68d6995","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy index a31d464f18..a4a001d7dc 100644 --- a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy +++ b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_evisc", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1061812-3385-46d3-abc9-570c9b907700","name":"f1061812-3385-46d3-abc9-570c9b907700","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1061812-3385-46d3-abc9-570c9b907700","name":"f1061812-3385-46d3-abc9-570c9b907700","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f876b66-bcbd-438b-9b39-fa9f9f01e467","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1061812-3385-46d3-abc9-570c9b907700","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baceab3d-6c5a-4e6b-8c47-dfc2f19f8899","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f876b66-bcbd-438b-9b39-fa9f9f01e467","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1061812-3385-46d3-abc9-570c9b907700","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baceab3d-6c5a-4e6b-8c47-dfc2f19f8899","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_flamer/spr_weapon_flamer.yy b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy index f64483d9eb..418f7970ab 100644 --- a/sprites/spr_weapon_flamer/spr_weapon_flamer.yy +++ b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_flamer", "bboxMode":0, "bbox_bottom":217, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"51e2ff14-868a-47ef-a428-a84bd622c9df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51e2ff14-868a-47ef-a428-a84bd622c9df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy index eb43e5f7dd..b3fc93c629 100644 --- a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy +++ b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_frcaxe", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1cbf5d8-ad42-4a35-b45b-c36bbcb08988","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1cbf5d8-ad42-4a35-b45b-c36bbcb08988","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy index 0379a1a5f3..66d06787bd 100644 --- a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy +++ b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_frcstaff", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bf4c274-3780-4000-a5da-baf166ccb705","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bf4c274-3780-4000-a5da-baf166ccb705","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy b/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy index 8262a09698..851543cd8a 100644 --- a/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy +++ b/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_grav_cannon", "bboxMode":0, "bbox_bottom":173, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,9 +72,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae74c7da-b7f7-4015-941e-562f4bc25c9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae74c7da-b7f7-4015-941e-562f4bc25c9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy b/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy index 5e18270c50..f4501210ce 100644 --- a/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy +++ b/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_grav_gun", "bboxMode":0, "bbox_bottom":213, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be6c4d78-c251-45e2-8172-2dc6160772eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be6c4d78-c251-45e2-8172-2dc6160772eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy b/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy index 6f4ca9aeae..6f4e55081e 100644 --- a/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy +++ b/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_grav_pistol", "bboxMode":0, "bbox_bottom":166, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"020a30d9-3988-4c55-91ae-54f299601401","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"020a30d9-3988-4c55-91ae-54f299601401","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy b/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy index f11fb5b43f..13ec0a9846 100644 --- a/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy +++ b/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hand_flamer", "bboxMode":0, "bbox_bottom":178, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b33db15d-4ea7-4f57-85fd-d001d7688cfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b33db15d-4ea7-4f57-85fd-d001d7688cfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy b/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy index 5290d28052..50ceca4194 100644 --- a/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy +++ b/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hbolt", "bboxMode":0, "bbox_bottom":133, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35c065d1-b902-4e0f-857d-f95192fa3239","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35c065d1-b902-4e0f-857d-f95192fa3239","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy index 03211ae8d9..59fb59583e 100644 --- a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy +++ b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hflamer", "bboxMode":0, "bbox_bottom":136, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,9 +71,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","path":"sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ecc17719-e804-4983-9e75-9919e5f62d17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","path":"sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ecc17719-e804-4983-9e75-9919e5f62d17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy b/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy index 338cf648b7..a18dfcd960 100644 --- a/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy +++ b/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hflamer_term", "bboxMode":0, "bbox_bottom":194, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44d8813a-3fb2-4aac-b6c2-003670c82a97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eec815d-8d91-4478-bd93-cffb5873d8a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44d8813a-3fb2-4aac-b6c2-003670c82a97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eec815d-8d91-4478-bd93-cffb5873d8a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy index 451edf57cf..41e972b387 100644 --- a/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy +++ b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hthhammer", "bboxMode":0, "bbox_bottom":162, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68979b3b-c9d1-41ce-aac2-210269b23c45","name":"68979b3b-c9d1-41ce-aac2-210269b23c45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68979b3b-c9d1-41ce-aac2-210269b23c45","name":"68979b3b-c9d1-41ce-aac2-210269b23c45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0926682d-beb3-42a1-b68c-fa3b9bb08a8a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68979b3b-c9d1-41ce-aac2-210269b23c45","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd4cffd8-3ff0-40de-8f00-829015b1349a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0926682d-beb3-42a1-b68c-fa3b9bb08a8a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68979b3b-c9d1-41ce-aac2-210269b23c45","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd4cffd8-3ff0-40de-8f00-829015b1349a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_inferno/spr_weapon_inferno.yy b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy index 176d41e34b..5462bbcfff 100644 --- a/sprites/spr_weapon_inferno/spr_weapon_inferno.yy +++ b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_inferno", "bboxMode":0, "bbox_bottom":172, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f788d341-e281-426b-99a8-576cdbb660ce","name":"f788d341-e281-426b-99a8-576cdbb660ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f788d341-e281-426b-99a8-576cdbb660ce","name":"f788d341-e281-426b-99a8-576cdbb660ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f788d341-e281-426b-99a8-576cdbb660ce","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f3ad698-f0ed-487e-b9f1-ad0c95f7d469","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f788d341-e281-426b-99a8-576cdbb660ce","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f3ad698-f0ed-487e-b9f1-ad0c95f7d469","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy b/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy index e553ddff29..5febc28d4d 100644 --- a/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy +++ b/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_infernus_hbolt", "bboxMode":0, "bbox_bottom":147, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -89,9 +83,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","path":"sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46fa86a2-155a-4eb6-bf8f-4e12804bbb94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","path":"sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46fa86a2-155a-4eb6-bf8f-4e12804bbb94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_knife/spr_weapon_knife.yy b/sprites/spr_weapon_knife/spr_weapon_knife.yy index b8599a09ea..601bc88326 100644 --- a/sprites/spr_weapon_knife/spr_weapon_knife.yy +++ b/sprites/spr_weapon_knife/spr_weapon_knife.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_knife", "bboxMode":0, "bbox_bottom":164, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa85f45a-777f-4198-a19d-33ec37678e1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa85f45a-777f-4198-a19d-33ec37678e1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_lasca/spr_weapon_lasca.yy b/sprites/spr_weapon_lasca/spr_weapon_lasca.yy index 4abcf0081c..f972e9f4a1 100644 --- a/sprites/spr_weapon_lasca/spr_weapon_lasca.yy +++ b/sprites/spr_weapon_lasca/spr_weapon_lasca.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_lasca", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6e0e1e3-52cb-44dc-a20f-6be1ae1d90b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6e0e1e3-52cb-44dc-a20f-6be1ae1d90b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy index 8a68f8e1b7..4493002092 100644 --- a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy +++ b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_lightning1", "bboxMode":0, "bbox_bottom":192, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c502156f-5600-4fd7-b57c-dbad9c3b4c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f24b1116-c8d7-44b5-b845-94444938cf9c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c502156f-5600-4fd7-b57c-dbad9c3b4c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f24b1116-c8d7-44b5-b845-94444938cf9c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy b/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy index f356ab3ae9..1915ab06e1 100644 --- a/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy +++ b/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_lightning2", "bboxMode":0, "bbox_bottom":213, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9653695-b70a-4b29-8291-cce821c9115f","name":"c9653695-b70a-4b29-8291-cce821c9115f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9653695-b70a-4b29-8291-cce821c9115f","name":"c9653695-b70a-4b29-8291-cce821c9115f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9653695-b70a-4b29-8291-cce821c9115f","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0986b23f-598a-4bf0-b8a2-77a37ff8a0f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55509048-bb06-4c81-8f41-961cde83eacc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9653695-b70a-4b29-8291-cce821c9115f","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0986b23f-598a-4bf0-b8a2-77a37ff8a0f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55509048-bb06-4c81-8f41-961cde83eacc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy b/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy index 684164c02b..20baa9fddd 100644 --- a/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy +++ b/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_mace_of_absolution", "bboxMode":0, "bbox_bottom":256, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"630e8d95-baaa-4950-8761-35b8ccf4848c","name":"630e8d95-baaa-4950-8761-35b8ccf4848c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"630e8d95-baaa-4950-8761-35b8ccf4848c","name":"630e8d95-baaa-4950-8761-35b8ccf4848c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"03644e7c-f6ca-4447-91f5-b7c7c2d15ce1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03644e7c-f6ca-4447-91f5-b7c7c2d15ce1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_melta/spr_weapon_melta.yy b/sprites/spr_weapon_melta/spr_weapon_melta.yy index 53ec32f54e..a3277d2bc7 100644 --- a/sprites/spr_weapon_melta/spr_weapon_melta.yy +++ b/sprites/spr_weapon_melta/spr_weapon_melta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_melta", "bboxMode":0, "bbox_bottom":212, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"881d2fb1-5056-4735-8d84-8ca6614caff0","name":"881d2fb1-5056-4735-8d84-8ca6614caff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"881d2fb1-5056-4735-8d84-8ca6614caff0","name":"881d2fb1-5056-4735-8d84-8ca6614caff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"881d2fb1-5056-4735-8d84-8ca6614caff0","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74cd6908-01ec-4465-b482-4435e04d4f02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"881d2fb1-5056-4735-8d84-8ca6614caff0","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74cd6908-01ec-4465-b482-4435e04d4f02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_missile/spr_weapon_missile.yy b/sprites/spr_weapon_missile/spr_weapon_missile.yy index 122aab8fdb..e250858a0c 100644 --- a/sprites/spr_weapon_missile/spr_weapon_missile.yy +++ b/sprites/spr_weapon_missile/spr_weapon_missile.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_missile", "bboxMode":0, "bbox_bottom":160, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2250a315-f18a-45f1-956e-3e196b64c3b6","name":"2250a315-f18a-45f1-956e-3e196b64c3b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2250a315-f18a-45f1-956e-3e196b64c3b6","name":"2250a315-f18a-45f1-956e-3e196b64c3b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2250a315-f18a-45f1-956e-3e196b64c3b6","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1cf7e78-050c-4d04-bbb5-967f84a51577","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2250a315-f18a-45f1-956e-3e196b64c3b6","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1cf7e78-050c-4d04-bbb5-967f84a51577","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy b/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy index 14129074fe..59e67fde7d 100644 --- a/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy +++ b/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_mmelta", "bboxMode":0, "bbox_bottom":155, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd31ff2a-f4ee-48f0-af23-769fa634ed88","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d315b60f-aeb7-4131-98ba-f1b38c072733","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd31ff2a-f4ee-48f0-af23-769fa634ed88","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d315b60f-aeb7-4131-98ba-f1b38c072733","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_plasc/spr_weapon_plasc.yy b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy index 93e2389bd5..da5d64f7f3 100644 --- a/sprites/spr_weapon_plasc/spr_weapon_plasc.yy +++ b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasc", "bboxMode":0, "bbox_bottom":122, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd611ad5-3140-4b0f-afc5-f6566415e601","name":"cd611ad5-3140-4b0f-afc5-f6566415e601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd611ad5-3140-4b0f-afc5-f6566415e601","name":"cd611ad5-3140-4b0f-afc5-f6566415e601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce6676cf-5a3c-4f75-90a3-654dbcecc670","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd611ad5-3140-4b0f-afc5-f6566415e601","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58c402f8-99e1-4962-9fae-deec1a64ba03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce6676cf-5a3c-4f75-90a3-654dbcecc670","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd611ad5-3140-4b0f-afc5-f6566415e601","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58c402f8-99e1-4962-9fae-deec1a64ba03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_plasg/spr_weapon_plasg.yy b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy index 973baf9def..7083e69c60 100644 --- a/sprites/spr_weapon_plasg/spr_weapon_plasg.yy +++ b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasg", "bboxMode":0, "bbox_bottom":195, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8b5a45b-814c-49dc-9fc4-16d6bf9347bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8b5a45b-814c-49dc-9fc4-16d6bf9347bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy b/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy index 6096621d64..4ebd435371 100644 --- a/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy +++ b/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasma_cannon_term", "bboxMode":0, "bbox_bottom":224, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6ff589f-4704-4be6-bb05-636239790be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2caa7e10-26a7-4146-b122-b0d0df872c4f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6ff589f-4704-4be6-bb05-636239790be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2caa7e10-26a7-4146-b122-b0d0df872c4f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_plasp/spr_weapon_plasp.yy b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy index 62ba733af5..17926d1558 100644 --- a/sprites/spr_weapon_plasp/spr_weapon_plasp.yy +++ b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasp", "bboxMode":0, "bbox_bottom":172, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8333a6b3-f6e7-4458-ad54-3d025c953fdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8333a6b3-f6e7-4458-ad54-3d025c953fdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy b/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy index 8819cc4a07..085d8ff017 100644 --- a/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy +++ b/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powaxe", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90a9b82b-dd4a-488d-87a8-50b3fff5dc34","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90a9b82b-dd4a-488d-87a8-50b3fff5dc34","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy index bc020f0b89..b07fc3769c 100644 --- a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy +++ b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist", "bboxMode":0, "bbox_bottom":182, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4e1395a0-97b4-428f-8884-85c870d1d70d","name":"4e1395a0-97b4-428f-8884-85c870d1d70d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e1395a0-97b4-428f-8884-85c870d1d70d","name":"4e1395a0-97b4-428f-8884-85c870d1d70d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78267efe-7cf7-46a7-acf5-b376e96873ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e1395a0-97b4-428f-8884-85c870d1d70d","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e190c8-ca3b-4cf2-b14b-2c7e1b5c5cad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78267efe-7cf7-46a7-acf5-b376e96873ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e1395a0-97b4-428f-8884-85c870d1d70d","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e190c8-ca3b-4cf2-b14b-2c7e1b5c5cad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy index db51650d86..461d587a7d 100644 --- a/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy +++ b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist2", "bboxMode":0, "bbox_bottom":212, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea311519-a01c-426c-a8c0-10475dfaee04","name":"ea311519-a01c-426c-a8c0-10475dfaee04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73c69746-f941-4d24-9de1-f145a13328b7","name":"73c69746-f941-4d24-9de1-f145a13328b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0376a19f-82c2-445b-988c-3f02c34315b8","name":"0376a19f-82c2-445b-988c-3f02c34315b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea311519-a01c-426c-a8c0-10475dfaee04","name":"ea311519-a01c-426c-a8c0-10475dfaee04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73c69746-f941-4d24-9de1-f145a13328b7","name":"73c69746-f941-4d24-9de1-f145a13328b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0376a19f-82c2-445b-988c-3f02c34315b8","name":"0376a19f-82c2-445b-988c-3f02c34315b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3278e4ea-7460-40e6-8145-962dc0de12d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2b1795c-a15e-46b4-a00b-3db25b561e32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea311519-a01c-426c-a8c0-10475dfaee04","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e16fdb3-fff1-4be4-a1e4-35f56ad7a560","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4317d34f-5720-4a6d-a8a1-710e4331b846","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73c69746-f941-4d24-9de1-f145a13328b7","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9814f170-a29e-419d-a816-cc341f192907","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0376a19f-82c2-445b-988c-3f02c34315b8","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c923798f-ab68-4624-8da2-c3643898906d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3278e4ea-7460-40e6-8145-962dc0de12d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2b1795c-a15e-46b4-a00b-3db25b561e32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea311519-a01c-426c-a8c0-10475dfaee04","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e16fdb3-fff1-4be4-a1e4-35f56ad7a560","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4317d34f-5720-4a6d-a8a1-710e4331b846","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73c69746-f941-4d24-9de1-f145a13328b7","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9814f170-a29e-419d-a816-cc341f192907","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0376a19f-82c2-445b-988c-3f02c34315b8","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c923798f-ab68-4624-8da2-c3643898906d","IsCreationKey":false,"Key":5.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":{ diff --git a/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy b/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy index 991886319a..cbe822c20f 100644 --- a/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy +++ b/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist4", "bboxMode":0, "bbox_bottom":188, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47151b1c-9cef-45fe-883f-ffbcadc946d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0047329-f211-4ad9-9557-0d0295d68efc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47151b1c-9cef-45fe-883f-ffbcadc946d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0047329-f211-4ad9-9557-0d0295d68efc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy b/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy index 86e0c15636..52674ca02e 100644 --- a/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy +++ b/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist_old", "bboxMode":0, "bbox_bottom":144, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0be31cfe-78c4-471d-b859-e254532372b9","name":"0be31cfe-78c4-471d-b859-e254532372b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01579dc0-615a-49a2-9b4d-ea41758f00db","name":"01579dc0-615a-49a2-9b4d-ea41758f00db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"984d3389-f9ab-456a-9fa4-08daa820a402","name":"984d3389-f9ab-456a-9fa4-08daa820a402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0be31cfe-78c4-471d-b859-e254532372b9","name":"0be31cfe-78c4-471d-b859-e254532372b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01579dc0-615a-49a2-9b4d-ea41758f00db","name":"01579dc0-615a-49a2-9b4d-ea41758f00db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"984d3389-f9ab-456a-9fa4-08daa820a402","name":"984d3389-f9ab-456a-9fa4-08daa820a402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0be31cfe-78c4-471d-b859-e254532372b9","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"510c3907-1247-443e-b8b5-1c65f1520ef2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01579dc0-615a-49a2-9b4d-ea41758f00db","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf80a95d-0048-4e86-bd8b-3fd9c5c85d47","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5451e330-335c-43db-a09f-024a21e42b94","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"984d3389-f9ab-456a-9fa4-08daa820a402","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b9a418e-eac9-490f-9230-2751e6a5bc6f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0be31cfe-78c4-471d-b859-e254532372b9","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"510c3907-1247-443e-b8b5-1c65f1520ef2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01579dc0-615a-49a2-9b4d-ea41758f00db","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf80a95d-0048-4e86-bd8b-3fd9c5c85d47","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5451e330-335c-43db-a09f-024a21e42b94","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"984d3389-f9ab-456a-9fa4-08daa820a402","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b9a418e-eac9-490f-9230-2751e6a5bc6f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy index 2655b390b1..ee158ba307 100644 --- a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy +++ b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powmace", "bboxMode":0, "bbox_bottom":261, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"316e0e0f-a739-4bb0-b052-89d4b964924d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"316e0e0f-a739-4bb0-b052-89d4b964924d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy index 79f1f81edd..0b10ac8a3d 100644 --- a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy +++ b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powmaul", "bboxMode":0, "bbox_bottom":223, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0411c512-ab45-4528-8744-8f5cc93375d9","name":"0411c512-ab45-4528-8744-8f5cc93375d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0411c512-ab45-4528-8744-8f5cc93375d9","name":"0411c512-ab45-4528-8744-8f5cc93375d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0411c512-ab45-4528-8744-8f5cc93375d9","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"562e79ed-f23d-4371-8a19-59b8c0541d4a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0411c512-ab45-4528-8744-8f5cc93375d9","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"562e79ed-f23d-4371-8a19-59b8c0541d4a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powspear/spr_weapon_powspear.yy b/sprites/spr_weapon_powspear/spr_weapon_powspear.yy index aeca124146..31e4726545 100644 --- a/sprites/spr_weapon_powspear/spr_weapon_powspear.yy +++ b/sprites/spr_weapon_powspear/spr_weapon_powspear.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powspear", "bboxMode":0, "bbox_bottom":275, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b384452c-57a9-4471-867e-57707dc0e6f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b384452c-57a9-4471-867e-57707dc0e6f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy index 8763191879..6e0a9a9fd5 100644 --- a/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy +++ b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powspear2", "bboxMode":0, "bbox_bottom":281, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"152b7978-2299-46a9-8659-9d3fa7ea8162","name":"152b7978-2299-46a9-8659-9d3fa7ea8162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"152b7978-2299-46a9-8659-9d3fa7ea8162","name":"152b7978-2299-46a9-8659-9d3fa7ea8162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c41219a2-cc77-4318-ae9d-736be346d285","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3b5421b-700a-4ffd-84cc-867d26deb4e8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"278bbb1d-7f3b-4087-95e6-ce6a630531e2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"152b7978-2299-46a9-8659-9d3fa7ea8162","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dabce5f0-7a0a-42d9-97ef-29030be272ec","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c41219a2-cc77-4318-ae9d-736be346d285","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3b5421b-700a-4ffd-84cc-867d26deb4e8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"278bbb1d-7f3b-4087-95e6-ce6a630531e2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"152b7978-2299-46a9-8659-9d3fa7ea8162","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dabce5f0-7a0a-42d9-97ef-29030be272ec","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy index 6dd8447800..8b184dbb0e 100644 --- a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy +++ b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powspear3", "bboxMode":0, "bbox_bottom":281, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,9 +72,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bfafdbb3-42c5-4130-bc4e-ac9fd5f89808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bfafdbb3-42c5-4130-bc4e-ac9fd5f89808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy index 1cdc4c0489..42f98df256 100644 --- a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy +++ b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powswo", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c90840de-d6cc-483e-a57c-af59544fddb7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c90840de-d6cc-483e-a57c-af59544fddb7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_relbla/spr_weapon_relbla.yy b/sprites/spr_weapon_relbla/spr_weapon_relbla.yy index a299183662..8b2cf17b70 100644 --- a/sprites/spr_weapon_relbla/spr_weapon_relbla.yy +++ b/sprites/spr_weapon_relbla/spr_weapon_relbla.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_relbla", "bboxMode":0, "bbox_bottom":230, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08907d07-7132-4c10-8132-430b9ebec89a","name":"08907d07-7132-4c10-8132-430b9ebec89a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08907d07-7132-4c10-8132-430b9ebec89a","name":"08907d07-7132-4c10-8132-430b9ebec89a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f8678c0-8af9-4d94-a719-002848218458","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08907d07-7132-4c10-8132-430b9ebec89a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b3f6409-1338-410e-b86c-2a0d4af07980","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b98b33ea-aa3f-4a1e-837d-3b713f0059f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53a6ed03-3962-49b4-924f-ccb66edc1df0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f8678c0-8af9-4d94-a719-002848218458","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08907d07-7132-4c10-8132-430b9ebec89a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b3f6409-1338-410e-b86c-2a0d4af07980","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b98b33ea-aa3f-4a1e-837d-3b713f0059f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53a6ed03-3962-49b4-924f-ccb66edc1df0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy b/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy index 7d4e6bacf4..13417a6fb1 100644 --- a/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy +++ b/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_relic_blade", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"551ad9d7-f899-49d8-824c-c4aa630cc24b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93d5883f-4bed-45b6-9c83-3b88ce7201db","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"551ad9d7-f899-49d8-824c-c4aa630cc24b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93d5883f-4bed-45b6-9c83-3b88ce7201db","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy index 6d5dd765a9..713baba12d 100644 --- a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy +++ b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sbolter", "bboxMode":0, "bbox_bottom":168, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f46c285-35b1-4a8e-b996-6405ca743092","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f46c285-35b1-4a8e-b996-6405ca743092","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy b/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy index c2164a8d03..6e901609ed 100644 --- a/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy +++ b/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_skill_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","path":"sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2f2a734-5d3b-4329-b118-519351df5fb9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","path":"sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2f2a734-5d3b-4329-b118-519351df5fb9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy index 24261b5e71..bdf2f96bc5 100644 --- a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy +++ b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sniper", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7fe76e7-cc09-48ac-9bb7-983d65dd2ac7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7fe76e7-cc09-48ac-9bb7-983d65dd2ac7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy index 30d49bc521..336734d0b0 100644 --- a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy +++ b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_stalker", "bboxMode":0, "bbox_bottom":222, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"14db339f-7395-4530-87dc-3a3aace86211","name":"14db339f-7395-4530-87dc-3a3aace86211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14db339f-7395-4530-87dc-3a3aace86211","name":"14db339f-7395-4530-87dc-3a3aace86211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14db339f-7395-4530-87dc-3a3aace86211","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"160c40ae-6978-467b-a08b-d4ae57c05d2b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14db339f-7395-4530-87dc-3a3aace86211","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"160c40ae-6978-467b-a08b-d4ae57c05d2b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_standard/spr_weapon_standard.yy b/sprites/spr_weapon_standard/spr_weapon_standard.yy index ef822e374e..f41ed0fe92 100644 --- a/sprites/spr_weapon_standard/spr_weapon_standard.yy +++ b/sprites/spr_weapon_standard/spr_weapon_standard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_standard", "bboxMode":0, "bbox_bottom":271, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7a4a520a-7a19-4f59-bc07-dde98452c760","name":"7a4a520a-7a19-4f59-bc07-dde98452c760","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cbce5203-3778-468e-b7c8-7515f6e18fde","name":"cbce5203-3778-468e-b7c8-7515f6e18fde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a4a520a-7a19-4f59-bc07-dde98452c760","name":"7a4a520a-7a19-4f59-bc07-dde98452c760","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cbce5203-3778-468e-b7c8-7515f6e18fde","name":"cbce5203-3778-468e-b7c8-7515f6e18fde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a4a520a-7a19-4f59-bc07-dde98452c760","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6098e9c5-5468-41a9-a2b2-b8a20ab9a5b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c93b7cba-b1b1-4daa-a530-bfb41ed7d67d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbce5203-3778-468e-b7c8-7515f6e18fde","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"718e1208-998c-4f79-b774-96d8555dfc20","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40db7c33-c106-423a-ab76-892e47323159","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a4a520a-7a19-4f59-bc07-dde98452c760","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6098e9c5-5468-41a9-a2b2-b8a20ab9a5b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c93b7cba-b1b1-4daa-a530-bfb41ed7d67d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbce5203-3778-468e-b7c8-7515f6e18fde","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"718e1208-998c-4f79-b774-96d8555dfc20","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40db7c33-c106-423a-ab76-892e47323159","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_standard2/spr_weapon_standard2.yy b/sprites/spr_weapon_standard2/spr_weapon_standard2.yy index f6a4e046fa..16943323f5 100644 --- a/sprites/spr_weapon_standard2/spr_weapon_standard2.yy +++ b/sprites/spr_weapon_standard2/spr_weapon_standard2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_standard2", "bboxMode":0, "bbox_bottom":281, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46000387-92ab-4c63-aeca-861fad536597","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df99334c-a885-446f-9589-d197bb8535d4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46000387-92ab-4c63-aeca-861fad536597","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df99334c-a885-446f-9589-d197bb8535d4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_storm/spr_weapon_storm.yy b/sprites/spr_weapon_storm/spr_weapon_storm.yy index 92da4f20fc..fd92cfb168 100644 --- a/sprites/spr_weapon_storm/spr_weapon_storm.yy +++ b/sprites/spr_weapon_storm/spr_weapon_storm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm", "bboxMode":0, "bbox_bottom":178, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee3e6256-19ea-4071-91e7-fdc1b74bcdff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c0636cd-15ad-4c13-934c-2259a4748348","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3e6256-19ea-4071-91e7-fdc1b74bcdff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c0636cd-15ad-4c13-934c-2259a4748348","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_storm2/spr_weapon_storm2.yy b/sprites/spr_weapon_storm2/spr_weapon_storm2.yy index 1f20f6e4f6..5f65d5500c 100644 --- a/sprites/spr_weapon_storm2/spr_weapon_storm2.yy +++ b/sprites/spr_weapon_storm2/spr_weapon_storm2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm2", "bboxMode":0, "bbox_bottom":156, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92b335a7-bf24-4f08-8e25-68f66ea594da","name":"92b335a7-bf24-4f08-8e25-68f66ea594da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92b335a7-bf24-4f08-8e25-68f66ea594da","name":"92b335a7-bf24-4f08-8e25-68f66ea594da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"652f8a4e-ce6f-49f9-bdfc-7ed6eb9bb380","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b335a7-bf24-4f08-8e25-68f66ea594da","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9105c9ef-4d04-49b9-af90-81abd84cb227","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"652f8a4e-ce6f-49f9-bdfc-7ed6eb9bb380","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b335a7-bf24-4f08-8e25-68f66ea594da","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9105c9ef-4d04-49b9-af90-81abd84cb227","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy b/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy index 8d1c0d7c90..f26aeeaf43 100644 --- a/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy +++ b/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm_tall", "bboxMode":0, "bbox_bottom":221, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f6262674-c261-4da7-aa0e-506e3196aa81","name":"f6262674-c261-4da7-aa0e-506e3196aa81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6262674-c261-4da7-aa0e-506e3196aa81","name":"f6262674-c261-4da7-aa0e-506e3196aa81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6262674-c261-4da7-aa0e-506e3196aa81","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2995137d-6005-4690-8d87-3db7ccdd4a8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d37d0b5a-f4ff-4e58-a47e-444660a0acf0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6262674-c261-4da7-aa0e-506e3196aa81","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2995137d-6005-4690-8d87-3db7ccdd4a8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d37d0b5a-f4ff-4e58-a47e-444660a0acf0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy b/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy index 25ff52f98a..95d9666d6c 100644 --- a/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy +++ b/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm_tall_2", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"05d4f358-c637-4959-b4f8-043dddfe5af9","name":"05d4f358-c637-4959-b4f8-043dddfe5af9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ae042dd-6007-483e-a319-a21e64ff24ac","name":"0ae042dd-6007-483e-a319-a21e64ff24ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05d4f358-c637-4959-b4f8-043dddfe5af9","name":"05d4f358-c637-4959-b4f8-043dddfe5af9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ae042dd-6007-483e-a319-a21e64ff24ac","name":"0ae042dd-6007-483e-a319-a21e64ff24ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d4f358-c637-4959-b4f8-043dddfe5af9","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08ecee5b-0d7d-4070-b8ec-270dfd0e535c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ae042dd-6007-483e-a319-a21e64ff24ac","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82b4df8c-0dbd-4454-99f2-0cd556e14669","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d4f358-c637-4959-b4f8-043dddfe5af9","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08ecee5b-0d7d-4070-b8ec-270dfd0e535c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ae042dd-6007-483e-a319-a21e64ff24ac","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82b4df8c-0dbd-4454-99f2-0cd556e14669","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy b/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy index d0d37c7e13..94e577d46e 100644 --- a/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy +++ b/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sword_oriental", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c811cdad-6281-47b5-bc49-194a06afa81a","name":"c811cdad-6281-47b5-bc49-194a06afa81a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c811cdad-6281-47b5-bc49-194a06afa81a","name":"c811cdad-6281-47b5-bc49-194a06afa81a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c811cdad-6281-47b5-bc49-194a06afa81a","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f5366391-42ac-4772-bf63-3a1f398c0acc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c811cdad-6281-47b5-bc49-194a06afa81a","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f5366391-42ac-4772-bf63-3a1f398c0acc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy b/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy index 79ea6bd9ab..fb8329d946 100644 --- a/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy +++ b/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sword_turk", "bboxMode":0, "bbox_bottom":221, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88d55934-39f8-4cf5-b787-e8fcfa454635","name":"88d55934-39f8-4cf5-b787-e8fcfa454635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88d55934-39f8-4cf5-b787-e8fcfa454635","name":"88d55934-39f8-4cf5-b787-e8fcfa454635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d55934-39f8-4cf5-b787-e8fcfa454635","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cfdbccb1-0a44-4898-a80b-736ec777a6e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d55934-39f8-4cf5-b787-e8fcfa454635","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cfdbccb1-0a44-4898-a80b-736ec777a6e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy index 553d5c8398..0e3530514c 100644 --- a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy +++ b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_thhammer", "bboxMode":0, "bbox_bottom":220, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6d683d25-adba-4942-a5d9-ef5f267f4485","name":"6d683d25-adba-4942-a5d9-ef5f267f4485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d683d25-adba-4942-a5d9-ef5f267f4485","name":"6d683d25-adba-4942-a5d9-ef5f267f4485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d683d25-adba-4942-a5d9-ef5f267f4485","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ff65f5b-1f6b-4784-8772-4baedbf78fa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1174f450-c54c-4b3f-91db-ea2d44f77ee5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d683d25-adba-4942-a5d9-ef5f267f4485","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ff65f5b-1f6b-4784-8772-4baedbf78fa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1174f450-c54c-4b3f-91db-ea2d44f77ee5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy b/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy index e5646cd0ff..8ad2bdb8bd 100644 --- a/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy +++ b/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_xenophase_blade_var1", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f12e580-11d2-41e9-a836-732806ddd9e1","name":"9f12e580-11d2-41e9-a836-732806ddd9e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f12e580-11d2-41e9-a836-732806ddd9e1","name":"9f12e580-11d2-41e9-a836-732806ddd9e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f12e580-11d2-41e9-a836-732806ddd9e1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"460f9a3b-0ee2-44d7-804f-d40f568a1d51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f12e580-11d2-41e9-a836-732806ddd9e1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"460f9a3b-0ee2-44d7-804f-d40f568a1d51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy b/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy index d582e2a271..4be445fa19 100644 --- a/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy +++ b/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapoon_powso_flamberge", "bboxMode":0, "bbox_bottom":219, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93646429-a51d-45af-b161-669f4ae09116","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93646429-a51d-45af-b161-669f4ae09116","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_welcome_bg/spr_welcome_bg.yy b/sprites/spr_welcome_bg/spr_welcome_bg.yy index 820c193573..e07329010c 100644 --- a/sprites/spr_welcome_bg/spr_welcome_bg.yy +++ b/sprites/spr_welcome_bg/spr_welcome_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_welcome_bg", "bboxMode":0, "bbox_bottom":717, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2271bb95-4e9b-40ac-9214-44ff3a002300","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2271bb95-4e9b-40ac-9214-44ff3a002300","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_wings/spr_wings.yy b/sprites/spr_wings/spr_wings.yy index 9fad0d3742..ca71e2281d 100644 --- a/sprites/spr_wings/spr_wings.yy +++ b/sprites/spr_wings/spr_wings.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_wings", "bboxMode":0, "bbox_bottom":199, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","path":"sprites/spr_wings/spr_wings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9592866-0134-4230-8307-ca1670527c95","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","path":"sprites/spr_wings/spr_wings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9592866-0134-4230-8307-ca1670527c95","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_wisdom_icon/spr_wisdom_icon.yy b/sprites/spr_wisdom_icon/spr_wisdom_icon.yy index 76abac1c73..aeefde3e55 100644 --- a/sprites/spr_wisdom_icon/spr_wisdom_icon.yy +++ b/sprites/spr_wisdom_icon/spr_wisdom_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_wisdom_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3bbcf618-5a44-4096-8419-d1f5a0080164","name":"3bbcf618-5a44-4096-8419-d1f5a0080164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bbcf618-5a44-4096-8419-d1f5a0080164","name":"3bbcf618-5a44-4096-8419-d1f5a0080164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bbcf618-5a44-4096-8419-d1f5a0080164","path":"sprites/spr_wisdom_icon/spr_wisdom_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7aeb2f92-2fa6-410a-9c77-f83f039bc28f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bbcf618-5a44-4096-8419-d1f5a0080164","path":"sprites/spr_wisdom_icon/spr_wisdom_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7aeb2f92-2fa6-410a-9c77-f83f039bc28f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_wolf_tail/spr_wolf_tail.yy b/sprites/spr_wolf_tail/spr_wolf_tail.yy index d5bdb393fb..e43d16b69a 100644 --- a/sprites/spr_wolf_tail/spr_wolf_tail.yy +++ b/sprites/spr_wolf_tail/spr_wolf_tail.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_wolf_tail", "bboxMode":0, "bbox_bottom":66, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86713530-ec28-4099-9e88-05c203661df3","name":"86713530-ec28-4099-9e88-05c203661df3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86713530-ec28-4099-9e88-05c203661df3","name":"86713530-ec28-4099-9e88-05c203661df3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5a2f0ae-ed1f-4c48-a9c9-8bef775b955e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba562b9d-ac8b-4e7c-8d71-0c6b9581c167","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86713530-ec28-4099-9e88-05c203661df3","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce5a623c-7be4-487f-81b2-de39672f4cfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5a2f0ae-ed1f-4c48-a9c9-8bef775b955e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba562b9d-ac8b-4e7c-8d71-0c6b9581c167","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86713530-ec28-4099-9e88-05c203661df3","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce5a623c-7be4-487f-81b2-de39672f4cfa","IsCreationKey":false,"Key":2.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_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy b/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy index 9871db8935..de9237b701 100644 --- a/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy +++ b/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk3__pualdron_veteran", "bboxMode":0, "bbox_bottom":121, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6bfe4dd-ff75-4365-af6c-fadbb12914f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6bfe4dd-ff75-4365-af6c-fadbb12914f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy b/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy index 3561f75c07..dee019e50c 100644 --- a/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy +++ b/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk4_monovisor", "bboxMode":0, "bbox_bottom":83, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f7020a2-698f-4265-8a00-5d2988511edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f7020a2-698f-4265-8a00-5d2988511edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy b/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy index 96a29b3a75..18437a3e84 100644 --- a/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy +++ b/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a87ea04-33d2-4453-a402-33a139b3742b","name":"7a87ea04-33d2-4453-a402-33a139b3742b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a87ea04-33d2-4453-a402-33a139b3742b","name":"7a87ea04-33d2-4453-a402-33a139b3742b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ac808ab-f109-4dfc-af94-029a6be8186c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a87ea04-33d2-4453-a402-33a139b3742b","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f29cf236-99c6-43ae-a485-1e516a3dca76","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ac808ab-f109-4dfc-af94-029a6be8186c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a87ea04-33d2-4453-a402-33a139b3742b","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f29cf236-99c6-43ae-a485-1e516a3dca76","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_ws_mk6_helm/spr_ws_mk6_helm.yy b/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy index c2abdf8b12..ebf6142bc5 100644 --- a/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy +++ b/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f663dea8-4248-4425-b3fd-962c9d79c68a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f66e0f37-9262-4300-a3d6-a0b6a2b18e67","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f663dea8-4248-4425-b3fd-962c9d79c68a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f66e0f37-9262-4300-a3d6-a0b6a2b18e67","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_ws_mk7_helm/spr_ws_mk7_helm.yy b/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy index 2a46ab972c..7177900376 100644 --- a/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy +++ b/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b78bdea-9192-4b19-b573-26e0b3c39c6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3fb83486-3ae3-40aa-b06b-a1ddf367f6dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b78bdea-9192-4b19-b573-26e0b3c39c6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3fb83486-3ae3-40aa-b06b-a1ddf367f6dc","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_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy b/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy index 18d76ec3f6..3c0f958bab 100644 --- a/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy +++ b/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk7_scar_of_the_ancients", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c43a742-205d-4a15-b030-7a635381bb2e","name":"5c43a742-205d-4a15-b030-7a635381bb2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c43a742-205d-4a15-b030-7a635381bb2e","name":"5c43a742-205d-4a15-b030-7a635381bb2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c43a742-205d-4a15-b030-7a635381bb2e","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93fb0caf-9576-4f30-be2c-b8caebd494e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c43a742-205d-4a15-b030-7a635381bb2e","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93fb0caf-9576-4f30-be2c-b8caebd494e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/sprite134/sprite134.yy b/sprites/sprite134/sprite134.yy index fcffeafa8d..72b3c254ad 100644 --- a/sprites/sprite134/sprite134.yy +++ b/sprites/sprite134/sprite134.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite134", "bboxMode":0, "bbox_bottom":47, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d8273305-4465-4d22-a64b-780734cd03ba","name":"d8273305-4465-4d22-a64b-780734cd03ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a69cf538-5a49-4518-8015-49d79ddec83d","name":"a69cf538-5a49-4518-8015-49d79ddec83d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2891688e-79f2-40e2-b98d-566120a66fbd","name":"2891688e-79f2-40e2-b98d-566120a66fbd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08792547-4006-4d96-8882-e37f089d5a8b","name":"08792547-4006-4d96-8882-e37f089d5a8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1bb1c266-8b39-4d83-a984-899e4addf463","name":"1bb1c266-8b39-4d83-a984-899e4addf463","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab4b69c8-1611-4deb-840c-ec3856709168","name":"ab4b69c8-1611-4deb-840c-ec3856709168","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"772af5e9-273a-461c-9125-555b64ac5ba3","name":"772af5e9-273a-461c-9125-555b64ac5ba3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc1477ea-64f8-4039-988c-b33365cfea60","name":"bc1477ea-64f8-4039-988c-b33365cfea60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d8273305-4465-4d22-a64b-780734cd03ba","name":"d8273305-4465-4d22-a64b-780734cd03ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a69cf538-5a49-4518-8015-49d79ddec83d","name":"a69cf538-5a49-4518-8015-49d79ddec83d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2891688e-79f2-40e2-b98d-566120a66fbd","name":"2891688e-79f2-40e2-b98d-566120a66fbd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08792547-4006-4d96-8882-e37f089d5a8b","name":"08792547-4006-4d96-8882-e37f089d5a8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1bb1c266-8b39-4d83-a984-899e4addf463","name":"1bb1c266-8b39-4d83-a984-899e4addf463","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab4b69c8-1611-4deb-840c-ec3856709168","name":"ab4b69c8-1611-4deb-840c-ec3856709168","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"772af5e9-273a-461c-9125-555b64ac5ba3","name":"772af5e9-273a-461c-9125-555b64ac5ba3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc1477ea-64f8-4039-988c-b33365cfea60","name":"bc1477ea-64f8-4039-988c-b33365cfea60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8273305-4465-4d22-a64b-780734cd03ba","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fbd64374-4333-4b4d-8c2e-f5a2ce2a5811","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"841a3b27-dbab-4bdd-8a9b-cb9ee744b0af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a69cf538-5a49-4518-8015-49d79ddec83d","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca53b7c3-c844-4983-a706-bf106c2297d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2891688e-79f2-40e2-b98d-566120a66fbd","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c4dfaa0-85ae-4712-99b5-7b1a54302096","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08792547-4006-4d96-8882-e37f089d5a8b","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49816e7d-4407-4f43-852b-17bea81e7571","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bb1c266-8b39-4d83-a984-899e4addf463","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d69b6664-ce96-4ca7-a51f-6642065adfe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b26ab3c9-4f0b-4b3d-b9d8-0fd7dc84f175","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7594d23-549b-42ee-84e8-b0e52725e9a5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4b69c8-1611-4deb-840c-ec3856709168","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd9e724d-2e43-4906-9c4b-c3ad12a8c01b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68bb4843-55ae-4c03-be3b-59caf4504a0d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba7905a7-e2dd-4a17-8f9c-5baf7660b40b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"772af5e9-273a-461c-9125-555b64ac5ba3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8323034a-0e2d-4cef-b102-fe538e3ffdc0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc1477ea-64f8-4039-988c-b33365cfea60","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3f2e6ec-1bf2-4f17-8c24-bf4419ed1830","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8273305-4465-4d22-a64b-780734cd03ba","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fbd64374-4333-4b4d-8c2e-f5a2ce2a5811","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"841a3b27-dbab-4bdd-8a9b-cb9ee744b0af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a69cf538-5a49-4518-8015-49d79ddec83d","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca53b7c3-c844-4983-a706-bf106c2297d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2891688e-79f2-40e2-b98d-566120a66fbd","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c4dfaa0-85ae-4712-99b5-7b1a54302096","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08792547-4006-4d96-8882-e37f089d5a8b","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49816e7d-4407-4f43-852b-17bea81e7571","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bb1c266-8b39-4d83-a984-899e4addf463","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d69b6664-ce96-4ca7-a51f-6642065adfe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b26ab3c9-4f0b-4b3d-b9d8-0fd7dc84f175","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7594d23-549b-42ee-84e8-b0e52725e9a5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4b69c8-1611-4deb-840c-ec3856709168","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd9e724d-2e43-4906-9c4b-c3ad12a8c01b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68bb4843-55ae-4c03-be3b-59caf4504a0d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba7905a7-e2dd-4a17-8f9c-5baf7660b40b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"772af5e9-273a-461c-9125-555b64ac5ba3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8323034a-0e2d-4cef-b102-fe538e3ffdc0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc1477ea-64f8-4039-988c-b33365cfea60","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3f2e6ec-1bf2-4f17-8c24-bf4419ed1830","IsCreationKey":false,"Key":12.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":{ diff --git a/sprites/sprite156/sprite156.yy b/sprites/sprite156/sprite156.yy index 9003cde1ab..7911927ca8 100644 --- a/sprites/sprite156/sprite156.yy +++ b/sprites/sprite156/sprite156.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite156", "bboxMode":0, "bbox_bottom":116, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","path":"sprites/sprite156/sprite156.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d68a0c0-92c4-4151-9b34-0a50793ad97d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","path":"sprites/sprite156/sprite156.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d68a0c0-92c4-4151-9b34-0a50793ad97d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite158/sprite158.yy b/sprites/sprite158/sprite158.yy index 59fda13fa3..71472adfbb 100644 --- a/sprites/sprite158/sprite158.yy +++ b/sprites/sprite158/sprite158.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite158", "bboxMode":0, "bbox_bottom":161, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","path":"sprites/sprite158/sprite158.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4b3a683-7ac5-4c0c-a411-2784b6229a01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","path":"sprites/sprite158/sprite158.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4b3a683-7ac5-4c0c-a411-2784b6229a01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite160/sprite160.yy b/sprites/sprite160/sprite160.yy index cd9bcfe7a4..c708d9e9e1 100644 --- a/sprites/sprite160/sprite160.yy +++ b/sprites/sprite160/sprite160.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite160", "bboxMode":0, "bbox_bottom":67, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","path":"sprites/sprite160/sprite160.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b653cca5-0503-453c-87e1-1c766f7b6be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","path":"sprites/sprite160/sprite160.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b653cca5-0503-453c-87e1-1c766f7b6be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite205/sprite205.yy b/sprites/sprite205/sprite205.yy index 4c8b1348df..f1fd3708e6 100644 --- a/sprites/sprite205/sprite205.yy +++ b/sprites/sprite205/sprite205.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite205", "bboxMode":0, "bbox_bottom":89, @@ -12,68 +12,68 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"20187b7b-038c-4892-a9c1-8f74807691cc","name":"20187b7b-038c-4892-a9c1-8f74807691cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"948f3853-433a-4d70-9e76-5bf277b69d7f","name":"948f3853-433a-4d70-9e76-5bf277b69d7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f938192-8a38-4af0-9eb6-1cf001029629","name":"1f938192-8a38-4af0-9eb6-1cf001029629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84e9ae94-69d2-47e9-8a8b-045569940e74","name":"84e9ae94-69d2-47e9-8a8b-045569940e74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"713882f5-5933-468c-9b6b-ded602dfa95c","name":"713882f5-5933-468c-9b6b-ded602dfa95c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d12c9028-3151-4ff0-af7a-71126a9eef72","name":"d12c9028-3151-4ff0-af7a-71126a9eef72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed597f49-74bb-4554-be3b-f8396d43330e","name":"ed597f49-74bb-4554-be3b-f8396d43330e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"572abf2c-f688-451c-86ad-7ae450ebf09b","name":"572abf2c-f688-451c-86ad-7ae450ebf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2af12c7e-de77-468a-9b8f-d14df64683d6","name":"2af12c7e-de77-468a-9b8f-d14df64683d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1464fb39-aba1-4946-8e95-a2a730849c4b","name":"1464fb39-aba1-4946-8e95-a2a730849c4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c38969c1-c382-48b4-889e-2b704786075b","name":"c38969c1-c382-48b4-889e-2b704786075b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15796572-346e-4a2d-b76d-7dec6f12c885","name":"15796572-346e-4a2d-b76d-7dec6f12c885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"256a727a-239a-47ea-acab-fc1298ed61e2","name":"256a727a-239a-47ea-acab-fc1298ed61e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7687056-5b88-4134-8cea-e50b8bc34382","name":"f7687056-5b88-4134-8cea-e50b8bc34382","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99391a19-306d-425e-bf27-a3d8448a675f","name":"99391a19-306d-425e-bf27-a3d8448a675f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56266570-4945-49e0-a71c-bcf06cd9dac0","name":"56266570-4945-49e0-a71c-bcf06cd9dac0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"464320dd-9757-4029-a3ad-319447951151","name":"464320dd-9757-4029-a3ad-319447951151","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5780a724-ceda-47f4-b408-3054627786eb","name":"5780a724-ceda-47f4-b408-3054627786eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d58e08aa-0785-471c-bfcc-db0d3d385728","name":"d58e08aa-0785-471c-bfcc-db0d3d385728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbb99977-f483-4227-8b9e-f1cc43280e39","name":"dbb99977-f483-4227-8b9e-f1cc43280e39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9058249-50e6-4b75-99da-8fe5042da131","name":"b9058249-50e6-4b75-99da-8fe5042da131","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82c64d4a-d421-488a-8b81-ddab5542a642","name":"82c64d4a-d421-488a-8b81-ddab5542a642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"866c182a-607d-4a51-a4b5-703faa5a955f","name":"866c182a-607d-4a51-a4b5-703faa5a955f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28dc9fde-1843-4f47-9929-6bb6782e4209","name":"28dc9fde-1843-4f47-9929-6bb6782e4209","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14245612-2105-4fe4-a0d0-b6c41880dd78","name":"14245612-2105-4fe4-a0d0-b6c41880dd78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7e3af5a-8994-4462-86e2-b64ea2567102","name":"e7e3af5a-8994-4462-86e2-b64ea2567102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"20187b7b-038c-4892-a9c1-8f74807691cc","name":"20187b7b-038c-4892-a9c1-8f74807691cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"948f3853-433a-4d70-9e76-5bf277b69d7f","name":"948f3853-433a-4d70-9e76-5bf277b69d7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f938192-8a38-4af0-9eb6-1cf001029629","name":"1f938192-8a38-4af0-9eb6-1cf001029629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84e9ae94-69d2-47e9-8a8b-045569940e74","name":"84e9ae94-69d2-47e9-8a8b-045569940e74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"713882f5-5933-468c-9b6b-ded602dfa95c","name":"713882f5-5933-468c-9b6b-ded602dfa95c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d12c9028-3151-4ff0-af7a-71126a9eef72","name":"d12c9028-3151-4ff0-af7a-71126a9eef72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed597f49-74bb-4554-be3b-f8396d43330e","name":"ed597f49-74bb-4554-be3b-f8396d43330e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"572abf2c-f688-451c-86ad-7ae450ebf09b","name":"572abf2c-f688-451c-86ad-7ae450ebf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2af12c7e-de77-468a-9b8f-d14df64683d6","name":"2af12c7e-de77-468a-9b8f-d14df64683d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1464fb39-aba1-4946-8e95-a2a730849c4b","name":"1464fb39-aba1-4946-8e95-a2a730849c4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c38969c1-c382-48b4-889e-2b704786075b","name":"c38969c1-c382-48b4-889e-2b704786075b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15796572-346e-4a2d-b76d-7dec6f12c885","name":"15796572-346e-4a2d-b76d-7dec6f12c885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"256a727a-239a-47ea-acab-fc1298ed61e2","name":"256a727a-239a-47ea-acab-fc1298ed61e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7687056-5b88-4134-8cea-e50b8bc34382","name":"f7687056-5b88-4134-8cea-e50b8bc34382","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99391a19-306d-425e-bf27-a3d8448a675f","name":"99391a19-306d-425e-bf27-a3d8448a675f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56266570-4945-49e0-a71c-bcf06cd9dac0","name":"56266570-4945-49e0-a71c-bcf06cd9dac0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"464320dd-9757-4029-a3ad-319447951151","name":"464320dd-9757-4029-a3ad-319447951151","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5780a724-ceda-47f4-b408-3054627786eb","name":"5780a724-ceda-47f4-b408-3054627786eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d58e08aa-0785-471c-bfcc-db0d3d385728","name":"d58e08aa-0785-471c-bfcc-db0d3d385728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb99977-f483-4227-8b9e-f1cc43280e39","name":"dbb99977-f483-4227-8b9e-f1cc43280e39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9058249-50e6-4b75-99da-8fe5042da131","name":"b9058249-50e6-4b75-99da-8fe5042da131","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82c64d4a-d421-488a-8b81-ddab5542a642","name":"82c64d4a-d421-488a-8b81-ddab5542a642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"866c182a-607d-4a51-a4b5-703faa5a955f","name":"866c182a-607d-4a51-a4b5-703faa5a955f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28dc9fde-1843-4f47-9929-6bb6782e4209","name":"28dc9fde-1843-4f47-9929-6bb6782e4209","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14245612-2105-4fe4-a0d0-b6c41880dd78","name":"14245612-2105-4fe4-a0d0-b6c41880dd78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7e3af5a-8994-4462-86e2-b64ea2567102","name":"e7e3af5a-8994-4462-86e2-b64ea2567102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -129,192 +129,68 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c26af98b-dc2a-433f-bc29-1720b15d1be9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a78a35f7-ae08-4af8-b3b7-4272b331b176","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"20187b7b-038c-4892-a9c1-8f74807691cc","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dcd98c6d-522c-4884-9fd0-1495cdd2592d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e036c0c-af20-4d84-884d-77b93095fc49","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c330d83-ca2e-42b1-97a8-f572b3b2563c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"948f3853-433a-4d70-9e76-5bf277b69d7f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a74ec994-f514-4110-a038-02458347f6fa","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f938192-8a38-4af0-9eb6-1cf001029629","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b088956-0479-4b8d-a182-c477012c08a0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e9ae94-69d2-47e9-8a8b-045569940e74","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b75b6f93-11eb-4961-8366-6c0902c02268","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f725165-8268-44ff-8c1d-d91dc0802148","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7652d5a-c5b3-4e53-829f-dc1df0f44e3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f654dff-36b1-4f79-b858-641df43ff6b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4940dbf7-b6df-4eeb-9517-2bdbc6e8f7b3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"615fa685-7b45-4d5d-9d10-294a2675647f","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"877ea5c1-1244-4c51-bf92-21cb2c61403f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c03aa812-0003-4523-9457-b4bb56f0da6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"713882f5-5933-468c-9b6b-ded602dfa95c","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"312ee670-e08c-4c31-9c70-8ed40f6ad91e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"12468898-9cff-4501-9ce1-35984b543471","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11d29fc7-c1d4-4bb6-a261-0c69c739814f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12c9028-3151-4ff0-af7a-71126a9eef72","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3844657d-eb55-467b-904f-adb38da21212","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d31be4d-8388-480a-8dc4-8ccd5d5da073","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4220a72b-3cfa-47c2-ab46-293c7b5a2da8","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c37e1ae7-c04e-4a5d-9ad2-142a39badfe5","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53572527-7dfa-470b-80fc-f6ed37adb9a4","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed597f49-74bb-4554-be3b-f8396d43330e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7e8b093-a7f6-4e17-94e8-e5f97de878cc","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"572abf2c-f688-451c-86ad-7ae450ebf09b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"104b58e9-d4f9-4014-90f9-3ab206e8cbca","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2397701-8f34-4abe-b1c0-7f33a5654a20","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21b766bb-2f49-4bc7-a058-aa03ef27eed2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ae2e161-596e-462b-9af7-b845bfcd3a15","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d446b18-ea81-4133-9cb0-3009dc718e7d","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fbd85722-9516-48b2-9d7c-1d6d60df18f9","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2af12c7e-de77-468a-9b8f-d14df64683d6","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd0ed600-6016-4083-be67-de5f4bb3aed6","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1464fb39-aba1-4946-8e95-a2a730849c4b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1dae602f-db65-42e8-b84a-b71e1024e5ac","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8e1aedee-9eb0-41fc-befb-144a674bad75","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e2cc7eb-0172-41d1-9644-131dd0e43e9d","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38969c1-c382-48b4-889e-2b704786075b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed5c6bec-23f1-4f20-a038-86ac3ec94d58","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15796572-346e-4a2d-b76d-7dec6f12c885","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d5c8e79-806e-452d-8a96-154d58956094","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"256a727a-239a-47ea-acab-fc1298ed61e2","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c5f4260-f449-46fe-a6e0-590761c2472e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc057fe4-8b3e-42d5-a520-7eea412389e4","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84f69a5e-4265-47bf-a9bc-9ffcd9a6b815","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcf4e6a2-69ee-48c1-b78f-0e5d00ccf8a2","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d627ee4-442f-4c19-9493-0e251d5d7aa2","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d89792ac-02d6-442d-bba3-d0af163ee1d8","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40782400-7b56-4337-bb93-6084856c5199","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7687056-5b88-4134-8cea-e50b8bc34382","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fd7a900-0be0-49fc-91fd-a523376d97e3","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99391a19-306d-425e-bf27-a3d8448a675f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9ce2752-9394-4a6c-b72c-2d7139e0329c","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56266570-4945-49e0-a71c-bcf06cd9dac0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54c8ad82-d213-4478-9a7b-f8111144e37e","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d92e1e5-d295-4057-80ab-1b5b3652d24f","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"464320dd-9757-4029-a3ad-319447951151","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b3a35a5-9d2c-4187-bdaa-8abc2761b90d","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5780a724-ceda-47f4-b408-3054627786eb","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"acee4c47-6e2e-4e89-903b-a40e10ad918e","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40c5845c-3a36-430e-857e-6f0199377ba8","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d58e08aa-0785-471c-bfcc-db0d3d385728","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70d75d83-71a2-45fd-96ad-2a71d48c234d","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb99977-f483-4227-8b9e-f1cc43280e39","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddb6b09d-eeb7-4daf-bcdf-890f7839b48b","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9058249-50e6-4b75-99da-8fe5042da131","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53e9b533-2c57-4049-b344-a1b47ad5ce21","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75f14c91-a6de-4a1d-94eb-ff22f6863dfe","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82c64d4a-d421-488a-8b81-ddab5542a642","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"421da936-db93-479e-86b1-58020a2209e5","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"866c182a-607d-4a51-a4b5-703faa5a955f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b4799db-7675-44f5-ab0f-1098459be066","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96221e44-125f-4004-9e41-ddfc2289d072","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28dc9fde-1843-4f47-9929-6bb6782e4209","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2fb6640f-fbb7-4447-b54f-c397310fdb49","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b02dfcb-b7f4-40b6-b600-14befa8da52a","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff4ced38-5f98-42f3-98c6-9a96a9826adf","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14245612-2105-4fe4-a0d0-b6c41880dd78","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e4285d3-345e-4a3c-a534-378c4026c407","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e3af5a-8994-4462-86e2-b64ea2567102","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"237ef745-c957-45bb-b2f3-fc84f1257b95","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c26af98b-dc2a-433f-bc29-1720b15d1be9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a78a35f7-ae08-4af8-b3b7-4272b331b176","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"20187b7b-038c-4892-a9c1-8f74807691cc","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dcd98c6d-522c-4884-9fd0-1495cdd2592d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e036c0c-af20-4d84-884d-77b93095fc49","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c330d83-ca2e-42b1-97a8-f572b3b2563c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"948f3853-433a-4d70-9e76-5bf277b69d7f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a74ec994-f514-4110-a038-02458347f6fa","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f938192-8a38-4af0-9eb6-1cf001029629","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b088956-0479-4b8d-a182-c477012c08a0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e9ae94-69d2-47e9-8a8b-045569940e74","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b75b6f93-11eb-4961-8366-6c0902c02268","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f725165-8268-44ff-8c1d-d91dc0802148","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7652d5a-c5b3-4e53-829f-dc1df0f44e3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f654dff-36b1-4f79-b858-641df43ff6b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4940dbf7-b6df-4eeb-9517-2bdbc6e8f7b3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"615fa685-7b45-4d5d-9d10-294a2675647f","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"877ea5c1-1244-4c51-bf92-21cb2c61403f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c03aa812-0003-4523-9457-b4bb56f0da6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"713882f5-5933-468c-9b6b-ded602dfa95c","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"312ee670-e08c-4c31-9c70-8ed40f6ad91e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"12468898-9cff-4501-9ce1-35984b543471","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11d29fc7-c1d4-4bb6-a261-0c69c739814f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12c9028-3151-4ff0-af7a-71126a9eef72","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3844657d-eb55-467b-904f-adb38da21212","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d31be4d-8388-480a-8dc4-8ccd5d5da073","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4220a72b-3cfa-47c2-ab46-293c7b5a2da8","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c37e1ae7-c04e-4a5d-9ad2-142a39badfe5","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53572527-7dfa-470b-80fc-f6ed37adb9a4","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed597f49-74bb-4554-be3b-f8396d43330e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7e8b093-a7f6-4e17-94e8-e5f97de878cc","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"572abf2c-f688-451c-86ad-7ae450ebf09b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"104b58e9-d4f9-4014-90f9-3ab206e8cbca","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2397701-8f34-4abe-b1c0-7f33a5654a20","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21b766bb-2f49-4bc7-a058-aa03ef27eed2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ae2e161-596e-462b-9af7-b845bfcd3a15","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d446b18-ea81-4133-9cb0-3009dc718e7d","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fbd85722-9516-48b2-9d7c-1d6d60df18f9","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2af12c7e-de77-468a-9b8f-d14df64683d6","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd0ed600-6016-4083-be67-de5f4bb3aed6","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1464fb39-aba1-4946-8e95-a2a730849c4b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1dae602f-db65-42e8-b84a-b71e1024e5ac","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8e1aedee-9eb0-41fc-befb-144a674bad75","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e2cc7eb-0172-41d1-9644-131dd0e43e9d","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38969c1-c382-48b4-889e-2b704786075b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed5c6bec-23f1-4f20-a038-86ac3ec94d58","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15796572-346e-4a2d-b76d-7dec6f12c885","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d5c8e79-806e-452d-8a96-154d58956094","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"256a727a-239a-47ea-acab-fc1298ed61e2","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c5f4260-f449-46fe-a6e0-590761c2472e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc057fe4-8b3e-42d5-a520-7eea412389e4","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84f69a5e-4265-47bf-a9bc-9ffcd9a6b815","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcf4e6a2-69ee-48c1-b78f-0e5d00ccf8a2","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d627ee4-442f-4c19-9493-0e251d5d7aa2","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d89792ac-02d6-442d-bba3-d0af163ee1d8","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40782400-7b56-4337-bb93-6084856c5199","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7687056-5b88-4134-8cea-e50b8bc34382","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fd7a900-0be0-49fc-91fd-a523376d97e3","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99391a19-306d-425e-bf27-a3d8448a675f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9ce2752-9394-4a6c-b72c-2d7139e0329c","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56266570-4945-49e0-a71c-bcf06cd9dac0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54c8ad82-d213-4478-9a7b-f8111144e37e","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d92e1e5-d295-4057-80ab-1b5b3652d24f","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"464320dd-9757-4029-a3ad-319447951151","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b3a35a5-9d2c-4187-bdaa-8abc2761b90d","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5780a724-ceda-47f4-b408-3054627786eb","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"acee4c47-6e2e-4e89-903b-a40e10ad918e","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40c5845c-3a36-430e-857e-6f0199377ba8","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d58e08aa-0785-471c-bfcc-db0d3d385728","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70d75d83-71a2-45fd-96ad-2a71d48c234d","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb99977-f483-4227-8b9e-f1cc43280e39","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddb6b09d-eeb7-4daf-bcdf-890f7839b48b","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9058249-50e6-4b75-99da-8fe5042da131","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53e9b533-2c57-4049-b344-a1b47ad5ce21","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75f14c91-a6de-4a1d-94eb-ff22f6863dfe","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82c64d4a-d421-488a-8b81-ddab5542a642","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"421da936-db93-479e-86b1-58020a2209e5","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"866c182a-607d-4a51-a4b5-703faa5a955f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b4799db-7675-44f5-ab0f-1098459be066","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96221e44-125f-4004-9e41-ddfc2289d072","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28dc9fde-1843-4f47-9929-6bb6782e4209","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2fb6640f-fbb7-4447-b54f-c397310fdb49","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b02dfcb-b7f4-40b6-b600-14befa8da52a","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff4ced38-5f98-42f3-98c6-9a96a9826adf","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14245612-2105-4fe4-a0d0-b6c41880dd78","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e4285d3-345e-4a3c-a534-378c4026c407","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e3af5a-8994-4462-86e2-b64ea2567102","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"237ef745-c957-45bb-b2f3-fc84f1257b95","IsCreationKey":false,"Key":61.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/sprite221/sprite221.yy b/sprites/sprite221/sprite221.yy index fba5a72e29..853d3fb4f3 100644 --- a/sprites/sprite221/sprite221.yy +++ b/sprites/sprite221/sprite221.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite221", "bboxMode":0, "bbox_bottom":142, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","path":"sprites/sprite221/sprite221.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00942437-fc4a-44e1-82ba-71afe70103ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","path":"sprites/sprite221/sprite221.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00942437-fc4a-44e1-82ba-71afe70103ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite230/sprite230.yy b/sprites/sprite230/sprite230.yy index 912a845c0e..d91923af0a 100644 --- a/sprites/sprite230/sprite230.yy +++ b/sprites/sprite230/sprite230.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite230", "bboxMode":0, "bbox_bottom":14, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","path":"sprites/sprite230/sprite230.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3aa82a1-63b2-4fa8-9879-382551ff4562","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","path":"sprites/sprite230/sprite230.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3aa82a1-63b2-4fa8-9879-382551ff4562","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite235/sprite235.yy b/sprites/sprite235/sprite235.yy index 066ec267be..621d0cd1d7 100644 --- a/sprites/sprite235/sprite235.yy +++ b/sprites/sprite235/sprite235.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite235", "bboxMode":0, "bbox_bottom":144, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9eb64083-b01d-475f-b7fb-b488e2255abd","name":"9eb64083-b01d-475f-b7fb-b488e2255abd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9eb64083-b01d-475f-b7fb-b488e2255abd","name":"9eb64083-b01d-475f-b7fb-b488e2255abd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9eb64083-b01d-475f-b7fb-b488e2255abd","path":"sprites/sprite235/sprite235.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac93298c-518d-4c5f-94ac-058b0a29d115","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9eb64083-b01d-475f-b7fb-b488e2255abd","path":"sprites/sprite235/sprite235.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac93298c-518d-4c5f-94ac-058b0a29d115","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite245/sprite245.yy b/sprites/sprite245/sprite245.yy index 2ca36e95af..58dff6f64a 100644 --- a/sprites/sprite245/sprite245.yy +++ b/sprites/sprite245/sprite245.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite245", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","path":"sprites/sprite245/sprite245.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a5f8e957-69c2-4cd4-8045-13fe17b94f01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","path":"sprites/sprite245/sprite245.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5f8e957-69c2-4cd4-8045-13fe17b94f01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/sprite266/sprite266.yy b/sprites/sprite266/sprite266.yy index 512507f9bc..9850e78b65 100644 --- a/sprites/sprite266/sprite266.yy +++ b/sprites/sprite266/sprite266.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite266", "bboxMode":0, "bbox_bottom":91, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"490f001a-c449-42ac-bc26-286c2d57d439","name":"490f001a-c449-42ac-bc26-286c2d57d439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"490f001a-c449-42ac-bc26-286c2d57d439","name":"490f001a-c449-42ac-bc26-286c2d57d439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21f73b8d-9fb1-4758-a596-31ebf4daff11","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"490f001a-c449-42ac-bc26-286c2d57d439","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f1a35c-fb4e-4576-8331-ca347235b814","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21f73b8d-9fb1-4758-a596-31ebf4daff11","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"490f001a-c449-42ac-bc26-286c2d57d439","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f1a35c-fb4e-4576-8331-ca347235b814","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":{ diff --git a/sprites/sprite267/sprite267.yy b/sprites/sprite267/sprite267.yy index 456c1b0d2a..da380150a6 100644 --- a/sprites/sprite267/sprite267.yy +++ b/sprites/sprite267/sprite267.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite267", "bboxMode":0, "bbox_bottom":479, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d10268f1-5242-4fec-b503-09bd2d966fbf","name":"d10268f1-5242-4fec-b503-09bd2d966fbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"472439bf-2235-45b0-8408-a582c8e4feb4","name":"472439bf-2235-45b0-8408-a582c8e4feb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0d528ef-8f76-4cac-92dd-2394f7650407","name":"e0d528ef-8f76-4cac-92dd-2394f7650407","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ff171f68-da9a-4b80-999a-541e07c9802d","name":"ff171f68-da9a-4b80-999a-541e07c9802d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b891142-339b-44a3-ad4d-ad21539a301b","name":"5b891142-339b-44a3-ad4d-ad21539a301b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"257d8024-9824-43ad-8813-307c289c0e47","name":"257d8024-9824-43ad-8813-307c289c0e47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d10268f1-5242-4fec-b503-09bd2d966fbf","name":"d10268f1-5242-4fec-b503-09bd2d966fbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"472439bf-2235-45b0-8408-a582c8e4feb4","name":"472439bf-2235-45b0-8408-a582c8e4feb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0d528ef-8f76-4cac-92dd-2394f7650407","name":"e0d528ef-8f76-4cac-92dd-2394f7650407","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff171f68-da9a-4b80-999a-541e07c9802d","name":"ff171f68-da9a-4b80-999a-541e07c9802d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b891142-339b-44a3-ad4d-ad21539a301b","name":"5b891142-339b-44a3-ad4d-ad21539a301b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"257d8024-9824-43ad-8813-307c289c0e47","name":"257d8024-9824-43ad-8813-307c289c0e47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3109ba7-a554-445a-93e1-af9bf24c6b10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d10268f1-5242-4fec-b503-09bd2d966fbf","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5bdcd633-b77f-45ed-8ec2-73091bc9b6ee","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"017a8296-69f5-4a63-85c6-9027867e2a7a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"472439bf-2235-45b0-8408-a582c8e4feb4","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c46d0de-8ccd-4d4a-9a45-ae7d02f3bee5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d528ef-8f76-4cac-92dd-2394f7650407","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a07ce368-ea35-42b6-b87f-52ab20da4767","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd1cbf43-f31c-4331-ab25-50b4c7b984a2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f05d0012-d481-4718-92aa-a1708d1c4fdc","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95adb502-9d7a-41dd-9e0d-1dd44b237961","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff171f68-da9a-4b80-999a-541e07c9802d","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de1cb9d0-329e-441c-bdcc-fae3dc0b3361","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b891142-339b-44a3-ad4d-ad21539a301b","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec84286c-ddf6-4269-99fd-c17529eabe69","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93ccf62d-cdc9-4fce-9f20-724524f373a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"257d8024-9824-43ad-8813-307c289c0e47","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c9801f5-dc63-49f8-82df-920a647afc4c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3109ba7-a554-445a-93e1-af9bf24c6b10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d10268f1-5242-4fec-b503-09bd2d966fbf","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5bdcd633-b77f-45ed-8ec2-73091bc9b6ee","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"017a8296-69f5-4a63-85c6-9027867e2a7a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"472439bf-2235-45b0-8408-a582c8e4feb4","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c46d0de-8ccd-4d4a-9a45-ae7d02f3bee5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d528ef-8f76-4cac-92dd-2394f7650407","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a07ce368-ea35-42b6-b87f-52ab20da4767","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd1cbf43-f31c-4331-ab25-50b4c7b984a2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f05d0012-d481-4718-92aa-a1708d1c4fdc","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95adb502-9d7a-41dd-9e0d-1dd44b237961","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff171f68-da9a-4b80-999a-541e07c9802d","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de1cb9d0-329e-441c-bdcc-fae3dc0b3361","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b891142-339b-44a3-ad4d-ad21539a301b","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec84286c-ddf6-4269-99fd-c17529eabe69","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93ccf62d-cdc9-4fce-9f20-724524f373a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"257d8024-9824-43ad-8813-307c289c0e47","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c9801f5-dc63-49f8-82df-920a647afc4c","IsCreationKey":false,"Key":11.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":{ diff --git a/sprites/sprite269/sprite269.yy b/sprites/sprite269/sprite269.yy index e1ba8979da..bb6354e9dc 100644 --- a/sprites/sprite269/sprite269.yy +++ b/sprites/sprite269/sprite269.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite269", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a073afca-5924-4620-8e3c-51c617e567dc","name":"a073afca-5924-4620-8e3c-51c617e567dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d523a48-4412-4d7b-8c14-6867ce042d04","name":"5d523a48-4412-4d7b-8c14-6867ce042d04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d438dbcf-4161-42f6-b539-ce4ed494069e","name":"d438dbcf-4161-42f6-b539-ce4ed494069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96628852-dfc1-4166-a1ca-7461aee00d71","name":"96628852-dfc1-4166-a1ca-7461aee00d71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dce71047-c025-431f-81f3-e617e163ffc0","name":"dce71047-c025-431f-81f3-e617e163ffc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be8d6592-8364-405c-a9a1-095c0695c9aa","name":"be8d6592-8364-405c-a9a1-095c0695c9aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"473f0628-ddbe-404b-9a82-26d821253c62","name":"473f0628-ddbe-404b-9a82-26d821253c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"032afc88-4208-4b2e-9b64-43e4694015ac","name":"032afc88-4208-4b2e-9b64-43e4694015ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"331027b0-c1c6-4440-8cf1-1af0367abe81","name":"331027b0-c1c6-4440-8cf1-1af0367abe81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a073afca-5924-4620-8e3c-51c617e567dc","name":"a073afca-5924-4620-8e3c-51c617e567dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d523a48-4412-4d7b-8c14-6867ce042d04","name":"5d523a48-4412-4d7b-8c14-6867ce042d04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d438dbcf-4161-42f6-b539-ce4ed494069e","name":"d438dbcf-4161-42f6-b539-ce4ed494069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96628852-dfc1-4166-a1ca-7461aee00d71","name":"96628852-dfc1-4166-a1ca-7461aee00d71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dce71047-c025-431f-81f3-e617e163ffc0","name":"dce71047-c025-431f-81f3-e617e163ffc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be8d6592-8364-405c-a9a1-095c0695c9aa","name":"be8d6592-8364-405c-a9a1-095c0695c9aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"473f0628-ddbe-404b-9a82-26d821253c62","name":"473f0628-ddbe-404b-9a82-26d821253c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"032afc88-4208-4b2e-9b64-43e4694015ac","name":"032afc88-4208-4b2e-9b64-43e4694015ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"331027b0-c1c6-4440-8cf1-1af0367abe81","name":"331027b0-c1c6-4440-8cf1-1af0367abe81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a073afca-5924-4620-8e3c-51c617e567dc","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0581599c-2f3c-4ce5-ad28-f3e015ddaa40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d523a48-4412-4d7b-8c14-6867ce042d04","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcac7175-ab87-4f9f-b44f-dd12662f22c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6656fff-9c5d-482f-9460-55bc461660ec","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f1d9d5c-661b-42a7-997a-39adc322408f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d438dbcf-4161-42f6-b539-ce4ed494069e","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"535bed8d-0c26-404f-ba29-a3c24b59cc06","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96628852-dfc1-4166-a1ca-7461aee00d71","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92e84616-accc-4665-af0f-9fec1f2b9bc5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ea65ba1-304c-4de3-b957-19bfb4c08d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce71047-c025-431f-81f3-e617e163ffc0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68200938-40f8-468b-a1ae-0939b1a37575","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be8d6592-8364-405c-a9a1-095c0695c9aa","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abb42097-8f47-4164-801a-3f3abe9cb1d7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ccd81133-8876-4e1b-8826-ffdb05d0efe8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d972cb5-8045-4a6b-acff-5ba375ca3368","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"473f0628-ddbe-404b-9a82-26d821253c62","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9f2405c-9feb-4591-9e7c-3726f729a4ec","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"032afc88-4208-4b2e-9b64-43e4694015ac","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"932e0576-09cc-405f-9bdf-5d2be8acb4d1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef369565-fc5f-4e59-aad9-876de3a0c00c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed93683a-0a88-4504-b522-d9e05069b883","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"331027b0-c1c6-4440-8cf1-1af0367abe81","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eecddf30-9f15-4733-96f0-51ac2f554848","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffc3fc14-3204-43b7-87af-21d871c970d3","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a073afca-5924-4620-8e3c-51c617e567dc","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0581599c-2f3c-4ce5-ad28-f3e015ddaa40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d523a48-4412-4d7b-8c14-6867ce042d04","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcac7175-ab87-4f9f-b44f-dd12662f22c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6656fff-9c5d-482f-9460-55bc461660ec","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f1d9d5c-661b-42a7-997a-39adc322408f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d438dbcf-4161-42f6-b539-ce4ed494069e","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"535bed8d-0c26-404f-ba29-a3c24b59cc06","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96628852-dfc1-4166-a1ca-7461aee00d71","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92e84616-accc-4665-af0f-9fec1f2b9bc5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ea65ba1-304c-4de3-b957-19bfb4c08d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce71047-c025-431f-81f3-e617e163ffc0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68200938-40f8-468b-a1ae-0939b1a37575","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be8d6592-8364-405c-a9a1-095c0695c9aa","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abb42097-8f47-4164-801a-3f3abe9cb1d7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ccd81133-8876-4e1b-8826-ffdb05d0efe8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d972cb5-8045-4a6b-acff-5ba375ca3368","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"473f0628-ddbe-404b-9a82-26d821253c62","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9f2405c-9feb-4591-9e7c-3726f729a4ec","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"032afc88-4208-4b2e-9b64-43e4694015ac","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"932e0576-09cc-405f-9bdf-5d2be8acb4d1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef369565-fc5f-4e59-aad9-876de3a0c00c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed93683a-0a88-4504-b522-d9e05069b883","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"331027b0-c1c6-4440-8cf1-1af0367abe81","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eecddf30-9f15-4733-96f0-51ac2f554848","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffc3fc14-3204-43b7-87af-21d871c970d3","IsCreationKey":false,"Key":16.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":{ From b3aed7f08d53a1e75f40e709fa049a49d28331fc Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 29 May 2025 02:02:44 +0100 Subject: [PATCH 080/155] start adding docking and weapon re-equip code --- scripts/scr_ShipStruct/scr_ShipStruct.gml | 34 +- scripts/scr_buttons/scr_buttons.gml | 39 +++ .../scr_fleet_advisor/scr_fleet_advisor.gml | 320 ++++++++++-------- .../scr_planetary_feature.gml | 24 ++ 4 files changed, 269 insertions(+), 148 deletions(-) diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 04da053fb3..030b581212 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -124,15 +124,22 @@ function ShipStruct() constructor{ possible_dock = false; } else { _planet = system_feature_bool(star.p_feature,P_features.ShipDock); - if (_planet == 0){ + if (_planet <= 0){ possible_dock = false; } else { - var _dock = return_planet_features(star.p_feature[_planet], P_features.ShipDock)[0]; - if (_dock.has_dock_space(size)){ - possible_dock = _dock; + var _dock = return_planet_features(star.p_feature[_planet], P_features.ShipDock); + if (array_length(_dock)){ + _dock = _dock[0]; + if (_dock.has_dock_space(size)){ + possible_dock = _dock; + possible_dock.planet = _planet; + } else { + possible_dock = false; + } } else { possible_dock = false; } + } } } @@ -223,10 +230,13 @@ function ShipStruct() constructor{ var draw_coords = [corner[0]+ coords[0]-_box_size, corner[1]+coords[1]-_box_size, corner[0]+coords[0]+_box_size, corner[1]+coords[1]+_box_size]; if (scr_hit(draw_coords)){ draw_set_colour(c_green); - tooltip_draw($"Emplacement direction : {pos.facing}\nEmplacement Size : {pos.slot_size}\nclick to equip new weapon"); + var _re_equip_s = docked ? "\nclick to equip new weapon" : "\ndock ship to re-equip"; + tooltip_draw($"Emplacement direction : {pos.facing}\nEmplacement Size : {pos.slot_size}{_re_equip_s}"); obj_controller.weapon_slate.weapon = pos.weapon; obj_controller.weapon_slate.slot = pos; - + if (docked && scr_click_left()){ + obj_controller.fleet_temps.weapon_equip = true; + } } else { draw_set_colour(c_blue); } @@ -234,7 +244,17 @@ function ShipStruct() constructor{ } if (possible_dock != false){ var _dock_button = draw_unit_buttons([x+280 - (string_width("Dock Ship")/2), y+300], "Dock Ship"); - + if (point_and_click(_dock_button)){ + docked = possible_dock.uid; + possible_dock.space_taken += size; + var _loc = location; + for (var i=0;i= array_length(obj_ini.ship_data)){ + continue; + } + + var _row_y = _columns.name.y1 + _row_height + (i * (_row_height + _row_gap)); + + var _goto_button = new icon_button(); + + _goto_button.x1 = _columns.location.x1 - 20; + _goto_button.y1 = _row_y + 4; + + _goto_button.set_sprite_data(1,1,spr_view_small, 0); + _goto_button.id = i; + with (_goto_button){ + click_method = function(){ + var i = id; + with(obj_p_fleet) { + var _fleet_ships = fleet_full_ship_array(); + if (array_contains(_fleet_ships, i)){ + obj_controller.x = x; + obj_controller.y = y; + obj_controller.menu = 0; + with(obj_fleet_show) { + instance_destroy(); + } + instance_create(x, y, obj_fleet_show); + } + } + } + } + + array_push(fleet_temps.goto_buttons, _goto_button) + + var _ship = obj_ini.ship_data[i]; + + with(_columns) { + name.contents = string_truncate(_ship.name, _columns.name.w - 6); + class.contents = _ship.class; + location.contents = _ship.location; + hp.contents = $"{round(_ship.hp / _ship.max_hp * 100)}%"; + carrying.contents = $"{_ship.carrying}/{_ship.capacity}"; + } + + for (var g = 0; g < array_length(_columns_array); g++) { + with(_columns[$ _columns_array[g]]) { + draw_set_halign(h_align); + switch (h_align) { + case fa_right: + draw_text(x2, _row_y, contents); + break; + case fa_center: + draw_text((x1 + x2) / 2, _row_y, contents); + break; + case fa_left: + default: + draw_text(x1, _row_y, contents); + break; + } + } + } + var _hit_box = { + x1 : xx + 25, + x2 : xx + 1546, + y1 : _row_y, + y2 : _row_y + _row_height, + ship : obj_ini.ship_data[i], + id : i, + relative_x : 0, + relative_y : 0, + } + with (_hit_box){ + enter = function(){ + if (scr_hit(relative_x + x1, relative_y + y1, relative_x+ x2, relative_y + y2)) { + if (obj_controller.fleet_temps.view_ship != id){ + obj_controller.fleet_temps.view_ship = id; + obj_controller.fleet_temps.view_ship_struct = ship; + obj_controller.fleet_temps.view_ship_occupants = scr_ship_occupants(id); + } + tooltip_draw($"Carrying ({ship.carrying}/{ship.capacity}"); + } + } + } + array_push(fleet_temps.hitboxes, _hit_box); + } } @@ -125,149 +288,24 @@ function scr_fleet_advisor(){ // TODO: Probably a good idea to turn this whole interactive list/sheet generating logic into a constructor, that can be reused on many screens. // I have no passion for this atm. - list_slate.inside_method = function(){ - - var _columns = { - name: { - w: 176, - text: "Name", - h_align: fa_left, - y1 : 0, - }, - class: { - w: 154, - text: "Class", - h_align: fa_left, - y1 : 0, - }, - location: { - w: 130, - text: "Location", - h_align: fa_left, - y1 : 0, - }, - hp: { - w: 44, - text: "HP", - h_align: fa_right, - y1 : 0, - }, - carrying: { - w: 84, - text: "Carrying", - h_align: fa_right, - y1 : 0, - }, - }; - - var _column_x = list_slate.XX + 40 - var yy = list_slate.YY; - var xx = list_slate.XX; - var _header_offset = 80; - var _columns_array = ["name", "class", "location", "hp", "carrying"]; - - for (var i = 0; i < array_length(_columns_array); i++) { - with(_columns[$ _columns_array[i]]) { - x1 = _column_x; - _column_x += w; - x2 = x1 + w; - y1 = yy + _header_offset; - header_y = (y1 - 2); - switch (h_align) { - case fa_right: - header_x = x2; - break; - case fa_center: - header_x = (x1 + x2) / 2; - break; - case fa_left: - default: - header_x = x1; - break; - } - draw_set_halign(h_align); - draw_text(header_x, header_y, text); - } - } - draw_set_halign(fa_left); - - var _row_height = 20; - var _row_gap = 2; - for (var i = ship_current; i < ship_current + 34; i++) { - if (i >= array_length(obj_ini.ship_data)){ - continue; - } - - var _row_y = _columns.name.y1 + _row_height + (i * (_row_height + _row_gap)); - draw_rectangle(xx + 25, _row_y, xx + list_slate.width-50, _row_y + _row_height, 1); - - var _goto_button = { - x1: _columns.location.x1 - 20, - y1: _row_y + 4, - sprite: spr_view_small, - click: function() { - return point_and_click([x1, y1, x2, y2]); + if (obj_controller.fleet_temps.weapon_equip == false){ + list_slate.inside_method = function(){ + draw_surface(fleet_temps.fleet_list_surface, list_slate.XX, list_slate.YY); + var _loop = max(array_length(fleet_temps.goto_buttons), array_length(fleet_temps.hitboxes)); + for (var i=0;i<_loop;i++){ + if (i 0){ + for (var fc = 0; fc < feature_count; fc++){ + if (planet[fc].uid == uuid){ + return planet[fc]; + } + } + } + return _feature; +} + // returns an array of all the positions that a certain planet feature occurs on th p_feature array of a planet // this works for both planet_Features and planet upgrades function search_planet_features(planet, search_feature){ From 0d2def3bc002c70450b24fa420a50f8911f0af7f Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 29 May 2025 02:43:46 +0100 Subject: [PATCH 081/155] first loop --- scripts/scr_ShipStruct/scr_ShipStruct.gml | 1 + scripts/scr_fleet_advisor/scr_fleet_advisor.gml | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 030b581212..63fd2e8943 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -236,6 +236,7 @@ function ShipStruct() constructor{ obj_controller.weapon_slate.slot = pos; if (docked && scr_click_left()){ obj_controller.fleet_temps.weapon_equip = true; + obj_controller.fleet_temps.wep_change_slot = slot; } } else { draw_set_colour(c_blue); diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 027e394bdd..f23ea56ddd 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -9,7 +9,7 @@ function fleet_advisor_data_setup(){ view_ship : -1, view_ship_struct : false, view_ship_occupants : "", - weapon_equip=false + weapon_equip:false } ship_slate = new DataSlate(); @@ -86,6 +86,8 @@ function fleet_advisor_data_setup(){ } function fleet_select_surface(){ + draw_set_font(fnt_40k_14b); + draw_set_color(c_white); var _columns = { name: { w: 176, @@ -239,7 +241,18 @@ function fleet_select_surface(){ } } +function setup_weapon_selection_equip(){ + var _weps = obj_ini.ship_weapons; + var _slot = obj_controller.fleet_temps.wep_change_slot; + for (var i=0;i Date: Thu, 29 May 2025 13:50:44 +0100 Subject: [PATCH 082/155] round off a good deal of technical fullfilment code --- objects/obj_fleet/Alarm_2.gml | 8 ++-- scripts/scr_ShipStruct/scr_ShipStruct.gml | 9 +++-- scripts/scr_buttons/scr_buttons.gml | 14 ++++--- .../scr_draw_planet_features.gml | 10 ++++- .../scr_fleet_advisor/scr_fleet_advisor.gml | 39 ++++++++++++++++++- .../scr_manage_task_selector.gml | 1 + .../scr_ship_weapon_struct.gml | 2 + 7 files changed, 67 insertions(+), 16 deletions(-) diff --git a/objects/obj_fleet/Alarm_2.gml b/objects/obj_fleet/Alarm_2.gml index c4cd3fd765..8c0eb21236 100644 --- a/objects/obj_fleet/Alarm_2.gml +++ b/objects/obj_fleet/Alarm_2.gml @@ -19,7 +19,7 @@ player_fleet_ship_spawner(); if (enemy=2){// This is an orderly Tau ship formation var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + xx=0;yy=0;i=0;temp1=0;x2=room_width-500;man=0; if (en_num[4]>0){ yy=(room_height/2)-((en_height[4]*en_num[4])/2); @@ -70,7 +70,7 @@ if (en_capital>0){en_column[1]="Void Stalker";en_num[1]=en_capital;en_size[1]=3; if (enemy=6){// This is an orderly Tau ship formation var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + xx=0;yy=0;i=0;temp1=0;x2=room_width-500;man=0; if (en_num[4]>0){ yy=128; @@ -136,7 +136,7 @@ if (enemy=7) or (enemy=10){// This is spew out random ships without regard for f if (enemy=8){// This is an orderly Tau ship formation var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + xx=0;yy=0;i=0;temp1=0;x2=room_width-500;man=0; yy=(room_height/2)-((en_height[5]*en_num[5])/2); yy+=(en_height[5]/2); @@ -175,7 +175,7 @@ if (enemy=8){// This is an orderly Tau ship formation if (enemy=9){// This is an orderly Tyranid ship formation var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + xx=0;yy=0;i=0;temp1=0;x2=room_width-500;man=0; yy=(room_height/2)-((en_height[4]*en_num[4])/2); yy+=(en_height[4]/2); diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 63fd2e8943..98bb6c9f2f 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -98,7 +98,8 @@ function ShipStruct() constructor{ /// @description figers out how many forge points the ship has working towards it's running. /// @param {bool} collect ship occupants again if done recently this can be false, saves overhead - static tech_fulfilment = function(fetch_new_occupants=true){ + static calc_tech_fulfilment = function(fetch_new_occupants=true){ + tech_suppliers = []; if (fetch_new_occupants){ var _occupants = get_occupants(); }else { @@ -107,8 +108,8 @@ function ShipStruct() constructor{ for (var i=0;i Date: Sat, 31 May 2025 21:55:10 +0100 Subject: [PATCH 083/155] more docking and bombard crash --- ChapterMaster.yyp | 2 +- objects/obj_ini/Create_0.gml | 5 +-- scripts/scr_ShipStruct/scr_ShipStruct.gml | 39 +++++++++++++++++ .../scr_manage_task_selector.gml | 1 + .../scr_player_ship_functions.gml | 3 +- .../scr_unit_quick_find_pane.gml | 8 ++-- .../spr_chaplain_wolfterm_helm.yy | 6 ++- .../spr_checker_texture.yy | 14 ++++++- sprites/spr_cloak_fur/spr_cloak_fur.yy | 6 ++- .../spr_dev_pack_complex.yy | 10 ++++- .../spr_generic_honor_guard.yy | 26 +++++++++--- .../spr_hazzard_texture.yy | 14 ++++++- .../spr_indomitus_left_leg_bionic.yy | 6 ++- .../spr_leopard_sprite/spr_leopard_sprite.yy | 14 ++++++- .../spr_mk3_forehead_variants.yy | 30 +++++++++---- sprites/spr_mk4_complex/spr_mk4_complex.yy | 6 ++- .../spr_mk7_complex_knees.yy | 14 ++++++- sprites/spr_pack_brazier/spr_pack_brazier.yy | 14 +++++-- .../spr_pack_brazier3/spr_pack_brazier3.yy | 6 ++- .../spr_pack_devastator.yy | 14 +++++-- .../spr_techmarine_core.yy | 42 ++++++++++++++----- sprites/spr_ultra_belt/spr_ultra_belt.yy | 6 ++- .../spr_ultra_honor_guard2.yy | 14 +++++-- .../spr_ultra_right_shoulder_hanging.yy | 6 ++- .../spr_ultra_tassels/spr_ultra_tassels.yy | 6 ++- 25 files changed, 253 insertions(+), 59 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 836424a990..a8f0999374 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -52,8 +52,8 @@ {"$GMFolder":"","%Name":"Sequences","folderPath":"folders/Sequences.yy","name":"Sequences","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sounds","folderPath":"folders/Sounds.yy","name":"Sounds","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"UI","folderPath":"folders/Sounds/UI.yy","name":"UI","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Themes","folderPath":"folders/Sounds/Themes.yy","name":"Themes","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"UI","folderPath":"folders/Sounds/UI.yy","name":"UI","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Unused","folderPath":"folders/Sounds/Unused.yy","name":"Unused","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sprites","folderPath":"folders/Sprites.yy","name":"Sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Marine Viewer","folderPath":"folders/Sprites/Marine Viewer.yy","name":"Marine Viewer","resourceType":"GMFolder","resourceVersion":"2.0",}, diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 731de5f96f..5c192ffeb6 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -30,8 +30,6 @@ home_planet = 2; artifact_struct = array_create(200); flagship = 0; -ship_weapons = []; - // Equipment- maybe the bikes should go here or something? yes they should equipment = {}; i=-1; @@ -152,7 +150,6 @@ serialize = function(){ squad_structs: squads, equipment: equipment, gene_slaves: gene_slaves, - ship_weapons, ship_data, // marines, // squads @@ -170,7 +167,7 @@ serialize = function(){ } deserialize = function(save_data){ - var exclusions = ["complex_livery_data", "full_liveries","company_liveries", "squad_types", "marine_structs", "squad_structs", "ship_weapons","ship_data"]; // skip automatic setting of certain vars, handle explicitly later + var exclusions = ["complex_livery_data", "full_liveries","company_liveries", "squad_types", "marine_structs", "squad_structs", "ship_data"]; // skip automatic setting of certain vars, handle explicitly later // Automatic var setting var all_names = struct_get_names(save_data); diff --git a/scripts/scr_ShipStruct/scr_ShipStruct.gml b/scripts/scr_ShipStruct/scr_ShipStruct.gml index 98bb6c9f2f..5eaee0c863 100644 --- a/scripts/scr_ShipStruct/scr_ShipStruct.gml +++ b/scripts/scr_ShipStruct/scr_ShipStruct.gml @@ -61,6 +61,8 @@ function ShipStruct() constructor{ tech_fulfilment = 0; tech_suppliers = []; docked = false; + refittment_time = 0; + minimum_tech = true; uid = scr_uuid_generate(); @@ -113,6 +115,15 @@ function ShipStruct() constructor{ array_push(tech_suppliers, _unit); } } + minimum_tech = tech_fulfilment >= minimum_tech_requirements; + } + + static get_dock = function(){ + if (docked != false){ + var _dock = search_system_features_uid(star.p_feature,docked); + return _dock; + } + return false; } @@ -124,6 +135,12 @@ function ShipStruct() constructor{ if (star == "none"){ possible_dock = false; } else { + var _dock = get_dock(); + if (is_struct(_dock)){ + return false; + } else { + docked = false; + } _planet = system_feature_bool(star.p_feature,P_features.ShipDock); if (_planet <= 0){ possible_dock = false; @@ -203,6 +220,9 @@ function ShipStruct() constructor{ if (obj_controller.stc_bonus[5]=3){ _final_speed *= 1.05; } + if (!minimum_tech){ + _final_speed *= 0.9; + } return _final_speed; } @@ -258,6 +278,25 @@ function ShipStruct() constructor{ } } } + else if (docked != false){ + if (!refittment_time){ + var _refit_string = "The ship is ready to move from docking"; + var _undock_button = draw_unit_buttons([x+280 - (string_width("Un-Dock Ship")/2), y+320], "Un-Dock Ship"); + } else { + var _refit_string = $"The ship requires {refittment_time} to finish being outfitted for service"; + } + + draw_text(x+280, y+295, $"Ship currently docked at {location} {_refit_string}"); + + if (point_and_click(_undock_button)){ + var _dock = get_dock(); + if (_dock != false){ + possible_dock.space_taken -= size; + docked = false; + } + } + + } draw_set_font(fnt_40k_30b); draw_set_halign(fa_left); var _h_scale = 0.6; diff --git a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml index 579e5eb2d7..cf92339726 100644 --- a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml +++ b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml @@ -1,5 +1,6 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information + function scr_manage_task_selector(){ if (exit_button.draw_shutter(xx+400,yy+70, "Exit", 0.5, true)){ switch(selection_data.purpose_code){ diff --git a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml index 4183042fcb..0739325f83 100644 --- a/scripts/scr_player_ship_functions/scr_player_ship_functions.gml +++ b/scripts/scr_player_ship_functions/scr_player_ship_functions.gml @@ -559,7 +559,8 @@ function ship_bombard_score(ship_id){ var _weapons = obj_ini.ship_data[ship_id].weapons; for (var b=0;b":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb7d7ec9-98d3-495d-9bdc-175c698dd371","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"eb7d7ec9-98d3-495d-9bdc-175c698dd371","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_checker_texture/spr_checker_texture.yy b/sprites/spr_checker_texture/spr_checker_texture.yy index e0d8251c4f..3cb1256c79 100644 --- a/sprites/spr_checker_texture/spr_checker_texture.yy +++ b/sprites/spr_checker_texture/spr_checker_texture.yy @@ -33,7 +33,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":0, @@ -76,12 +82,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.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":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cloak_fur/spr_cloak_fur.yy b/sprites/spr_cloak_fur/spr_cloak_fur.yy index 79f1cd197d..c0c86cff59 100644 --- a/sprites/spr_cloak_fur/spr_cloak_fur.yy +++ b/sprites/spr_cloak_fur/spr_cloak_fur.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_fur/spr_cloak_fur.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c0b8831-0ab4-46ac-944f-5c99c40dbe5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_fur/spr_cloak_fur.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1c0b8831-0ab4-46ac-944f-5c99c40dbe5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy index 6f47f68594..67ff19fee4 100644 --- a/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy +++ b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy @@ -64,13 +64,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":181.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":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36fcc4b6-c054-4c76-9a1c-67bc678fa11d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c77ca9f7-3220-4d01-a6cc-c19084c25a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"36fcc4b6-c054-4c76-9a1c-67bc678fa11d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c77ca9f7-3220-4d01-a6cc-c19084c25a7c","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_generic_honor_guard/spr_generic_honor_guard.yy b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy index 8db0a8e2df..1f626dccde 100644 --- a/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy +++ b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy @@ -68,17 +68,31 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c66cce41-4b23-4476-82b8-6046bf8be6aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36357777-96a0-45ba-9211-32f9f0c807f9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7581b692-35d0-4dad-91d1-ac5b40020afc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"497b6308-557a-4877-8fe6-4a0ea6442f0b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd2d972b-1bff-4558-a244-a0de713ea441","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af180f89-ae18-4ab3-973a-12d8556cf866","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32642e56-6593-4c11-b48b-a780b48d9332","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed017c0c-0f4f-4fd1-90d3-ae09be762548","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c66cce41-4b23-4476-82b8-6046bf8be6aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36357777-96a0-45ba-9211-32f9f0c807f9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7581b692-35d0-4dad-91d1-ac5b40020afc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"497b6308-557a-4877-8fe6-4a0ea6442f0b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dd2d972b-1bff-4558-a244-a0de713ea441","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"af180f89-ae18-4ab3-973a-12d8556cf866","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32642e56-6593-4c11-b48b-a780b48d9332","path":"sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ed017c0c-0f4f-4fd1-90d3-ae09be762548","IsCreationKey":false,"Key":5.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_hazzard_texture/spr_hazzard_texture.yy b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy index a4d666beef..c7c1ea0e1f 100644 --- a/sprites/spr_hazzard_texture/spr_hazzard_texture.yy +++ b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy @@ -33,7 +33,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":0, @@ -76,12 +82,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.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":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0091329d-a69b-44eb-84c6-f0a31350ebd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0091329d-a69b-44eb-84c6-f0a31350ebd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy index 9af0d69d60..fb009449c6 100644 --- a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy +++ b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eac121b-3931-417e-870e-272025ef2a2e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7eac121b-3931-417e-870e-272025ef2a2e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_leopard_sprite/spr_leopard_sprite.yy b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy index e1e33b8165..2e86214a95 100644 --- a/sprites/spr_leopard_sprite/spr_leopard_sprite.yy +++ b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy @@ -33,7 +33,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":0, @@ -76,12 +82,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":1046.0, + "seqWidth":1454.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":"65e7e956-93b9-47bc-8d8d-2515bf68797e","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"062dc391-a5c8-448f-ae78-77f49f609d50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"062dc391-a5c8-448f-ae78-77f49f609d50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy index 804223e69f..8fefbecf92 100644 --- a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy +++ b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy @@ -69,18 +69,34 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9347642e-46b3-4195-9d03-d2a761f92bc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d57cb6f-4cdd-457e-a37f-9df410e5ea56","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3093b5a7-e27d-48c5-b58b-dc513e7b8e2c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70daa5bd-729f-4641-a567-78e6da5b3720","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8732fa6e-e469-4750-af0f-1e60cd6e2654","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"946cb3e6-0dc3-45d2-8897-5093b94d1de2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37c11dd3-1414-4c8d-8d71-e00098819009","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fb25342-066e-479c-8282-263f7dff3763","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9347642e-46b3-4195-9d03-d2a761f92bc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6d57cb6f-4cdd-457e-a37f-9df410e5ea56","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3093b5a7-e27d-48c5-b58b-dc513e7b8e2c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"70daa5bd-729f-4641-a567-78e6da5b3720","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8732fa6e-e469-4750-af0f-1e60cd6e2654","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"946cb3e6-0dc3-45d2-8897-5093b94d1de2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37c11dd3-1414-4c8d-8d71-e00098819009","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9fb25342-066e-479c-8282-263f7dff3763","IsCreationKey":false,"Key":6.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_mk4_complex/spr_mk4_complex.yy b/sprites/spr_mk4_complex/spr_mk4_complex.yy index 174287f26c..e948bfcb16 100644 --- a/sprites/spr_mk4_complex/spr_mk4_complex.yy +++ b/sprites/spr_mk4_complex/spr_mk4_complex.yy @@ -64,12 +64,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy index faa14d664a..7927be7296 100644 --- a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy +++ b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy @@ -34,7 +34,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":9, @@ -77,12 +83,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pack_brazier/spr_pack_brazier.yy b/sprites/spr_pack_brazier/spr_pack_brazier.yy index 0efe887f30..f3a3c16849 100644 --- a/sprites/spr_pack_brazier/spr_pack_brazier.yy +++ b/sprites/spr_pack_brazier/spr_pack_brazier.yy @@ -65,14 +65,22 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a56ce07-8e61-4c45-b30f-8fdfa4e44d2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9565c920-28b4-410e-9be7-a89088b5b95c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bf2e48d-0846-455b-ab62-0f5943650061","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3a56ce07-8e61-4c45-b30f-8fdfa4e44d2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9565c920-28b4-410e-9be7-a89088b5b95c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7bf2e48d-0846-455b-ab62-0f5943650061","IsCreationKey":false,"Key":2.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_pack_brazier3/spr_pack_brazier3.yy b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy index 761348fb9e..e99e109910 100644 --- a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy +++ b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":282.0, + "seqWidth":281.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":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pack_devastator/spr_pack_devastator.yy b/sprites/spr_pack_devastator/spr_pack_devastator.yy index d38a1c7292..c53c1f3f73 100644 --- a/sprites/spr_pack_devastator/spr_pack_devastator.yy +++ b/sprites/spr_pack_devastator/spr_pack_devastator.yy @@ -65,14 +65,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":181.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":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","IsCreationKey":false,"Key":2.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_techmarine_core/spr_techmarine_core.yy b/sprites/spr_techmarine_core/spr_techmarine_core.yy index 44aa41efcf..cc46eaa7b4 100644 --- a/sprites/spr_techmarine_core/spr_techmarine_core.yy +++ b/sprites/spr_techmarine_core/spr_techmarine_core.yy @@ -72,21 +72,43 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":181.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":"d6fd5b26-5a16-4837-83e7-762349cad0fe","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25cc4882-27cd-4eb3-8927-46d566e0e7b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a8a1299-9aee-4121-ba72-9229b4164ae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f6d611a-eeda-4ef8-b7d9-7d86184ba07b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51b2fb6-4915-4181-8c98-cae57deb4866","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ba5f3d8-f4b7-45d7-85fb-9fcb7142ee9c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d110598-0228-4efe-ba5e-08cf667ed23b","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69e3269e-2975-42ee-95c9-20f36bd86568","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41baa262-b761-43e7-85eb-08b7824a9899","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c92658c8-d4d4-4317-b200-9c8575a2bd45","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ee93fc8-dd78-44d7-bb05-85445635e575","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e75b9c32-73ee-4045-81ac-fbbdf654ab9b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bd41038-2b15-43a9-a241-2531898b6533","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5226976-0539-4c1e-9467-9092d8ec7697","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2341b86a-9533-41e8-be8a-23eec3ef15de","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca8c5988-e83e-45e8-80cd-806e8a04b657","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"25cc4882-27cd-4eb3-8927-46d566e0e7b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3a8a1299-9aee-4121-ba72-9229b4164ae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9f6d611a-eeda-4ef8-b7d9-7d86184ba07b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51b2fb6-4915-4181-8c98-cae57deb4866","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4ba5f3d8-f4b7-45d7-85fb-9fcb7142ee9c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d110598-0228-4efe-ba5e-08cf667ed23b","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"69e3269e-2975-42ee-95c9-20f36bd86568","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41baa262-b761-43e7-85eb-08b7824a9899","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c92658c8-d4d4-4317-b200-9c8575a2bd45","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ee93fc8-dd78-44d7-bb05-85445635e575","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e75b9c32-73ee-4045-81ac-fbbdf654ab9b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4bd41038-2b15-43a9-a241-2531898b6533","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5226976-0539-4c1e-9467-9092d8ec7697","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2341b86a-9533-41e8-be8a-23eec3ef15de","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ca8c5988-e83e-45e8-80cd-806e8a04b657","IsCreationKey":false,"Key":9.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_ultra_belt/spr_ultra_belt.yy b/sprites/spr_ultra_belt/spr_ultra_belt.yy index 0a502588e5..8f8c332226 100644 --- a/sprites/spr_ultra_belt/spr_ultra_belt.yy +++ b/sprites/spr_ultra_belt/spr_ultra_belt.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_belt/spr_ultra_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b724e95-f10f-4ea0-888a-549bb453f7be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_belt/spr_ultra_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9b724e95-f10f-4ea0-888a-549bb453f7be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy index df4b1772fa..ed6039129e 100644 --- a/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy +++ b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy @@ -72,14 +72,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c034e8b-987f-41d4-af0c-8aa2e09e5602","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2991de12-c521-4ae7-b522-93889e9d98df","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131b933f-5eb2-468c-ab2d-c38317e7486f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be563dc1-21f3-489a-94ce-944fa3185a0f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0c034e8b-987f-41d4-af0c-8aa2e09e5602","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2991de12-c521-4ae7-b522-93889e9d98df","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"131b933f-5eb2-468c-ab2d-c38317e7486f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"be563dc1-21f3-489a-94ce-944fa3185a0f","IsCreationKey":false,"Key":2.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_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy index 456cc70939..354e5d0dc0 100644 --- a/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy +++ b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9642de9-3f72-4a7c-b92b-bbb1da41f352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b9642de9-3f72-4a7c-b92b-bbb1da41f352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ultra_tassels/spr_ultra_tassels.yy b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy index 79dca46634..66a6228a09 100644 --- a/sprites/spr_ultra_tassels/spr_ultra_tassels.yy +++ b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy @@ -64,12 +64,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b63153c-72b6-4b61-a54e-91c447e89091","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3b63153c-72b6-4b61-a54e-91c447e89091","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, From a5d4c4c187a7d91af49cb04f48b86debe72b919d Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 31 May 2025 22:21:36 +0100 Subject: [PATCH 084/155] add hopeful saving loading solution --- objects/obj_ini/Create_0.gml | 82 ++++++++++++++++++- scripts/scr_add_artifact/scr_add_artifact.gml | 2 +- .../scr_marine_struct/scr_marine_struct.gml | 23 ++++-- 3 files changed, 94 insertions(+), 13 deletions(-) diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 5c192ffeb6..1802082be6 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -30,6 +30,8 @@ home_planet = 2; artifact_struct = array_create(200); flagship = 0; +ship_weapons = []; + // Equipment- maybe the bikes should go here or something? yes they should equipment = {}; i=-1; @@ -55,7 +57,10 @@ var company=-1; repeat(11){ company+=1;v=-1;// show_message("v company: "+string(company)); repeat(205){v+=1;// show_message(string(company)+"."+string(v)); - last_ship[company,v] = {uid : "", name : ""}; + last_ship[company,v] = { + uid : "", + name : "" + }; veh_race[company,v]=0; veh_loc[company,v]=""; veh_name[company,v]=""; @@ -134,6 +139,41 @@ serialize = function(){ } var ship_structs = []; + + for (var i = 0; i < array_length(ship_data); i++){ + var _ship = ship_data[i]; + var left_broad = variable_clone(_ship.left_broad_positions); + var right_broad = variable_clone(_ship.right_broad_positions); + var center_cannons = variable_clone(_ship.forward_positions); + + var _lb = array_length(left_broad); + var _rb = array_length(right_broad); + var _cb = array_length(center_cannons); + var _longest = max(_lb, _rb, _cb);s + for (var i=0;i < _longest; i++){ + if (i<_lb){ + if (left_broad[i].weapon != false){ + left_broad[i].weapon = jsonify_struct(left_broad[i].weapon); + } + } + if (i<_rb){ + if (right_broad[i].weapon != false){ + right_broad[i].weapon = jsonify_struct(right_broad[i].weapon); + } + } + if (i<_lb){ + if (center_cannons[i].weapon != false){ + center_cannons[i].weapon = jsonify_struct(center_cannons[i].weapon); + } + } + } + var _copy_ship = variable_clone(_ship); + _copy_ship.left_broad_positions = left_broad; + _copy_ship.right_broad_positions = right_broad; + _copy_ship.forward_positions = center_cannons; + + array_push(ship_structs, jsonify_struct(_copy_ship)); + } var save_data = { @@ -150,7 +190,8 @@ serialize = function(){ squad_structs: squads, equipment: equipment, gene_slaves: gene_slaves, - ship_data, + ship_weapons, + ship_structs : ship_structs, // marines, // squads } @@ -167,7 +208,7 @@ serialize = function(){ } deserialize = function(save_data){ - var exclusions = ["complex_livery_data", "full_liveries","company_liveries", "squad_types", "marine_structs", "squad_structs", "ship_data"]; // skip automatic setting of certain vars, handle explicitly later + var exclusions = ["complex_livery_data", "full_liveries","company_liveries", "squad_types", "marine_structs", "squad_structs", "ship_weapons","ship_structs"]; // skip automatic setting of certain vars, handle explicitly later // Automatic var setting var all_names = struct_get_names(save_data); @@ -271,6 +312,41 @@ deserialize = function(save_data){ } } + if struct_exists(save_data, "ship_structs"){ + for (var i=0 ;i} unit where unit[0] is company and unit[1] is the position /// @returns {Struct.TTRPG_stats} unit function fetch_unit(unit) { From 97ecb2dfbfb80210ee6b439a868a59f325188abc Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 31 May 2025 22:36:39 +0100 Subject: [PATCH 085/155] load array issue --- objects/obj_ini/Create_0.gml | 19 ++++++++++--------- scripts/scr_ShipStruct/scr_ShipStruct.gml | 4 ++++ .../scr_marine_struct/scr_marine_struct.gml | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 1802082be6..54e7387235 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -140,8 +140,8 @@ serialize = function(){ var ship_structs = []; - for (var i = 0; i < array_length(ship_data); i++){ - var _ship = ship_data[i]; + for (var s = 0; s < array_length(ship_data); s++){ + var _ship = ship_data[s]; var left_broad = variable_clone(_ship.left_broad_positions); var right_broad = variable_clone(_ship.right_broad_positions); var center_cannons = variable_clone(_ship.forward_positions); @@ -149,7 +149,7 @@ serialize = function(){ var _lb = array_length(left_broad); var _rb = array_length(right_broad); var _cb = array_length(center_cannons); - var _longest = max(_lb, _rb, _cb);s + var _longest = max(_lb, _rb, _cb); for (var i=0;i < _longest; i++){ if (i<_lb){ if (left_broad[i].weapon != false){ @@ -161,7 +161,7 @@ serialize = function(){ right_broad[i].weapon = jsonify_struct(right_broad[i].weapon); } } - if (i<_lb){ + if (i<_cb){ if (center_cannons[i].weapon != false){ center_cannons[i].weapon = jsonify_struct(center_cannons[i].weapon); } @@ -313,8 +313,8 @@ deserialize = function(save_data){ } if struct_exists(save_data, "ship_structs"){ - for (var i=0 ;i Date: Sun, 1 Jun 2025 00:25:54 +0100 Subject: [PATCH 086/155] refactor enter keypress --- objects/obj_fleet/Alarm_7.gml | 186 ----------------- objects/obj_fleet/KeyPress_13.gml | 58 +++--- objects/obj_ini/Create_0.gml | 4 + .../scr_automated_ship_combat_functions.gml | 189 ++++++++++++++++++ .../scr_ini_ship_cleanup.gml | 2 +- 5 files changed, 220 insertions(+), 219 deletions(-) delete mode 100644 objects/obj_fleet/Alarm_7.gml diff --git a/objects/obj_fleet/Alarm_7.gml b/objects/obj_fleet/Alarm_7.gml deleted file mode 100644 index 93a37f07e3..0000000000 --- a/objects/obj_fleet/Alarm_7.gml +++ /dev/null @@ -1,186 +0,0 @@ -try { - var _player_battle_fleet, yeehaw2, tstar; - _player_battle_fleet=0;yeehaw2=0;tstar=0; - - if (player_started=1){ - _player_battle_fleet=pla_fleet; - yeehaw2=ene_fleet; - } - - if (player_started=0) and (instance_exists(obj_turn_end)){ - _player_battle_fleet=obj_turn_end.battle_pobject[obj_turn_end.current_battle]; - } - - - if (instance_number(obj_en_ship)>0){ - scr_recent("fleet_defeat",star_name,(capital_lost*6)+(frigate_lost*2)+escort_lost); - } - if (instance_number(obj_en_ship)<=0){ - with(obj_p_ship){ - var _ship = fetch_ship(ship_id); - ship_data.hp = hp; - ship_data.weapons = weapons; - if (hp<=0) then scr_recent("ship_destroyed",_ship.name,ship_id); - } - } - - if (instance_exists(_player_battle_fleet)){ - with (_player_battle_fleet){ - scr_ini_ship_cleanup(); - - if (player_fleet_ship_count() == 0){ - instance_destroy(); - } - } - } - - var op,ii,killer,killer_tg;op=0;killer=0;killer_tg=0;ii=-50; - - - if (!player_started && instance_exists(obj_turn_end)){ - with(obj_star){ - if (name!=obj_turn_end.battle_location[obj_turn_end.current_battle]){ - x-=10000; - y-=10000; - } - } - } else { - with(obj_star){ - if (id!=obj_fleet.ene_fleet){ - x-=10000;y-=10000; - } - } - } - ii=instance_nearest(room_width,room_height,obj_star); - obj_controller.temp[1070]=ii.id; - - with(obj_star){ - if (x<-5000) and (y<-5000){x+=10000;y+=10000; - } - } - - - - - - - - op=0;var ofleet;ofleet=0; - repeat(5) { - op+=1; - if (enemy[op]!=0) and (enemy[op]!=4){ofleet=0; - obj_controller.temp[1071]=enemy[op]; - - // show_message("Hiding all but the fleet owned by "+string(obj_controller.temp[1071])); - - with(obj_en_fleet){if (owner!=obj_controller.temp[1071]) or (orbiting!=obj_controller.temp[1070]){x-=10000;y-=10000;}} - - ofleet=instance_nearest(room_width/2,room_height/2,obj_en_fleet); - // show_message("Fleet: "+string(ofleet.capital_number)+"/"+string(ofleet.frigate_number)+"/"+string(ofleet.escort_number)+", lost "+string(en_capital_lost[op])+"/"+string(en_frigate_lost[op])+"/"+string(en_escort_lost[op])); - - repeat(50){ - if (!instance_exists(ofleet)){ofleet=instance_nearest(room_width/2,room_height/2,obj_en_fleet);} - if (instance_exists(ofleet)){ - if (ofleet.trade_goods="player_hold") then ofleet.trade_goods=""; - // show_message("ofleet x:"+string(ofleet.x)+", ofleet y:"+string(ofleet.y)+", ofleet owner: "+string(ofleet.owner)+" wants "+string(enemy[op])); - if (ofleet.x>-7000) and (ofleet.y>-7000) and (ofleet.owner=enemy[op]){ - if (en_capital_lost[op]+en_frigate_lost[op]+en_escort_lost[op]>=ofleet.capital_number+ofleet.frigate_number+ofleet.escort_number){ - en_capital_lost[op]-=ofleet.capital_number;en_frigate_lost[op]-=ofleet.frigate_number;en_escort_lost[op]-=ofleet.escort_number; - // show_message("Fleet baleeted"); - with(ofleet){instance_destroy();} - } - if (en_capital_lost[op]+en_frigate_lost[op]+en_escort_lost[op]>0) and (instance_exists(ofleet)){ - // show_message("Fleet: "+string(ofleet.capital_number)+"/"+string(ofleet.frigate_number)+"/"+string(ofleet.escort_number)+", lost "+string(en_capital_lost[op])+"/"+string(en_frigate_lost[op])+"/"+string(en_escort_lost[op])); - if (en_capital_lost[op]>0) and (ofleet.capital_number>0){en_capital_lost[op]-=1;ofleet.capital_number-=1;} - if (en_frigate_lost[op]>0) and (ofleet.frigate_number>0){en_frigate_lost[op]-=1;ofleet.frigate_number-=1;} - if (en_escort_lost[op]>0) and (ofleet.escort_number>0){en_escort_lost[op]-=1;ofleet.escort_number-=1;} - if (ofleet.capital_number+ofleet.frigate_number+ofleet.escort_number<=0) then with(ofleet){instance_destroy();} - } - } - } - } - - with(obj_en_fleet){if (x<-7000) and (y<-7000){x+=10000;y+=10000;}} - - // if (instance_exists(ofleet)){show_message("Fleet: "+string(ofleet.capital_number)+"/"+string(ofleet.frigate_number)+"/"+string(ofleet.escort_number));} - // if (!instance_exists(ofleet)){show_message("FlEET WAS DELETED");} - } - - // show_message("End ship removing"); - - if (enemy[op]=4) and (enemy_status[op]<0){ - obj_controller.temp[1071]=enemy[op]; - with(obj_en_fleet){if (owner!=obj_controller.temp[1071]) or (orbiting!=obj_controller.temp[1070]){x-=10000;y-=10000;}} - ofleet=instance_nearest(room_width/2,room_height/2,obj_en_fleet); - killer=1; - obj_controller.temp[1071]=enemy[op]; - killer_tg=ofleet.inquisitor; - with(ofleet){instance_destroy();} - with(obj_en_fleet){{x+=10000;y+=10000;}} - } - } - - - - - - obj_controller.cooldown=20; - - if (killer>0){ - scr_loyalty("Inquisitor Killer","+"); - if (obj_controller.loyalty>=85) then obj_controller.last_world_inspection-=44; - if (obj_controller.loyalty>=70) and (obj_controller.loyalty<85) then obj_controller.last_world_inspection-=32; - if (obj_controller.loyalty>=50) and (obj_controller.loyalty<70) then obj_controller.last_world_inspection-=20; - if (obj_controller.loyalty<50) then scr_loyalty("Inquisitor Killer","+"); - - var msg="",msg2="",i=0; - if (killer_tg > 0){ - var inquis_name = obj_controller.inquisitor[killer_tg]; - msg+=$"Inquisitor {inquis_name} has been killed!"; - msg2=$"Inquisitor {inquis_name}"; - } - if (obj_controller.inquisitor_type[killer_tg]=="Ordo Hereticus") then scr_loyalty("Inquisitor Killer","+"); - - array_delete(obj_controller.inquisitor_gender, killer_tg,1); - array_delete(obj_controller.inquisitor_type, killer_tg,1); - array_delete(obj_controller.inquisitor, killer_tg,1); - - array_push(obj_controller.inquisitor_gender, choose(0,0,0,1,1,1,1)); - array_push(obj_controller.inquisitor_type, choose("Ordo Malleus","Ordo Xenos","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus")); - array_push(obj_controller.inquisitor, global.name_generator.generate_imperial_name(obj_controller.inquisitor_gender[i])); - - instance_activate_object(obj_turn_end); - - if (instance_exists(obj_turn_end)) then scr_alert("red","inqis",string(msg),ii.x+16,ii.y-24); - if (!instance_exists(obj_turn_end)) and (obj_controller.faction_status[eFACTION.Inquisition]!="War"){ - var pip;pip=instance_create(0,0,obj_popup); - pip.title="Inquisitor Killed"; - pip.text=msg; - pip.image="inquisition"; - pip.cooldown=20; - - if (obj_controller.known[eFACTION.Inquisition]<3){ - pip.title="EXCOMMUNICATUS TRAITORUS"; - pip.text=$"The Inquisition has noticed your uncalled murder of {msg2} and declared your chapter Excommunicatus Traitorus."; - obj_controller.alarm[8]=1; - } - } - - - // if (obj_controller.known[eFACTION.Inquisition]<3) then with(obj_popup){instance_destroy();} - - - - // excommunicatus traitorus - } - - instance_activate_all(); - - if (instance_exists(obj_p_assra)){obj_p_assra.alarm[0]=1;} - alarm[4]=2; - - - -} catch(_exception) { - handle_exception(_exception); -} \ No newline at end of file diff --git a/objects/obj_fleet/KeyPress_13.gml b/objects/obj_fleet/KeyPress_13.gml index 5b3cc5e72e..6e0bac5ea7 100644 --- a/objects/obj_fleet/KeyPress_13.gml +++ b/objects/obj_fleet/KeyPress_13.gml @@ -1,39 +1,33 @@ -var __b__; -__b__ = action_if_variable(obj_controller.cooldown, 0, 2); -if !__b__ -{ -__b__ = action_if_variable(start, 7, 0); -if !__b__ -{ -{ -start = 5; -// show_message(string(ships_max)); - -/*en_capital_max=en_capital; -en_frigate_max=en_frigate; -en_escort_max=en_escort;*/ - -beg=1; - -/* */ -} -} + + +//this is key press enter because who the fuck knows whar keypress_13 is +var _cool = obj_controller.cooldown; +if (_cool){ + exit; } -__b__ = action_if_variable(obj_controller.cooldown, 0, 2); -if !__b__ -{ -__b__ = action_if_variable(start, 7, 0); -if __b__ -{ -// End battle crap here +//why 7? idk ask duke +if (start != 7){ + { + start = 5; + // show_message(string(ships_max)); -instance_activate_all(); -room_speed=30; -alarm[7]=1; + /*en_capital_max=en_capital; + en_frigate_max=en_frigate; + en_escort_max=en_escort;*/ + beg=1; -/* */ -} + /* */ + } +}else { + + // End battle crap heres + + instance_activate_all(); + room_speed=30; + wait_and_execute(1, ship_combat_cleanup,[] , self); + + /* */ } /* */ diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 54e7387235..9758dbfd75 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -316,6 +316,7 @@ deserialize = function(save_data){ for (var s=0 ;s0){ + scr_recent("fleet_defeat",star_name,(capital_lost*6)+(frigate_lost*2)+escort_lost); + } + if (instance_number(obj_en_ship)<=0){ + with(obj_p_ship){ + var _ship = fetch_ship(ship_id); + ship_data.hp = hp; + ship_data.weapons = weapons; + if (hp<=0){ + scr_recent("ship_destroyed",_ship.name,ship_id); + } + } + } + + if (instance_exists(_player_battle_fleet)){ + with (_player_battle_fleet){ + scr_ini_ship_cleanup(); + if (player_fleet_ship_count() == 0){ + instance_destroy(); + } + } + } + + var op,ii,killer,killer_tg;op=0;killer=0;killer_tg=0;ii=-50; + + + if (!player_started && instance_exists(obj_turn_end)){ + with(obj_star){ + if (name!=obj_turn_end.battle_location[obj_turn_end.current_battle]){ + x-=10000; + y-=10000; + } + } + } else { + with(obj_star){ + if (id!=obj_fleet.ene_fleet){ + x-=10000;y-=10000; + } + } + } + ii=instance_nearest(room_width,room_height,obj_star); + obj_controller.temp[1070]=ii.id; + + with(obj_star){ + if (x<-5000) and (y<-5000){x+=10000;y+=10000; + } + } + + + + + + + + op=0;var ofleet;ofleet=0; + repeat(5) { + op+=1; + if (enemy[op]!=0) and (enemy[op]!=4){ofleet=0; + obj_controller.temp[1071]=enemy[op]; + + // show_message("Hiding all but the fleet owned by "+string(obj_controller.temp[1071])); + + with(obj_en_fleet){if (owner!=obj_controller.temp[1071]) or (orbiting!=obj_controller.temp[1070]){x-=10000;y-=10000;}} + + ofleet=instance_nearest(room_width/2,room_height/2,obj_en_fleet); + // show_message("Fleet: "+string(ofleet.capital_number)+"/"+string(ofleet.frigate_number)+"/"+string(ofleet.escort_number)+", lost "+string(en_capital_lost[op])+"/"+string(en_frigate_lost[op])+"/"+string(en_escort_lost[op])); + + repeat(50){ + if (!instance_exists(ofleet)){ofleet=instance_nearest(room_width/2,room_height/2,obj_en_fleet);} + if (instance_exists(ofleet)){ + if (ofleet.trade_goods="player_hold") then ofleet.trade_goods=""; + // show_message("ofleet x:"+string(ofleet.x)+", ofleet y:"+string(ofleet.y)+", ofleet owner: "+string(ofleet.owner)+" wants "+string(enemy[op])); + if (ofleet.x>-7000) and (ofleet.y>-7000) and (ofleet.owner=enemy[op]){ + if (en_capital_lost[op]+en_frigate_lost[op]+en_escort_lost[op]>=ofleet.capital_number+ofleet.frigate_number+ofleet.escort_number){ + en_capital_lost[op]-=ofleet.capital_number;en_frigate_lost[op]-=ofleet.frigate_number;en_escort_lost[op]-=ofleet.escort_number; + // show_message("Fleet baleeted"); + with(ofleet){instance_destroy();} + } + if (en_capital_lost[op]+en_frigate_lost[op]+en_escort_lost[op]>0) and (instance_exists(ofleet)){ + // show_message("Fleet: "+string(ofleet.capital_number)+"/"+string(ofleet.frigate_number)+"/"+string(ofleet.escort_number)+", lost "+string(en_capital_lost[op])+"/"+string(en_frigate_lost[op])+"/"+string(en_escort_lost[op])); + if (en_capital_lost[op]>0) and (ofleet.capital_number>0){en_capital_lost[op]-=1;ofleet.capital_number-=1;} + if (en_frigate_lost[op]>0) and (ofleet.frigate_number>0){en_frigate_lost[op]-=1;ofleet.frigate_number-=1;} + if (en_escort_lost[op]>0) and (ofleet.escort_number>0){en_escort_lost[op]-=1;ofleet.escort_number-=1;} + if (ofleet.capital_number+ofleet.frigate_number+ofleet.escort_number<=0) then with(ofleet){instance_destroy();} + } + } + } + } + + with(obj_en_fleet){if (x<-7000) and (y<-7000){x+=10000;y+=10000;}} + + // if (instance_exists(ofleet)){show_message("Fleet: "+string(ofleet.capital_number)+"/"+string(ofleet.frigate_number)+"/"+string(ofleet.escort_number));} + // if (!instance_exists(ofleet)){show_message("FlEET WAS DELETED");} + } + + // show_message("End ship removing"); + + if (enemy[op]=4) and (enemy_status[op]<0){ + obj_controller.temp[1071]=enemy[op]; + with(obj_en_fleet){if (owner!=obj_controller.temp[1071]) or (orbiting!=obj_controller.temp[1070]){x-=10000;y-=10000;}} + ofleet=instance_nearest(room_width/2,room_height/2,obj_en_fleet); + killer=1; + obj_controller.temp[1071]=enemy[op]; + killer_tg=ofleet.inquisitor; + with(ofleet){instance_destroy();} + with(obj_en_fleet){{x+=10000;y+=10000;}} + } + } + + + + + + obj_controller.cooldown=20; + + if (killer>0){ + scr_loyalty("Inquisitor Killer","+"); + if (obj_controller.loyalty>=85) then obj_controller.last_world_inspection-=44; + if (obj_controller.loyalty>=70) and (obj_controller.loyalty<85) then obj_controller.last_world_inspection-=32; + if (obj_controller.loyalty>=50) and (obj_controller.loyalty<70) then obj_controller.last_world_inspection-=20; + if (obj_controller.loyalty<50) then scr_loyalty("Inquisitor Killer","+"); + + var msg="",msg2="",i=0; + if (killer_tg > 0){ + var inquis_name = obj_controller.inquisitor[killer_tg]; + msg+=$"Inquisitor {inquis_name} has been killed!"; + msg2=$"Inquisitor {inquis_name}"; + } + if (obj_controller.inquisitor_type[killer_tg]=="Ordo Hereticus") then scr_loyalty("Inquisitor Killer","+"); + + array_delete(obj_controller.inquisitor_gender, killer_tg,1); + array_delete(obj_controller.inquisitor_type, killer_tg,1); + array_delete(obj_controller.inquisitor, killer_tg,1); + + array_push(obj_controller.inquisitor_gender, choose(0,0,0,1,1,1,1)); + array_push(obj_controller.inquisitor_type, choose("Ordo Malleus","Ordo Xenos","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus","Ordo Hereticus")); + array_push(obj_controller.inquisitor, global.name_generator.generate_imperial_name(obj_controller.inquisitor_gender[i])); + + instance_activate_object(obj_turn_end); + + if (instance_exists(obj_turn_end)) then scr_alert("red","inqis",string(msg),ii.x+16,ii.y-24); + if (!instance_exists(obj_turn_end)) and (obj_controller.faction_status[eFACTION.Inquisition]!="War"){ + var pip;pip=instance_create(0,0,obj_popup); + pip.title="Inquisitor Killed"; + pip.text=msg; + pip.image="inquisition"; + pip.cooldown=20; + + if (obj_controller.known[eFACTION.Inquisition]<3){ + pip.title="EXCOMMUNICATUS TRAITORUS"; + pip.text=$"The Inquisition has noticed your uncalled murder of {msg2} and declared your chapter Excommunicatus Traitorus."; + obj_controller.alarm[8]=1; + } + } + + + // if (obj_controller.known[eFACTION.Inquisition]<3) then with(obj_popup){instance_destroy();} + + + + // excommunicatus traitorus + } + + instance_activate_all(); + + if (instance_exists(obj_p_assra)){obj_p_assra.alarm[0]=1;} + alarm[4]=2; + + + + } catch(_exception) { + handle_exception(_exception); + } +} diff --git a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml index 446e06252d..603e978023 100644 --- a/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml +++ b/scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml @@ -76,7 +76,7 @@ function scr_kill_ship(index){ } } } - array_delete(ship,index,1); + array_delete(ship_data,index,1); if (!in_warp){ if (_nearest_star!="none"){ From d14c86e4e02b0c9bfefe5a9e4e2e2d2975429663 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 1 Jun 2025 01:10:04 +0100 Subject: [PATCH 087/155] continued replacement of alarms --- ChapterMaster.yyp | 1 + objects/obj_fleet/Alarm_6.gml | 114 --- objects/obj_fleet/Create_0.gml | 2 +- objects/obj_fleet/obj_fleet.yy | 1 - objects/obj_fleet_spawner/Alarm_0.gml | 175 ----- objects/obj_fleet_spawner/Alarm_1.gml | 358 ---------- objects/obj_fleet_spawner/Create_0.gml | 14 +- .../scr_automated_ship_combat_functions.gml | 4 +- .../scr_enemy_fleet_spawn_combat.gml | 652 ++++++++++++++++++ .../scr_enemy_fleet_spawn_combat.yy | 13 + 10 files changed, 678 insertions(+), 656 deletions(-) delete mode 100644 objects/obj_fleet/Alarm_6.gml delete mode 100644 objects/obj_fleet_spawner/Alarm_0.gml delete mode 100644 objects/obj_fleet_spawner/Alarm_1.gml create mode 100644 scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml create mode 100644 scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index a8f0999374..42d1170753 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -800,6 +800,7 @@ {"id":{"name":"scr_enemy_ai_c","path":"scripts/scr_enemy_ai_c/scr_enemy_ai_c.yy",},}, {"id":{"name":"scr_enemy_ai_d","path":"scripts/scr_enemy_ai_d/scr_enemy_ai_d.yy",},}, {"id":{"name":"scr_enemy_ai_e","path":"scripts/scr_enemy_ai_e/scr_enemy_ai_e.yy",},}, + {"id":{"name":"scr_enemy_fleet_spawn_combat","path":"scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.yy",},}, {"id":{"name":"scr_equipment_struct","path":"scripts/scr_equipment_struct/scr_equipment_struct.yy",},}, {"id":{"name":"scr_event_dudes","path":"scripts/scr_event_dudes/scr_event_dudes.yy",},}, {"id":{"name":"scr_event_gossip","path":"scripts/scr_event_gossip/scr_event_gossip.yy",},}, diff --git a/objects/obj_fleet/Alarm_6.gml b/objects/obj_fleet/Alarm_6.gml deleted file mode 100644 index 1d2846a7d0..0000000000 --- a/objects/obj_fleet/Alarm_6.gml +++ /dev/null @@ -1,114 +0,0 @@ - -/* -enemy[2]=6;enemy_status[2]=1; -en_capital[2]=2;en_frigate[2]=3;en_escort[2]=5; -en_capital_max[2]=2;en_frigate_max[2]=3;en_escort_max[2]=5; -en_ships_max[2]=10; - -enemy[3]=2;enemy_status[3]=1; -en_capital[3]=1;en_frigate[3]=2;en_escort[3]=3; -en_capital_max[3]=1;en_frigate_max[3]=2;en_escort_max[3]=3; -en_ships_max[3]=6; -*/ - -var total_enemies, total_allies, t, tt, y1, y2, fug, spawner; -total_enemies=0; -total_allies=1; -spawner=0; -t=0;y1=0;y2=0;tt=0;fug=0; - -repeat(6){t+=1; - if (enemy[t]!=0){ - if (enemy_status[t]<0) then total_enemies+=1; - if (enemy_status[t]>0) then total_allies+=1; - - // show_message("Computer "+string(t)+":"+string(enemy[t])+", status:"+string(enemy_status[t])); - } -} - - - -if (total_enemies>0){ - t=1;y2=room_height/total_enemies/2;tt=0; - repeat(5){fug+=1; - if (enemy_status[fug]<0){ - tt+=1;y1=(t*y2); - - spawner=instance_create(room_width+200,y1,obj_fleet_spawner); - spawner.owner=enemy[fug]; - spawner.height=(y2); - spawner.number=fug; - - t+=2; - } - } -} - -if (total_allies>0){ - y1=0;fug=0; - t=1; - y2=room_height/total_allies/2; - tt=0; - repeat(5){ - fug+=1; - if (enemy_status[fug]>0){ - tt+=1; - y1=(t*y2); - - spawner=instance_create(200,y1,obj_fleet_spawner); - - if (fug=1) then spawner.owner = eFACTION.Player; - if (fug>1) then spawner.owner=enemy[fug];// Get the ENEMY after the actual enemies - - spawner.height=(y2); - spawner.number=fug; - - t+=2; - } - } -} - - -// show_message("Total Enemies: "+string(total_enemies)); -// show_message("Total Allies: "+string(total_allies)); - - -// Buffs here -// if (ambushers=1) or (enemy=8) then -attack_mode="offensive"; -// if (enemy=9) then attack_mode="defensive"; - -if (ambushers=1) and (ambushers=999) then global_attack=global_attack*1.1;// Need to finish this -if (bolter_drilling=1) then global_bolter=global_bolter*1.1; -// if (enemy_eldar=1) and (enemy=6){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} -// if (enemy_fallen=1) and (enemy=10){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} -// if (enemy_orks=1) and (enemy=7){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} -// if (enemy_tau=1) and (enemy=8){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} -// if (enemy_tyranids=1) and (enemy=10){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} -if (siege=1) and (siege=555) then global_attack=global_attack*1.2;// Need to finish this -if (slow=1){global_attack=global_attack*0.9;global_defense=global_defense*1.2;} -if (melee=1) then global_melee=global_melee*1.15; -// -if (shitty_luck=1) then global_defense=global_defense*0.9; -// if (lyman=1) and (dropping=1) then ||| handle within each object -if (ossmodula=1){global_attack=global_attack*0.95;global_defense=global_defense*0.95;} -if (betchers=1) then global_melee=global_melee*0.95; -if (catalepsean=1){global_attack=global_attack*0.95;} -// if (occulobe=1){if (time=5) or (time=6) then global_attack=global_attack*0.7;global_defense=global_defense*0.9;} - -// More prep for player - -var i=0,k=0,onceh=0; - -// instance_activate_object(obj_combat_info); - -capital_max=capital; -frigate_max=frigate; -escort_max=escort; - -obj_fleet_spawner.alarm[0]=1; - - -// alarm[1]=2; -/* */ -/* */ diff --git a/objects/obj_fleet/Create_0.gml b/objects/obj_fleet/Create_0.gml index 03afb42f74..d2c3fb48f7 100644 --- a/objects/obj_fleet/Create_0.gml +++ b/objects/obj_fleet/Create_0.gml @@ -172,7 +172,7 @@ ship_id = []; // screwing around below here -alarm[6]=2; +wait_and_execute(2, start_enemy_fleet_spawn,[] , self); // // waiting at this point- show loading screen // in this time the obj_controller passes over which units will be fighting, similar to the below code diff --git a/objects/obj_fleet/obj_fleet.yy b/objects/obj_fleet/obj_fleet.yy index 9cb8783842..6fe862b4e0 100644 --- a/objects/obj_fleet/obj_fleet.yy +++ b/objects/obj_fleet/obj_fleet.yy @@ -3,7 +3,6 @@ "%Name":"obj_fleet", "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":7,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":6,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":5,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, diff --git a/objects/obj_fleet_spawner/Alarm_0.gml b/objects/obj_fleet_spawner/Alarm_0.gml deleted file mode 100644 index 3d952708c4..0000000000 --- a/objects/obj_fleet_spawner/Alarm_0.gml +++ /dev/null @@ -1,175 +0,0 @@ - - - - -if (number=1){ - // create blocks of infantry - - - var i=0,k=0,x2=224,hei=0,man=0,sizz=0; - - - sort_ships_into_columns(obj_fleet); - - with (obj_fleet){ - player_fleet_ship_spawner(); - } - - -} - - - -if (number>0) and (owner!=1){ - - en_escort=obj_fleet.en_escort[number]; - en_frigate=obj_fleet.en_frigate[number]; - en_capital=obj_fleet.en_capital[number]; - - - if (owner = eFACTION.Imperium){ - if (en_escort>0){ - en_column[4]="Sword Class Frigate"; - en_num[4]=en_escort; - en_size[4]=1; - } - - if (en_frigate>0){en_column[3]="Avenger Class Grand Cruiser";en_num[3]=en_frigate;en_size[3]=2;} - - var i;i=0;i=en_capital; - if (i>0){ - en_column[2]="Apocalypse Class Battleship";en_num[2]=floor(random(i))+1; - if (en_num[2]<(en_capital*0.6)) then en_num[2]=round(en_capital*0.6); - i-=en_num[2];en_size[2]=3; - } - - if (i>0){en_column[1]="Nemesis Class Fleet Carrier";en_num[1]=i;i-=en_num[1];en_size[1]=3;} - } - - - - if (owner = eFACTION.Eldar){ - if (en_escort>0){en_column[4]="Aconite";en_num[4]=max(1,floor(en_escort/2));en_size[4]=1;} - if (en_escort>1){en_column[3]="Hellebore";en_num[3]=max(1,floor(en_escort/2));en_size[3]=1;} - if (en_frigate>0){en_column[2]="Shadow Class";en_num[2]=en_frigate;en_size[2]=2;} - if (en_capital>0){en_column[1]="Void Stalker";en_num[1]=en_capital;en_size[1]=3;} - } - - - - - if (owner = eFACTION.Ork){ - var i;i=0;i=en_capital; - - if (i>0){en_column[1]="Dethdeala";en_num[1]=floor(random(i))+1;i-=en_num[1];en_size[1]=3;} - - if (i>0){en_column[2]="Gorbag's Revenge";en_num[2]=floor(random(i))+1;i-=en_num[2];en_size[2]=3;}// en_num[2]+=en_num[1]+1; - - if (i>0){en_column[3]="Kroolboy";en_num[3]=i;i-=en_num[3];en_size[3]=3;}// en_num[3]+=en_num[2]+1; - - if (en_frigate>0){en_column[4]="Battlekroozer";en_num[4]=en_frigate;en_size[4]=2;}// en_num[4]+=en_num[3]+1; - - if (en_escort>0){en_column[5]="Ravager";en_num[5]=en_escort;en_size[5]=1;}// en_num[5]+=en_num[4]+1; - } - - if (owner = eFACTION.Tau){ - var i;i=0;i=en_frigate; - - if (en_capital>0){en_column[1]="Custodian";en_num[1]=en_capital;en_size[1]=3;} - - if (i>0){en_column[2]="Emissary";en_num[2]=1;i-=en_num[2];en_size[2]=2;} - - if (i>0){en_column[3]="Protector";en_num[3]=i;i-=en_num[3];en_size[3]=2;}// en_num[3]+=en_num[2]+1; - - if (en_escort>0){en_column[4]="Castellan";en_num[4]=round((en_escort/3)*2);en_size[4]=1;} - - if (en_escort>2){en_column[5]="Warden";en_num[5]=en_escort-en_num[5];en_size[5]=1;} - } - - if (owner = eFACTION.Tyranids){ - var i;i=0;i=en_escort; - - if (en_capital>0){en_column[1]="Leviathan";en_num[1]=en_capital;en_size[1]=3;} - - if (i>0){en_column[2]="Stalker";en_num[2]=floor(i/3)+1;i-=en_num[2];en_size[2]=1;} - - if (en_frigate>0){en_column[3]="Razorfiend";en_num[3]=en_frigate;en_size[3]=2;}// en_num[2]+=en_num[1]+1; - - if (i>0){en_column[4]="Prowler";en_num[4]=i;en_size[4]=1;}// en_num[5]+=en_num[4]+1; - } - - if (owner = eFACTION.Chaos){ - var i;i=0;i=en_frigate; - - if (en_capital>0){en_column[1]="Desecrator";en_num[1]=en_capital;en_size[1]=3;} - - if (i>0){en_column[2]="Avenger";en_num[2]=floor(random(i))+1;i-=en_num[2];en_size[2]=2;} - - if (i>0){en_column[3]="Carnage";en_num[3]=floor(random(i))+1;i-=en_num[3];en_size[3]=2;}// en_num[2]+=en_num[1]+1; - - if (i>0){en_column[4]="Daemon";en_num[4]=i;i-=en_num[4];en_size[4]=2;}// en_num[3]+=en_num[2]+1; - - if (en_escort>0){en_column[5]="Iconoclast";en_num[5]=en_escort;en_size[5]=1;}// en_num[5]+=en_num[4]+1; - } - - if (owner = eFACTION.Necrons){ - var i;i=0;i=en_escort; - - if (en_capital>0){en_column[1]="Reaper Class";en_num[1]=en_capital;en_size[1]=3;} - // Cairn Class Tombship are very rare - - if (i>0){en_column[2]="Shroud Class";en_num[2]=en_frigate;en_size[2]=2;} - - if (i>0){en_column[3]="Jackal Class";en_num[3]=round(i/2);i-=en_num[3];en_size[3]=1;} - if (en_escort>0){en_column[4]="Dirge Class";en_num[4]=i;en_size[4]=1;} - } - - - - - var i;i=0; - repeat(5){i+=1; - if (en_column[i]="Avenger Class Grand Cruiser"){en_width[i]=196;en_height[i]=96;} - if (en_column[i]="Apocalypse Class Battleship"){en_width[i]=272;en_height[i]=128;} - if (en_column[i]="Nemesis Class Fleet Carrier"){en_width[i]=272;en_height[i]=128;} - if (en_column[i]="Sword Class Frigate"){en_width[i]=96;en_height[i]=64;} - - if (en_column[i]="Void Stalker"){en_width[i]=260;en_height[i]=192;} - if (en_column[i]="Shadow Class"){en_width[i]=212;en_height[i]=160;} - if (en_column[i]="Hellebore"){en_width[i]=160;en_height[i]=64;} - if (en_column[i]="Aconite"){en_width[i]=128;en_height[i]=64;} - - if (en_column[i]="Deathdeala"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Gorbag's Revenge"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Kroolboy"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Slamblasta"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Battlekroozer"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Ravager"){en_width[i]=128;en_height[i]=64;} - - if (en_column[i]="Desecrator"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Avenger"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Carnage"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Daemon"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Iconoclast"){en_width[i]=128;en_height[i]=64;} - - if (en_column[i]="Custodian"){en_width[i]=128;en_height[i]=256;} - if (en_column[i]="Emissary"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Protector"){en_width[i]=64;en_height[i]=180;} - if (en_column[i]="Castellan"){en_width[i]=48;en_height[i]=96;} - if (en_column[i]="Warden"){en_width[i]=48;en_height[i]=80;} - - if (en_column[i]="Leviathan"){en_width[i]=200;en_height[i]=128;} - if (en_column[i]="Razorfiend"){en_width[i]=160;en_height[i]=128;} - if (en_column[i]="Stalker"){en_width[i]=96;en_height[i]=64;} - if (en_column[i]="Prowler"){en_width[i]=80;en_height[i]=64;} - - if (en_column[i]="Cairn Class Tombship"){en_width[i]=256;en_height[i]=224;} - if (en_column[i]="Reaper Class"){en_width[i]=286;en_height[i]=161;} - if (en_column[i]="Shroud Class"){en_width[i]=200;en_height[i]=150;} - if (en_column[i]="Jackal Class"){en_width[i]=99;en_height[i]=123;} - if (en_column[i]="Dirge Class"){en_width[i]=100;en_height[i]=91;} - } -} - -action_set_alarm(1, 1); - diff --git a/objects/obj_fleet_spawner/Alarm_1.gml b/objects/obj_fleet_spawner/Alarm_1.gml deleted file mode 100644 index 3088b92419..0000000000 --- a/objects/obj_fleet_spawner/Alarm_1.gml +++ /dev/null @@ -1,358 +0,0 @@ - - - -if (owner = eFACTION.Imperium) or (owner = eFACTION.Eldar){// This is an orderly Imperial ship formation - var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=0;man=0; - var fuck=0; - if (obj_fleet.enemy_status[number]<0){ - x2=1200; - fuck=5 - }else if (obj_fleet.enemy_status[number]>0){ - x2=50; - fuck=0; - } - - repeat(4){ - if (obj_fleet.enemy_status[number]<0) then fuck-=1; - if (obj_fleet.enemy_status[number]>0) then fuck+=1; - - yy=y-((en_height[fuck]*en_num[fuck])/2); - if (en_num[fuck]>0){ - yy+=(en_height[fuck]/2); - repeat(en_num[fuck]){ - if (en_size[fuck]<3){ - if (obj_fleet.enemy_status[number]<0){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[fuck]; - man.class=en_column[fuck]; - man.owner=owner; - man.size=en_size[fuck]; - } - if (obj_fleet.enemy_status[number]>0){ - man=instance_create(x2,yy,obj_al_cruiser); - yy+=en_height[fuck]; - man.class=en_column[fuck]; - man.owner=owner; - man.size=en_size[fuck]; - } - } - if (en_size[fuck]>=3){ - if (obj_fleet.enemy_status[number]<0){ - man=instance_create(x2,yy,obj_en_capital); - yy+=en_height[fuck]; - man.class=en_column[fuck]; - man.owner=owner; - man.size=en_size[fuck]; - } - else if (obj_fleet.enemy_status[number]>0){ - man=instance_create(x2,yy,obj_al_capital); - yy+=en_height[fuck]; - man.class=en_column[fuck]; - man.owner=owner; - man.size=en_size[fuck];} - } - } - x2+=en_width[fuck]; - } - } - - - - /* - if (en_num[4]>0){ - yy=y-((en_height[4]*en_num[4])/2); - yy+=(en_height[4]/2); - repeat(en_num[4]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[4]; - man.class=en_column[4]; - man.owner=owner; - } - x2+=en_width[4]; - } - if (en_num[3]>0){ - yy=y-((en_height[3]*en_num[3])/2); - yy+=(en_height[3]/2); - repeat(en_num[3]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[3]; - man.class=en_column[3]; - man.owner=owner; - } - x2+=en_width[3]; - } - if (en_num[2]>0){ - yy=y-((en_height[2]*en_num[2])/2); - yy+=(en_height[2]/2); - repeat(en_num[2]){ - man=instance_create(x2,yy,obj_en_capital); - yy+=en_height[2]; - man.class=en_column[2]; - man.owner=owner; - } - x2+=en_width[2]; - } - if (en_num[1]>0){ - yy=256; - repeat(en_num[1]){ - man=instance_create(x2,yy,obj_en_capital); - yy+=en_height[1]; - man.class=en_column[1]; - man.owner=owner; - yy+=(en_height[1]); - } - }*/ -} - - - - - - -/* -if (en_escort>0){en_column[4]="Aconite";en_num[4]=max(1,floor(en_escort/2));en_size[4]=1;} -if (en_escort>1){en_column[3]="Hellebore";en_num[3]=max(1,floor(en_escort/2));en_size[3]=1;} -if (en_frigate>0){en_column[2]="Shadow Class";en_num[2]=en_frigate;en_size[2]=2;} -if (en_capital>0){en_column[1]="Void Stalker";en_num[1]=en_capital;en_size[1]=3;} -*/ - - -/* -if (owner = eFACTION.Eldar){// This is an orderly Eldar ship formation - var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; - - if (en_num[4]>0){ - yy=128; - repeat(en_num[4]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[4]; - man.class=en_column[4]; - man.owner=owner; - } - } - if (en_num[3]>0){ - yy=room_height-128; - repeat(en_num[3]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy-=en_height[3]; - man.class=en_column[3]; - man.owner=owner; - } - } - x2+=max(en_width[3],en_width[4]); - - if (en_num[2]>0){ - yy=y-((en_height[2]*en_num[2])/2); - yy+=(en_height[2]/2); - repeat(en_num[2]){ - man=instance_create(x2,yy,obj_en_capital); - yy+=en_height[2]; - man.class=en_column[2]; - man.owner=owner; - } - x2+=en_width[2]; - } - if (en_num[1]>0){ - yy=256; - repeat(en_num[1]){ - man=instance_create(x2,yy,obj_en_capital); - yy+=en_height[1]; - man.class=en_column[1]; - man.owner=owner; - yy+=(en_height[1]); - } - } -}*/ - - - - - - -if (owner = eFACTION.Ork) or (owner = eFACTION.Chaos){// This is spew out random ships without regard for formations - var xx,yy,dist,targ,numb,man; - xx=0;yy=0;dist=0;targ=0;numb=0;man=0; - - var i;i=0; - - repeat(5){ - - i+=1; - - if (en_column[i]!="") then for(s = 0; s < en_num[i]; s += 1){ - if (en_size[i]>1) then man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_capital); - if (en_size[i]=1) then man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_cruiser); - man.class=en_column[i]; - man.owner=owner; - man.size=en_size[i]; - } - - - } -} - - - - - - - -if (owner = eFACTION.Tau){// This is an orderly Tau ship formation - var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; - - yy=y-((en_height[5]*en_num[5])/2); - yy+=(en_height[5]/2); - repeat(en_num[5]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[5]; - man.class="Warden";man.owner=owner; - man.size=en_size[5]; - } - x2+=en_width[5]; - - yy=y-((en_height[2]*en_num[2])/2)-((en_height[3]*en_num[3])/2); - yy+=(en_height[2]/2); - yy+=(en_height[3]/2); - repeat(en_num[2]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[2]; - man.class="Emissary";man.owner=owner; - man.size=en_size[2]; - } - repeat(en_num[3]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[3]; - man.class="Protector";man.owner=owner; - man.size=en_size[3]; - } - x2+=max(en_width[2],en_width[3]); - - yy=y-((en_height[4]*en_num[4])/2); - yy+=(en_height[4]/2); - repeat(en_num[4]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[4]; - man.class="Castellan";man.owner=owner; - man.size=en_size[4]; - } - x2+=en_width[4]; - - yy=y-((en_height[1]*en_num[1])/2); - yy+=(en_height[1]/2); - repeat(en_num[1]){ - man=instance_create(x2,yy,obj_en_capital); - yy+=en_height[1]; - man.class="Custodian";man.owner=owner; - man.size=en_size[1]; - } - -} - - - - -if (owner = eFACTION.Tyranids){// This is an orderly Tyranid ship formation - var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; - - yy=y-((en_height[4]*en_num[4])/2); - yy+=(en_height[4]/2); - repeat(en_num[4]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[4]; - man.class="Prowler";man.owner=owner; - man.size=en_size[4]; - } - x2+=en_width[4]; - - yy=y-((en_height[3]*en_num[3])/2); - yy+=(en_height[3]/2); - repeat(en_num[3]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[3]; - man.class="Razorfiend";man.owner=owner; - man.size=en_size[3]; - } - x2+=en_width[3]; - - yy=y-((en_height[2]*en_num[2])/2); - yy+=(en_height[2]/2); - repeat(en_num[2]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[2]; - man.class="Stalker";man.owner=owner; - man.size=en_size[2]; - } - x2+=en_width[2]; - - yy=y-((en_height[1]*en_num[1])/2); - yy+=(en_height[1]/2); - repeat(en_num[1]){ - man=instance_create(x2,yy,obj_en_capital); - yy+=en_height[1]; - man.class="Leviathan";man.owner=owner; - man.size=en_size[1]; - } - -} - - - - -if (owner = eFACTION.Necrons){// This is an orderly Necron ship formation - var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; - - yy=y-((en_height[4]*en_num[4])/2); - yy+=(en_height[4]/2); - repeat(en_num[4]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[4]; - man.class="Dirge Class";man.owner=owner; - man.size=en_size[4]; - } - x2+=en_width[4]; - - yy=y-((en_height[3]*en_num[3])/2); - yy+=(en_height[3]/2); - repeat(en_num[3]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[3]; - man.class="Jackal Class";man.owner=owner; - man.size=en_size[3]; - } - x2+=en_width[3]; - - yy=y-((en_height[2]*en_num[2])/2); - yy+=(en_height[2]/2); - repeat(en_num[2]){ - man=instance_create(x2,yy,obj_en_cruiser); - yy+=en_height[2]; - man.class="Shroud Class";man.owner=owner; - man.size=en_size[2]; - } - x2+=en_width[2]; - - yy=y-((en_height[1]*en_num[1])/2); - yy+=(en_height[1]/2); - repeat(en_num[1]){ - man=instance_create(x2,yy,obj_en_capital); - yy+=en_height[1]; - man.class="Reaper Class";man.owner=owner; - man.size=en_size[1]; - } -} - -with (obj_en_ship){ - assign_ship_stats(); -} -with (obj_al_ship){ - assign_ship_stats(); -} - - -/* */ -/* */ diff --git a/objects/obj_fleet_spawner/Create_0.gml b/objects/obj_fleet_spawner/Create_0.gml index c5b8d2262e..50a07677a5 100644 --- a/objects/obj_fleet_spawner/Create_0.gml +++ b/objects/obj_fleet_spawner/Create_0.gml @@ -3,12 +3,14 @@ owner=0; height=0; number=0; -alarm[0]=1; - -var i,t;i=-1;t=0; -repeat(11){i+=1; - en_column[i]="";en_width[i]=0; - en_height[i]=0;en_num[i]=0; +wait_and_execute(1, setup_fleet_spawn_characteristics,[] , self); +var i=-1,t=0; +repeat(11){ + i+=1; + en_column[i]=""; + en_width[i]=0; + en_height[i]=0; + en_num[i]=0; en_size[i]=0; } diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index d009a2208b..524a9c75b0 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -495,7 +495,9 @@ function ship_combat_cleanup(){ instance_activate_all(); - if (instance_exists(obj_p_assra)){obj_p_assra.alarm[0]=1;} + if (instance_exists(obj_p_assra)){ + obj_p_assra.alarm[0]=1; + } alarm[4]=2; diff --git a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml new file mode 100644 index 0000000000..708a3ac90b --- /dev/null +++ b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml @@ -0,0 +1,652 @@ +function start_enemy_fleet_spawn(){ + + + var total_enemies=0; + var total_allies=1; + var spawner=0; + var t=0,y1=0,y2=0,tt=0; + + repeat(6){ + t+=1; + if (enemy[t]!=0){ + if (enemy_status[t]<0){ + total_enemies+=1; + } + else if (enemy_status[t]>0){ + total_allies+=1; + } + + // show_message("Computer "+string(t)+":"+string(enemy[t])+", status:"+string(enemy_status[t])); + } + } + + + + if (total_enemies>0){ + t=1; + y2=room_height/total_enemies/2;tt=0; + for (var fug=1;fub<=5;fug++){ + if (enemy_status[fug]<0){ + tt+=1; + y1=(t*y2); + + spawner=instance_create(room_width+200,y1,obj_fleet_spawner); + spawner.owner=enemy[fug]; + spawner.height=(y2); + spawner.number=fug; + + t+=2; + } + } + } + + if (total_allies>0){ + y1=0; + t=1; + y2=room_height/total_allies/2; + tt=0; + for (var fug=1;fub<=5;fug++){ + if (enemy_status[fug]>0){ + tt+=1; + y1=(t*y2); + + spawner=instance_create(200,y1,obj_fleet_spawner); + + if (fug=1) then spawner.owner = eFACTION.Player; + if (fug>1) then spawner.owner=enemy[fug];// Get the ENEMY after the actual enemies + + spawner.height=(y2); + spawner.number=fug; + + t+=2; + } + } + } + + + // show_message("Total Enemies: "+string(total_enemies)); + // show_message("Total Allies: "+string(total_allies)); + + + // Buffs here + // if (ambushers=1) or (enemy=8) then + attack_mode="offensive"; + // if (enemy=9) then attack_mode="defensive"; + + if (ambushers=1 && ambushers=999) then global_attack=global_attack*1.1;// Need to finish this + if (bolter_drilling=1) then global_bolter=global_bolter*1.1; + // if (enemy_eldar=1) and (enemy=6){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} + // if (enemy_fallen=1) and (enemy=10){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} + // if (enemy_orks=1) and (enemy=7){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} + // if (enemy_tau=1) and (enemy=8){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} + // if (enemy_tyranids=1) and (enemy=10){global_attack=global_attack*1.1;global_defense=global_defense*1.1;} + if (siege=1) and (siege=555) then global_attack=global_attack*1.2;// Need to finish this + if (slow=1){global_attack=global_attack*0.9;global_defense=global_defense*1.2;} + if (melee=1) then global_melee=global_melee*1.15; + // + if (shitty_luck=1){ + global_defense=global_defense*0.9; + } + // if (lyman=1) and (dropping=1) then ||| handle within each object + if (ossmodula=1){ + global_attack=global_attack*0.95; + global_defense=global_defense*0.95; + } + if (betchers=1){ + global_melee=global_melee*0.95; + } + if (catalepsean=1){ + global_attack=global_attack*0.95; + } + // if (occulobe=1){if (time=5) or (time=6) then global_attack=global_attack*0.7;global_defense=global_defense*0.9;} + + // More prep for player + + var i=0,k=0,onceh=0; + + // instance_activate_object(obj_combat_info); + + capital_max=capital; + frigate_max=frigate; + escort_max=escort; + // alarm[1]=2;s + /* */ + /* */ +} + + +function setup_fleet_spawn_characteristics(){ + + + + if (number=1){ + // create blocks of infantry + + + var i=0,k=0,x2=224,hei=0,man=0,sizz=0; + + + sort_ships_into_columns(obj_fleet); + + with (obj_fleet){ + player_fleet_ship_spawner(); + } + + + } + + + + if (number>0) and (owner!=1){ + + en_escort=obj_fleet.en_escort[number]; + en_frigate=obj_fleet.en_frigate[number]; + en_capital=obj_fleet.en_capital[number]; + + + if (owner = eFACTION.Imperium){ + if (en_escort>0){ + en_column[4]="Sword Class Frigate"; + en_num[4]=en_escort; + en_size[4]=1; + } + + if (en_frigate>0){en_column[3]="Avenger Class Grand Cruiser";en_num[3]=en_frigate;en_size[3]=2;} + + var i;i=0;i=en_capital; + if (i>0){ + en_column[2]="Apocalypse Class Battleship";en_num[2]=floor(random(i))+1; + if (en_num[2]<(en_capital*0.6)) then en_num[2]=round(en_capital*0.6); + i-=en_num[2];en_size[2]=3; + } + + if (i>0){en_column[1]="Nemesis Class Fleet Carrier";en_num[1]=i;i-=en_num[1];en_size[1]=3;} + } + + + + if (owner = eFACTION.Eldar){ + if (en_escort>0){en_column[4]="Aconite";en_num[4]=max(1,floor(en_escort/2));en_size[4]=1;} + if (en_escort>1){en_column[3]="Hellebore";en_num[3]=max(1,floor(en_escort/2));en_size[3]=1;} + if (en_frigate>0){en_column[2]="Shadow Class";en_num[2]=en_frigate;en_size[2]=2;} + if (en_capital>0){en_column[1]="Void Stalker";en_num[1]=en_capital;en_size[1]=3;} + } + + + + + if (owner = eFACTION.Ork){ + var i;i=0;i=en_capital; + + if (i>0){en_column[1]="Dethdeala";en_num[1]=floor(random(i))+1;i-=en_num[1];en_size[1]=3;} + + if (i>0){en_column[2]="Gorbag's Revenge";en_num[2]=floor(random(i))+1;i-=en_num[2];en_size[2]=3;}// en_num[2]+=en_num[1]+1; + + if (i>0){en_column[3]="Kroolboy";en_num[3]=i;i-=en_num[3];en_size[3]=3;}// en_num[3]+=en_num[2]+1; + + if (en_frigate>0){en_column[4]="Battlekroozer";en_num[4]=en_frigate;en_size[4]=2;}// en_num[4]+=en_num[3]+1; + + if (en_escort>0){en_column[5]="Ravager";en_num[5]=en_escort;en_size[5]=1;}// en_num[5]+=en_num[4]+1; + } + + if (owner = eFACTION.Tau){ + var i;i=0;i=en_frigate; + + if (en_capital>0){en_column[1]="Custodian";en_num[1]=en_capital;en_size[1]=3;} + + if (i>0){en_column[2]="Emissary";en_num[2]=1;i-=en_num[2];en_size[2]=2;} + + if (i>0){en_column[3]="Protector";en_num[3]=i;i-=en_num[3];en_size[3]=2;}// en_num[3]+=en_num[2]+1; + + if (en_escort>0){en_column[4]="Castellan";en_num[4]=round((en_escort/3)*2);en_size[4]=1;} + + if (en_escort>2){en_column[5]="Warden";en_num[5]=en_escort-en_num[5];en_size[5]=1;} + } + + if (owner = eFACTION.Tyranids){ + var i;i=0;i=en_escort; + + if (en_capital>0){en_column[1]="Leviathan";en_num[1]=en_capital;en_size[1]=3;} + + if (i>0){en_column[2]="Stalker";en_num[2]=floor(i/3)+1;i-=en_num[2];en_size[2]=1;} + + if (en_frigate>0){en_column[3]="Razorfiend";en_num[3]=en_frigate;en_size[3]=2;}// en_num[2]+=en_num[1]+1; + + if (i>0){en_column[4]="Prowler";en_num[4]=i;en_size[4]=1;}// en_num[5]+=en_num[4]+1; + } + + if (owner = eFACTION.Chaos){ + var i;i=0;i=en_frigate; + + if (en_capital>0){en_column[1]="Desecrator";en_num[1]=en_capital;en_size[1]=3;} + + if (i>0){en_column[2]="Avenger";en_num[2]=floor(random(i))+1;i-=en_num[2];en_size[2]=2;} + + if (i>0){en_column[3]="Carnage";en_num[3]=floor(random(i))+1;i-=en_num[3];en_size[3]=2;}// en_num[2]+=en_num[1]+1; + + if (i>0){en_column[4]="Daemon";en_num[4]=i;i-=en_num[4];en_size[4]=2;}// en_num[3]+=en_num[2]+1; + + if (en_escort>0){en_column[5]="Iconoclast";en_num[5]=en_escort;en_size[5]=1;}// en_num[5]+=en_num[4]+1; + } + + if (owner = eFACTION.Necrons){ + var i;i=0;i=en_escort; + + if (en_capital>0){en_column[1]="Reaper Class";en_num[1]=en_capital;en_size[1]=3;} + // Cairn Class Tombship are very rare + + if (i>0){en_column[2]="Shroud Class";en_num[2]=en_frigate;en_size[2]=2;} + + if (i>0){en_column[3]="Jackal Class";en_num[3]=round(i/2);i-=en_num[3];en_size[3]=1;} + if (en_escort>0){en_column[4]="Dirge Class";en_num[4]=i;en_size[4]=1;} + } + + + + + var i;i=0; + repeat(5){i+=1; + if (en_column[i]="Avenger Class Grand Cruiser"){en_width[i]=196;en_height[i]=96;} + if (en_column[i]="Apocalypse Class Battleship"){en_width[i]=272;en_height[i]=128;} + if (en_column[i]="Nemesis Class Fleet Carrier"){en_width[i]=272;en_height[i]=128;} + if (en_column[i]="Sword Class Frigate"){en_width[i]=96;en_height[i]=64;} + + if (en_column[i]="Void Stalker"){en_width[i]=260;en_height[i]=192;} + if (en_column[i]="Shadow Class"){en_width[i]=212;en_height[i]=160;} + if (en_column[i]="Hellebore"){en_width[i]=160;en_height[i]=64;} + if (en_column[i]="Aconite"){en_width[i]=128;en_height[i]=64;} + + if (en_column[i]="Deathdeala"){en_width[i]=196;en_height[i]=128;} + if (en_column[i]="Gorbag's Revenge"){en_width[i]=196;en_height[i]=128;} + if (en_column[i]="Kroolboy"){en_width[i]=196;en_height[i]=128;} + if (en_column[i]="Slamblasta"){en_width[i]=196;en_height[i]=128;} + if (en_column[i]="Battlekroozer"){en_width[i]=160;en_height[i]=96;} + if (en_column[i]="Ravager"){en_width[i]=128;en_height[i]=64;} + + if (en_column[i]="Desecrator"){en_width[i]=196;en_height[i]=128;} + if (en_column[i]="Avenger"){en_width[i]=160;en_height[i]=96;} + if (en_column[i]="Carnage"){en_width[i]=160;en_height[i]=96;} + if (en_column[i]="Daemon"){en_width[i]=160;en_height[i]=96;} + if (en_column[i]="Iconoclast"){en_width[i]=128;en_height[i]=64;} + + if (en_column[i]="Custodian"){en_width[i]=128;en_height[i]=256;} + if (en_column[i]="Emissary"){en_width[i]=160;en_height[i]=96;} + if (en_column[i]="Protector"){en_width[i]=64;en_height[i]=180;} + if (en_column[i]="Castellan"){en_width[i]=48;en_height[i]=96;} + if (en_column[i]="Warden"){en_width[i]=48;en_height[i]=80;} + + if (en_column[i]="Leviathan"){en_width[i]=200;en_height[i]=128;} + if (en_column[i]="Razorfiend"){en_width[i]=160;en_height[i]=128;} + if (en_column[i]="Stalker"){en_width[i]=96;en_height[i]=64;} + if (en_column[i]="Prowler"){en_width[i]=80;en_height[i]=64;} + + if (en_column[i]="Cairn Class Tombship"){en_width[i]=256;en_height[i]=224;} + if (en_column[i]="Reaper Class"){en_width[i]=286;en_height[i]=161;} + if (en_column[i]="Shroud Class"){en_width[i]=200;en_height[i]=150;} + if (en_column[i]="Jackal Class"){en_width[i]=99;en_height[i]=123;} + if (en_column[i]="Dirge Class"){en_width[i]=100;en_height[i]=91;} + } + } + + wait_and_execute(3, position_ships_and_assign_stats,[] , self); +} + + +function position_ships_and_assign_stats(){ + + + if (owner = eFACTION.Imperium) or (owner = eFACTION.Eldar){// This is an orderly Imperial ship formation + var xx,yy,i, temp1, x2, man; + xx=0;yy=0;i=0;temp1=0;x2=0;man=0; + var fuck=0; + if (obj_fleet.enemy_status[number]<0){ + x2=room_width-800; + fuck=5 + }else if (obj_fleet.enemy_status[number]>0){ + x2=50; + fuck=0; + } + + repeat(4){ + if (obj_fleet.enemy_status[number]<0) then fuck-=1; + if (obj_fleet.enemy_status[number]>0) then fuck+=1; + + yy=y-((en_height[fuck]*en_num[fuck])/2); + if (en_num[fuck]>0){ + yy+=(en_height[fuck]/2); + repeat(en_num[fuck]){ + if (en_size[fuck]<3){ + if (obj_fleet.enemy_status[number]<0){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[fuck]; + man.class=en_column[fuck]; + man.owner=owner; + man.size=en_size[fuck]; + } + if (obj_fleet.enemy_status[number]>0){ + man=instance_create(x2,yy,obj_al_cruiser); + yy+=en_height[fuck]; + man.class=en_column[fuck]; + man.owner=owner; + man.size=en_size[fuck]; + } + } + if (en_size[fuck]>=3){ + if (obj_fleet.enemy_status[number]<0){ + man=instance_create(x2,yy,obj_en_capital); + yy+=en_height[fuck]; + man.class=en_column[fuck]; + man.owner=owner; + man.size=en_size[fuck]; + } + else if (obj_fleet.enemy_status[number]>0){ + man=instance_create(x2,yy,obj_al_capital); + yy+=en_height[fuck]; + man.class=en_column[fuck]; + man.owner=owner; + man.size=en_size[fuck];} + } + } + x2+=en_width[fuck]; + } + } + + + + /* + if (en_num[4]>0){ + yy=y-((en_height[4]*en_num[4])/2); + yy+=(en_height[4]/2); + repeat(en_num[4]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[4]; + man.class=en_column[4]; + man.owner=owner; + } + x2+=en_width[4]; + } + if (en_num[3]>0){ + yy=y-((en_height[3]*en_num[3])/2); + yy+=(en_height[3]/2); + repeat(en_num[3]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[3]; + man.class=en_column[3]; + man.owner=owner; + } + x2+=en_width[3]; + } + if (en_num[2]>0){ + yy=y-((en_height[2]*en_num[2])/2); + yy+=(en_height[2]/2); + repeat(en_num[2]){ + man=instance_create(x2,yy,obj_en_capital); + yy+=en_height[2]; + man.class=en_column[2]; + man.owner=owner; + } + x2+=en_width[2]; + } + if (en_num[1]>0){ + yy=256; + repeat(en_num[1]){ + man=instance_create(x2,yy,obj_en_capital); + yy+=en_height[1]; + man.class=en_column[1]; + man.owner=owner; + yy+=(en_height[1]); + } + }*/ + } + + + + + + + /* + if (en_escort>0){en_column[4]="Aconite";en_num[4]=max(1,floor(en_escort/2));en_size[4]=1;} + if (en_escort>1){en_column[3]="Hellebore";en_num[3]=max(1,floor(en_escort/2));en_size[3]=1;} + if (en_frigate>0){en_column[2]="Shadow Class";en_num[2]=en_frigate;en_size[2]=2;} + if (en_capital>0){en_column[1]="Void Stalker";en_num[1]=en_capital;en_size[1]=3;} + */ + + + /* + if (owner = eFACTION.Eldar){// This is an orderly Eldar ship formation + var xx,yy,i, temp1, x2, man; + xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + + if (en_num[4]>0){ + yy=128; + repeat(en_num[4]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[4]; + man.class=en_column[4]; + man.owner=owner; + } + } + if (en_num[3]>0){ + yy=room_height-128; + repeat(en_num[3]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy-=en_height[3]; + man.class=en_column[3]; + man.owner=owner; + } + } + x2+=max(en_width[3],en_width[4]); + + if (en_num[2]>0){ + yy=y-((en_height[2]*en_num[2])/2); + yy+=(en_height[2]/2); + repeat(en_num[2]){ + man=instance_create(x2,yy,obj_en_capital); + yy+=en_height[2]; + man.class=en_column[2]; + man.owner=owner; + } + x2+=en_width[2]; + } + if (en_num[1]>0){ + yy=256; + repeat(en_num[1]){ + man=instance_create(x2,yy,obj_en_capital); + yy+=en_height[1]; + man.class=en_column[1]; + man.owner=owner; + yy+=(en_height[1]); + } + } + }*/ + + + + + + + if (owner = eFACTION.Ork) or (owner = eFACTION.Chaos){// This is spew out random ships without regard for formations + var xx,yy,dist,targ,numb,man; + xx=0;yy=0;dist=0;targ=0;numb=0;man=0; + + var i;i=0; + + repeat(5){ + + i+=1; + + if (en_column[i]!="") then for(s = 0; s < en_num[i]; s += 1){ + if (en_size[i]>1) then man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_capital); + if (en_size[i]=1) then man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_cruiser); + man.class=en_column[i]; + man.owner=owner; + man.size=en_size[i]; + } + + + } + } + + + + + + + + if (owner = eFACTION.Tau){// This is an orderly Tau ship formation + var xx,yy,i, temp1, x2, man; + xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + + yy=y-((en_height[5]*en_num[5])/2); + yy+=(en_height[5]/2); + repeat(en_num[5]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[5]; + man.class="Warden";man.owner=owner; + man.size=en_size[5]; + } + x2+=en_width[5]; + + yy=y-((en_height[2]*en_num[2])/2)-((en_height[3]*en_num[3])/2); + yy+=(en_height[2]/2); + yy+=(en_height[3]/2); + repeat(en_num[2]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[2]; + man.class="Emissary";man.owner=owner; + man.size=en_size[2]; + } + repeat(en_num[3]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[3]; + man.class="Protector";man.owner=owner; + man.size=en_size[3]; + } + x2+=max(en_width[2],en_width[3]); + + yy=y-((en_height[4]*en_num[4])/2); + yy+=(en_height[4]/2); + repeat(en_num[4]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[4]; + man.class="Castellan";man.owner=owner; + man.size=en_size[4]; + } + x2+=en_width[4]; + + yy=y-((en_height[1]*en_num[1])/2); + yy+=(en_height[1]/2); + repeat(en_num[1]){ + man=instance_create(x2,yy,obj_en_capital); + yy+=en_height[1]; + man.class="Custodian";man.owner=owner; + man.size=en_size[1]; + } + + } + + + + + if (owner = eFACTION.Tyranids){// This is an orderly Tyranid ship formation + var xx,yy,i, temp1, x2, man; + xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + + yy=y-((en_height[4]*en_num[4])/2); + yy+=(en_height[4]/2); + repeat(en_num[4]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[4]; + man.class="Prowler";man.owner=owner; + man.size=en_size[4]; + } + x2+=en_width[4]; + + yy=y-((en_height[3]*en_num[3])/2); + yy+=(en_height[3]/2); + repeat(en_num[3]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[3]; + man.class="Razorfiend";man.owner=owner; + man.size=en_size[3]; + } + x2+=en_width[3]; + + yy=y-((en_height[2]*en_num[2])/2); + yy+=(en_height[2]/2); + repeat(en_num[2]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[2]; + man.class="Stalker";man.owner=owner; + man.size=en_size[2]; + } + x2+=en_width[2]; + + yy=y-((en_height[1]*en_num[1])/2); + yy+=(en_height[1]/2); + repeat(en_num[1]){ + man=instance_create(x2,yy,obj_en_capital); + yy+=en_height[1]; + man.class="Leviathan";man.owner=owner; + man.size=en_size[1]; + } + + } + + + + + if (owner = eFACTION.Necrons){// This is an orderly Necron ship formation + var xx,yy,i, temp1, x2, man; + xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + + yy=y-((en_height[4]*en_num[4])/2); + yy+=(en_height[4]/2); + repeat(en_num[4]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[4]; + man.class="Dirge Class";man.owner=owner; + man.size=en_size[4]; + } + x2+=en_width[4]; + + yy=y-((en_height[3]*en_num[3])/2); + yy+=(en_height[3]/2); + repeat(en_num[3]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[3]; + man.class="Jackal Class";man.owner=owner; + man.size=en_size[3]; + } + x2+=en_width[3]; + + yy=y-((en_height[2]*en_num[2])/2); + yy+=(en_height[2]/2); + repeat(en_num[2]){ + man=instance_create(x2,yy,obj_en_cruiser); + yy+=en_height[2]; + man.class="Shroud Class";man.owner=owner; + man.size=en_size[2]; + } + x2+=en_width[2]; + + yy=y-((en_height[1]*en_num[1])/2); + yy+=(en_height[1]/2); + repeat(en_num[1]){ + man=instance_create(x2,yy,obj_en_capital); + yy+=en_height[1]; + man.class="Reaper Class";man.owner=owner; + man.size=en_size[1]; + } + } + + with (obj_en_ship){ + assign_ship_stats(); + } + with (obj_al_ship){ + assign_ship_stats(); + } + + +} + diff --git a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.yy b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.yy new file mode 100644 index 0000000000..a7e0bba3cc --- /dev/null +++ b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_enemy_fleet_spawn_combat", + "isCompatibility":false, + "isDnD":false, + "name":"scr_enemy_fleet_spawn_combat", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file From 5370dfc34970778006391a21335aff14fe893939 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 2 Jun 2025 14:36:35 +0100 Subject: [PATCH 088/155] fleet spawn bugs --- objects/obj_fleet/Alarm_1.gml | 3 +- .../scr_enemy_fleet_spawn_combat.gml | 426 +++++++++++++----- sprites/spr_ship_apoc/spr_ship_apoc.yy | 11 +- sprites/spr_ship_nem/spr_ship_nem.yy | 11 +- 4 files changed, 336 insertions(+), 115 deletions(-) diff --git a/objects/obj_fleet/Alarm_1.gml b/objects/obj_fleet/Alarm_1.gml index 267179352d..6edcbfbcd7 100644 --- a/objects/obj_fleet/Alarm_1.gml +++ b/objects/obj_fleet/Alarm_1.gml @@ -22,7 +22,8 @@ if (enemy=2){ var i=0; i=en_capital; if (i>0){ - en_column[2]="Apocalypse Class Battleship";en_num[2]=floor(random(i))+1; + en_column[2]="Apocalypse Class Battleship"; + en_num[2]=floor(random(i))+1; if (en_num[2]<(en_capital*0.6)) then en_num[2]=round(en_capital*0.6); i-=en_num[2];en_size[2]=3; } diff --git a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml index 708a3ac90b..e4bba6fb7a 100644 --- a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml +++ b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml @@ -25,7 +25,7 @@ function start_enemy_fleet_spawn(){ if (total_enemies>0){ t=1; y2=room_height/total_enemies/2;tt=0; - for (var fug=1;fub<=5;fug++){ + for (var fug=1;fug<=5;fug++){ if (enemy_status[fug]<0){ tt+=1; y1=(t*y2); @@ -45,7 +45,7 @@ function start_enemy_fleet_spawn(){ t=1; y2=room_height/total_allies/2; tt=0; - for (var fug=1;fub<=5;fug++){ + for (var fug=1;fug<=5;fug++){ if (enemy_status[fug]>0){ tt+=1; y1=(t*y2); @@ -135,8 +135,6 @@ function setup_fleet_spawn_characteristics(){ } - - if (number>0) and (owner!=1){ en_escort=obj_fleet.en_escort[number]; @@ -151,140 +149,321 @@ function setup_fleet_spawn_characteristics(){ en_size[4]=1; } - if (en_frigate>0){en_column[3]="Avenger Class Grand Cruiser";en_num[3]=en_frigate;en_size[3]=2;} + if (en_frigate>0){ + en_column[3]="Avenger Class Grand Cruiser"; + en_num[3]=en_frigate; + en_size[3]=2; + } - var i;i=0;i=en_capital; + var i=0; + i=en_capital; if (i>0){ - en_column[2]="Apocalypse Class Battleship";en_num[2]=floor(random(i))+1; - if (en_num[2]<(en_capital*0.6)) then en_num[2]=round(en_capital*0.6); - i-=en_num[2];en_size[2]=3; + en_column[2]="Apocalypse Class Battleship"; + en_num[2]=floor(random(i))+1; + if (en_num[2]<(en_capital*0.6)){ + en_num[2]=round(en_capital*0.6); + } + i-=en_num[2]; + en_size[2]=3; } - if (i>0){en_column[1]="Nemesis Class Fleet Carrier";en_num[1]=i;i-=en_num[1];en_size[1]=3;} + if (i>0){ + en_column[1]="Nemesis Class Fleet Carrier"; + en_num[1]=i; + i-=en_num[1]; + en_size[1]=3;} } if (owner = eFACTION.Eldar){ - if (en_escort>0){en_column[4]="Aconite";en_num[4]=max(1,floor(en_escort/2));en_size[4]=1;} - if (en_escort>1){en_column[3]="Hellebore";en_num[3]=max(1,floor(en_escort/2));en_size[3]=1;} - if (en_frigate>0){en_column[2]="Shadow Class";en_num[2]=en_frigate;en_size[2]=2;} - if (en_capital>0){en_column[1]="Void Stalker";en_num[1]=en_capital;en_size[1]=3;} + if (en_escort>0){ + en_column[4]="Aconite"; + en_num[4]=max(1,floor(en_escort/2)); + en_size[4]=1;} + if (en_escort>1){ + en_column[3]="Hellebore"; + en_num[3]=max(1,floor(en_escort/2)); + en_size[3]=1;} + if (en_frigate>0){ + en_column[2]="Shadow Class"; + en_num[2]=en_frigate; + en_size[2]=2;} + if (en_capital>0){ + en_column[1]="Void Stalker"; + en_num[1]=en_capital; + en_size[1]=3;} } if (owner = eFACTION.Ork){ - var i;i=0;i=en_capital; + var i; + i=0; + i=en_capital; - if (i>0){en_column[1]="Dethdeala";en_num[1]=floor(random(i))+1;i-=en_num[1];en_size[1]=3;} + if (i>0){ + en_column[1]="Dethdeala"; + en_num[1]=floor(random(i))+1; + i-=en_num[1]; + en_size[1]=3;} - if (i>0){en_column[2]="Gorbag's Revenge";en_num[2]=floor(random(i))+1;i-=en_num[2];en_size[2]=3;}// en_num[2]+=en_num[1]+1; + if (i>0){ + en_column[2]="Gorbag's Revenge"; + en_num[2]=floor(random(i))+1; + i-=en_num[2]; + en_size[2]=3;}// en_num[2]+=en_num[1]+1; - if (i>0){en_column[3]="Kroolboy";en_num[3]=i;i-=en_num[3];en_size[3]=3;}// en_num[3]+=en_num[2]+1; + if (i>0){ + en_column[3]="Kroolboy"; + en_num[3]=i; + i-=en_num[3]; + en_size[3]=3;}// en_num[3]+=en_num[2]+1; - if (en_frigate>0){en_column[4]="Battlekroozer";en_num[4]=en_frigate;en_size[4]=2;}// en_num[4]+=en_num[3]+1; + if (en_frigate>0){ + en_column[4]="Battlekroozer"; + en_num[4]=en_frigate; + en_size[4]=2;}// en_num[4]+=en_num[3]+1; - if (en_escort>0){en_column[5]="Ravager";en_num[5]=en_escort;en_size[5]=1;}// en_num[5]+=en_num[4]+1; + if (en_escort>0){ + en_column[5]="Ravager"; + en_num[5]=en_escort; + en_size[5]=1;}// en_num[5]+=en_num[4]+1; } if (owner = eFACTION.Tau){ - var i;i=0;i=en_frigate; + var i; + i=0; + i=en_frigate; - if (en_capital>0){en_column[1]="Custodian";en_num[1]=en_capital;en_size[1]=3;} + if (en_capital>0){ + en_column[1]="Custodian"; + en_num[1]=en_capital; + en_size[1]=3;} - if (i>0){en_column[2]="Emissary";en_num[2]=1;i-=en_num[2];en_size[2]=2;} + if (i>0){ + en_column[2]="Emissary"; + en_num[2]=1; + i-=en_num[2]; + en_size[2]=2;} - if (i>0){en_column[3]="Protector";en_num[3]=i;i-=en_num[3];en_size[3]=2;}// en_num[3]+=en_num[2]+1; + if (i>0){ + en_column[3]="Protector"; + en_num[3]=i; + i-=en_num[3]; + en_size[3]=2;}// en_num[3]+=en_num[2]+1; - if (en_escort>0){en_column[4]="Castellan";en_num[4]=round((en_escort/3)*2);en_size[4]=1;} + if (en_escort>0){ + en_column[4]="Castellan"; + en_num[4]=round((en_escort/3)*2); + en_size[4]=1;} - if (en_escort>2){en_column[5]="Warden";en_num[5]=en_escort-en_num[5];en_size[5]=1;} + if (en_escort>2){ + en_column[5]="Warden"; + en_num[5]=en_escort-en_num[5]; + en_size[5]=1;} } if (owner = eFACTION.Tyranids){ - var i;i=0;i=en_escort; + var i; + i=0; + i=en_escort; - if (en_capital>0){en_column[1]="Leviathan";en_num[1]=en_capital;en_size[1]=3;} + if (en_capital>0){ + en_column[1]="Leviathan"; + en_num[1]=en_capital; + en_size[1]=3;} - if (i>0){en_column[2]="Stalker";en_num[2]=floor(i/3)+1;i-=en_num[2];en_size[2]=1;} + if (i>0){ + en_column[2]="Stalker"; + en_num[2]=floor(i/3)+1; + i-=en_num[2]; + en_size[2]=1;} - if (en_frigate>0){en_column[3]="Razorfiend";en_num[3]=en_frigate;en_size[3]=2;}// en_num[2]+=en_num[1]+1; + if (en_frigate>0){ + en_column[3]="Razorfiend"; + en_num[3]=en_frigate; + en_size[3]=2;}// en_num[2]+=en_num[1]+1; - if (i>0){en_column[4]="Prowler";en_num[4]=i;en_size[4]=1;}// en_num[5]+=en_num[4]+1; + if (i>0){ + en_column[4]="Prowler"; + en_num[4]=i; + en_size[4]=1;}// en_num[5]+=en_num[4]+1; } if (owner = eFACTION.Chaos){ - var i;i=0;i=en_frigate; + var i; + i=0; + i=en_frigate; - if (en_capital>0){en_column[1]="Desecrator";en_num[1]=en_capital;en_size[1]=3;} + if (en_capital>0){ + en_column[1]="Desecrator"; + en_num[1]=en_capital; + en_size[1]=3;} - if (i>0){en_column[2]="Avenger";en_num[2]=floor(random(i))+1;i-=en_num[2];en_size[2]=2;} + if (i>0){ + en_column[2]="Avenger"; + en_num[2]=floor(random(i))+1; + i-=en_num[2]; + en_size[2]=2;} - if (i>0){en_column[3]="Carnage";en_num[3]=floor(random(i))+1;i-=en_num[3];en_size[3]=2;}// en_num[2]+=en_num[1]+1; + if (i>0){ + en_column[3]="Carnage"; + en_num[3]=floor(random(i))+1; + i-=en_num[3]; + en_size[3]=2;}// en_num[2]+=en_num[1]+1; - if (i>0){en_column[4]="Daemon";en_num[4]=i;i-=en_num[4];en_size[4]=2;}// en_num[3]+=en_num[2]+1; + if (i>0){ + en_column[4]="Daemon"; + en_num[4]=i; + i-=en_num[4]; + en_size[4]=2;}// en_num[3]+=en_num[2]+1; - if (en_escort>0){en_column[5]="Iconoclast";en_num[5]=en_escort;en_size[5]=1;}// en_num[5]+=en_num[4]+1; + if (en_escort>0){ + en_column[5]="Iconoclast"; + en_num[5]=en_escort; + en_size[5]=1;}// en_num[5]+=en_num[4]+1; } if (owner = eFACTION.Necrons){ - var i;i=0;i=en_escort; + var i; + i=0; + i=en_escort; - if (en_capital>0){en_column[1]="Reaper Class";en_num[1]=en_capital;en_size[1]=3;} + if (en_capital>0){ + en_column[1]="Reaper Class"; + en_num[1]=en_capital; + en_size[1]=3;} // Cairn Class Tombship are very rare - if (i>0){en_column[2]="Shroud Class";en_num[2]=en_frigate;en_size[2]=2;} + if (i>0){ + en_column[2]="Shroud Class"; + en_num[2]=en_frigate; + en_size[2]=2;} - if (i>0){en_column[3]="Jackal Class";en_num[3]=round(i/2);i-=en_num[3];en_size[3]=1;} - if (en_escort>0){en_column[4]="Dirge Class";en_num[4]=i;en_size[4]=1;} + if (i>0){ + en_column[3]="Jackal Class"; + en_num[3]=round(i/2); + i-=en_num[3]; + en_size[3]=1;} + if (en_escort>0){ + en_column[4]="Dirge Class"; + en_num[4]=i; + en_size[4]=1;} } - var i;i=0; + var i; + i=0; repeat(5){i+=1; - if (en_column[i]="Avenger Class Grand Cruiser"){en_width[i]=196;en_height[i]=96;} - if (en_column[i]="Apocalypse Class Battleship"){en_width[i]=272;en_height[i]=128;} - if (en_column[i]="Nemesis Class Fleet Carrier"){en_width[i]=272;en_height[i]=128;} - if (en_column[i]="Sword Class Frigate"){en_width[i]=96;en_height[i]=64;} + if (en_column[i]="Avenger Class Grand Cruiser"){ + en_width[i]=196; + en_height[i]=96;} + if (en_column[i]="Apocalypse Class Battleship"){ + en_width[i]=272; + en_height[i]=128;} + if (en_column[i]="Nemesis Class Fleet Carrier"){ + en_width[i]=272; + en_height[i]=128;} + if (en_column[i]="Sword Class Frigate"){ + en_width[i]=96; + en_height[i]=64;} - if (en_column[i]="Void Stalker"){en_width[i]=260;en_height[i]=192;} - if (en_column[i]="Shadow Class"){en_width[i]=212;en_height[i]=160;} - if (en_column[i]="Hellebore"){en_width[i]=160;en_height[i]=64;} - if (en_column[i]="Aconite"){en_width[i]=128;en_height[i]=64;} + if (en_column[i]="Void Stalker"){ + en_width[i]=260; + en_height[i]=192;} + if (en_column[i]="Shadow Class"){ + en_width[i]=212; + en_height[i]=160;} + if (en_column[i]="Hellebore"){ + en_width[i]=160; + en_height[i]=64;} + if (en_column[i]="Aconite"){ + en_width[i]=128; + en_height[i]=64;} - if (en_column[i]="Deathdeala"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Gorbag's Revenge"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Kroolboy"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Slamblasta"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Battlekroozer"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Ravager"){en_width[i]=128;en_height[i]=64;} + if (en_column[i]="Deathdeala"){ + en_width[i]=196; + en_height[i]=128;} + if (en_column[i]="Gorbag's Revenge"){ + en_width[i]=196; + en_height[i]=128;} + if (en_column[i]="Kroolboy"){ + en_width[i]=196; + en_height[i]=128;} + if (en_column[i]="Slamblasta"){ + en_width[i]=196; + en_height[i]=128;} + if (en_column[i]="Battlekroozer"){ + en_width[i]=160; + en_height[i]=96;} + if (en_column[i]="Ravager"){ + en_width[i]=128; + en_height[i]=64;} - if (en_column[i]="Desecrator"){en_width[i]=196;en_height[i]=128;} - if (en_column[i]="Avenger"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Carnage"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Daemon"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Iconoclast"){en_width[i]=128;en_height[i]=64;} + if (en_column[i]="Desecrator"){ + en_width[i]=196; + en_height[i]=128;} + if (en_column[i]="Avenger"){ + en_width[i]=160; + en_height[i]=96;} + if (en_column[i]="Carnage"){ + en_width[i]=160; + en_height[i]=96;} + if (en_column[i]="Daemon"){ + en_width[i]=160; + en_height[i]=96;} + if (en_column[i]="Iconoclast"){ + en_width[i]=128; + en_height[i]=64;} - if (en_column[i]="Custodian"){en_width[i]=128;en_height[i]=256;} - if (en_column[i]="Emissary"){en_width[i]=160;en_height[i]=96;} - if (en_column[i]="Protector"){en_width[i]=64;en_height[i]=180;} - if (en_column[i]="Castellan"){en_width[i]=48;en_height[i]=96;} - if (en_column[i]="Warden"){en_width[i]=48;en_height[i]=80;} + if (en_column[i]="Custodian"){ + en_width[i]=128; + en_height[i]=256;} + if (en_column[i]="Emissary"){ + en_width[i]=160; + en_height[i]=96;} + if (en_column[i]="Protector"){ + en_width[i]=64; + en_height[i]=180;} + if (en_column[i]="Castellan"){ + en_width[i]=48; + en_height[i]=96;} + if (en_column[i]="Warden"){ + en_width[i]=48; + en_height[i]=80;} - if (en_column[i]="Leviathan"){en_width[i]=200;en_height[i]=128;} - if (en_column[i]="Razorfiend"){en_width[i]=160;en_height[i]=128;} - if (en_column[i]="Stalker"){en_width[i]=96;en_height[i]=64;} - if (en_column[i]="Prowler"){en_width[i]=80;en_height[i]=64;} + if (en_column[i]="Leviathan"){ + en_width[i]=200; + en_height[i]=128;} + if (en_column[i]="Razorfiend"){ + en_width[i]=160; + en_height[i]=128;} + if (en_column[i]="Stalker"){ + en_width[i]=96; + en_height[i]=64;} + if (en_column[i]="Prowler"){ + en_width[i]=80; + en_height[i]=64;} - if (en_column[i]="Cairn Class Tombship"){en_width[i]=256;en_height[i]=224;} - if (en_column[i]="Reaper Class"){en_width[i]=286;en_height[i]=161;} - if (en_column[i]="Shroud Class"){en_width[i]=200;en_height[i]=150;} - if (en_column[i]="Jackal Class"){en_width[i]=99;en_height[i]=123;} - if (en_column[i]="Dirge Class"){en_width[i]=100;en_height[i]=91;} + if (en_column[i]="Cairn Class Tombship"){ + en_width[i]=256; + en_height[i]=224;} + if (en_column[i]="Reaper Class"){ + en_width[i]=286; + en_height[i]=161;} + if (en_column[i]="Shroud Class"){ + en_width[i]=200; + en_height[i]=150;} + if (en_column[i]="Jackal Class"){ + en_width[i]=99; + en_height[i]=123;} + if (en_column[i]="Dirge Class"){ + en_width[i]=100; + en_height[i]=91;} } } @@ -297,7 +476,9 @@ function position_ships_and_assign_stats(){ if (owner = eFACTION.Imperium) or (owner = eFACTION.Eldar){// This is an orderly Imperial ship formation var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=0;man=0; + xx=0;yy=0; + i=0;temp1=0;x2=0; + man=0; var fuck=0; if (obj_fleet.enemy_status[number]<0){ x2=room_width-800; @@ -405,17 +586,31 @@ function position_ships_and_assign_stats(){ /* - if (en_escort>0){en_column[4]="Aconite";en_num[4]=max(1,floor(en_escort/2));en_size[4]=1;} - if (en_escort>1){en_column[3]="Hellebore";en_num[3]=max(1,floor(en_escort/2));en_size[3]=1;} - if (en_frigate>0){en_column[2]="Shadow Class";en_num[2]=en_frigate;en_size[2]=2;} - if (en_capital>0){en_column[1]="Void Stalker";en_num[1]=en_capital;en_size[1]=3;} + if (en_escort>0){ + en_column[4]="Aconite"; + en_num[4]=max(1,floor(en_escort/2)); + en_size[4]=1;} + if (en_escort>1){ + en_column[3]="Hellebore"; + en_num[3]=max(1,floor(en_escort/2)); + en_size[3]=1;} + if (en_frigate>0){ + en_column[2]="Shadow Class"; + en_num[2]=en_frigate; + en_size[2]=2;} + if (en_capital>0){ + en_column[1]="Void Stalker"; + en_num[1]=en_capital; + en_size[1]=3;} */ /* if (owner = eFACTION.Eldar){// This is an orderly Eldar ship formation var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + xx=0;yy=0; + i=0;temp1=0;x2=1200; + man=0; if (en_num[4]>0){ yy=128; @@ -466,18 +661,22 @@ function position_ships_and_assign_stats(){ if (owner = eFACTION.Ork) or (owner = eFACTION.Chaos){// This is spew out random ships without regard for formations - var xx,yy,dist,targ,numb,man; - xx=0;yy=0;dist=0;targ=0;numb=0;man=0; - - var i;i=0; + var xx = 0,yy = 0,dist = 0,targ = 0,numb = 0,man = 0; + + var i; + i=0; repeat(5){ i+=1; if (en_column[i]!="") then for(s = 0; s < en_num[i]; s += 1){ - if (en_size[i]>1) then man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_capital); - if (en_size[i]=1) then man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_cruiser); + if (en_size[i]>1){ + man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_capital); + } + else if (en_size[i]=1){ + man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_cruiser); + } man.class=en_column[i]; man.owner=owner; man.size=en_size[i]; @@ -495,14 +694,17 @@ function position_ships_and_assign_stats(){ if (owner = eFACTION.Tau){// This is an orderly Tau ship formation var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + xx=0;yy=0; + i=0;temp1=0;x2=1200; + man=0; yy=y-((en_height[5]*en_num[5])/2); yy+=(en_height[5]/2); repeat(en_num[5]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[5]; - man.class="Warden";man.owner=owner; + man.class="Warden"; + man.owner=owner; man.size=en_size[5]; } x2+=en_width[5]; @@ -513,13 +715,15 @@ function position_ships_and_assign_stats(){ repeat(en_num[2]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[2]; - man.class="Emissary";man.owner=owner; + man.class="Emissary"; + man.owner=owner; man.size=en_size[2]; } repeat(en_num[3]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[3]; - man.class="Protector";man.owner=owner; + man.class="Protector"; + man.owner=owner; man.size=en_size[3]; } x2+=max(en_width[2],en_width[3]); @@ -529,7 +733,8 @@ function position_ships_and_assign_stats(){ repeat(en_num[4]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[4]; - man.class="Castellan";man.owner=owner; + man.class="Castellan"; + man.owner=owner; man.size=en_size[4]; } x2+=en_width[4]; @@ -539,7 +744,8 @@ function position_ships_and_assign_stats(){ repeat(en_num[1]){ man=instance_create(x2,yy,obj_en_capital); yy+=en_height[1]; - man.class="Custodian";man.owner=owner; + man.class="Custodian"; + man.owner=owner; man.size=en_size[1]; } @@ -550,14 +756,17 @@ function position_ships_and_assign_stats(){ if (owner = eFACTION.Tyranids){// This is an orderly Tyranid ship formation var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + xx=0;yy=0; + i=0;temp1=0;x2=1200; + man=0; yy=y-((en_height[4]*en_num[4])/2); yy+=(en_height[4]/2); repeat(en_num[4]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[4]; - man.class="Prowler";man.owner=owner; + man.class="Prowler"; + man.owner=owner; man.size=en_size[4]; } x2+=en_width[4]; @@ -567,7 +776,8 @@ function position_ships_and_assign_stats(){ repeat(en_num[3]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[3]; - man.class="Razorfiend";man.owner=owner; + man.class="Razorfiend"; + man.owner=owner; man.size=en_size[3]; } x2+=en_width[3]; @@ -577,7 +787,8 @@ function position_ships_and_assign_stats(){ repeat(en_num[2]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[2]; - man.class="Stalker";man.owner=owner; + man.class="Stalker"; + man.owner=owner; man.size=en_size[2]; } x2+=en_width[2]; @@ -587,7 +798,8 @@ function position_ships_and_assign_stats(){ repeat(en_num[1]){ man=instance_create(x2,yy,obj_en_capital); yy+=en_height[1]; - man.class="Leviathan";man.owner=owner; + man.class="Leviathan"; + man.owner=owner; man.size=en_size[1]; } @@ -598,14 +810,17 @@ function position_ships_and_assign_stats(){ if (owner = eFACTION.Necrons){// This is an orderly Necron ship formation var xx,yy,i, temp1, x2, man; - xx=0;yy=0;i=0;temp1=0;x2=1200;man=0; + xx=0;yy=0; + i=0;temp1=0;x2=1200; + man=0; yy=y-((en_height[4]*en_num[4])/2); yy+=(en_height[4]/2); repeat(en_num[4]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[4]; - man.class="Dirge Class";man.owner=owner; + man.class="Dirge Class"; + man.owner=owner; man.size=en_size[4]; } x2+=en_width[4]; @@ -615,7 +830,8 @@ function position_ships_and_assign_stats(){ repeat(en_num[3]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[3]; - man.class="Jackal Class";man.owner=owner; + man.class="Jackal Class"; + man.owner=owner; man.size=en_size[3]; } x2+=en_width[3]; @@ -625,7 +841,8 @@ function position_ships_and_assign_stats(){ repeat(en_num[2]){ man=instance_create(x2,yy,obj_en_cruiser); yy+=en_height[2]; - man.class="Shroud Class";man.owner=owner; + man.class="Shroud Class"; + man.owner=owner; man.size=en_size[2]; } x2+=en_width[2]; @@ -635,7 +852,8 @@ function position_ships_and_assign_stats(){ repeat(en_num[1]){ man=instance_create(x2,yy,obj_en_capital); yy+=en_height[1]; - man.class="Reaper Class";man.owner=owner; + man.class="Reaper Class"; + man.owner=owner; man.size=en_size[1]; } } diff --git a/sprites/spr_ship_apoc/spr_ship_apoc.yy b/sprites/spr_ship_apoc/spr_ship_apoc.yy index 08ebbee5a5..d3f3356615 100644 --- a/sprites/spr_ship_apoc/spr_ship_apoc.yy +++ b/sprites/spr_ship_apoc/spr_ship_apoc.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":92.0, + "seqWidth":230.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":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":80, "yorigin":45, diff --git a/sprites/spr_ship_nem/spr_ship_nem.yy b/sprites/spr_ship_nem/spr_ship_nem.yy index 4aee217c58..8e55215f6d 100644 --- a/sprites/spr_ship_nem/spr_ship_nem.yy +++ b/sprites/spr_ship_nem/spr_ship_nem.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":92.0, + "seqWidth":230.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":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":100, "yorigin":45, From 90911d291cfcc991db2d23d70fab571c6d7f565a Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 5 Jun 2025 15:23:12 +0100 Subject: [PATCH 089/155] keep adding ai behaviour --- objects/obj_p_ship/Step_0.gml | 2 +- .../scr_automated_ship_combat_functions.gml | 33 +++++++++++++++++-- .../scr_ship_combat_data.gml | 4 +-- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index 0e070fcc36..9dc20ed7fe 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -103,7 +103,7 @@ if (hp>0) and (instance_exists(target)){ if (target!=0) and (action=="attack"){ direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed/2); } - ideal_broadside() + ideal_broadside(); //broadside_movement(); flank_behaviour(); } diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 524a9c75b0..d6bf2805f6 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -5,6 +5,31 @@ function point_on_circle(start_x, start_y, radius, angle){ return [_final_x, _final_y]; } +function circle_mechanics(end_location){ + var _turn_require = point_direction(x,y,end_location[0],end_location[1]); + if (_turn_require<180){ + time_to_face = 180/turning_speed; + } else{ + time_to_face = (_turn_require-180)/turning_speed; + } + + var x_travel = end_location[0] - x; + var y_travel = end_location[1] - y; + + for (var i=0; iclosing_distance){ @@ -70,7 +97,7 @@ function flank_direction_move(main_weapon = false){ if (main_weapon == false){ ship_rear_approach(_rel_direction); } else { - if (point_distance(x, y, target.x, target.y) > main_weapon.range && abs(_rel_direction) <= main_weapon.firing_arc){ + if (point_distance(x, y, target.x, target.y) < (main_weapon.range*2) && abs(_rel_direction) <= main_weapon.firing_arc){ avoid_ship_weapon(main_weapon, rel_direction); } else { ship_rear_approach(_rel_direction); @@ -88,8 +115,8 @@ function avoid_ship_weapon(weapon, rel_direction){ } else { var avoid_angle = target.direction - weapon.firing_arc; } - var _sx = xm+lengthdir_x(weapon.range, avoid_angle); - var _sy = ym+lengthdir_y(weapon.range, avoid_angle); + var _sx = xm + lengthdir_x(weapon.range, avoid_angle); + var _sy = ym + lengthdir_y(weapon.range, avoid_angle); draw_targets = [_sx, _sy]; ship_turn_towards_point(_sx, _sy); } diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index ecd8073354..f10757875b 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -219,10 +219,10 @@ function facing_weapon_angle(facing){ var _direct_ = direction; switch (facing){ case "right": - _direct_+=90; + _direct_ += 90; break; case "left": - _direct_-=90; + _direct_ -= 90; break; case "rear": _direct_ -= 180; From 935f35fc2ed8eaba4042f16143f66a4c4b848d18 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Fri, 6 Jun 2025 03:42:12 +0100 Subject: [PATCH 090/155] keep grinding aways --- ChapterMaster.yyp | 2 +- .../compatibility_report_040421_2234143414.yy | 2 +- notes/notes/notes.yy | 2 +- objects/obj_al_ship/Step_0.gml | 37 +++++----- objects/obj_en_ship/Create_0.gml | 1 + objects/obj_en_ship/Step_0.gml | 72 ++++++++++--------- objects/obj_p_ship/Step_0.gml | 20 ++---- .../scr_automated_ship_combat_functions.gml | 18 ++++- .../scr_player_fleet_combat_functions.gml | 1 + .../scr_ship_combat_data.gml | 3 +- .../scr_tyranid_fleet_functions.gml | 2 + sounds/snd_battle/snd_battle.yy | 6 +- sounds/snd_blood/snd_blood.yy | 6 +- sounds/snd_buzz/snd_buzz.yy | 6 +- sounds/snd_click/snd_click.yy | 6 +- sounds/snd_click_small/snd_click_small.yy | 6 +- sounds/snd_defeat/snd_defeat.yy | 6 +- sounds/snd_diboz/snd_diboz.yy | 6 +- sounds/snd_end_turn/snd_end_turn.yy | 6 +- sounds/snd_error/snd_error.yy | 6 +- sounds/snd_identify/snd_identify.yy | 6 +- sounds/snd_legal/snd_legal.yy | 6 +- sounds/snd_postbattle/snd_postbattle.yy | 6 +- sounds/snd_prologue/snd_prologue.yy | 6 +- sounds/snd_redownload/snd_redownload.yy | 6 +- sounds/snd_royal/snd_royal.yy | 6 +- sounds/snd_stc/snd_stc.yy | 6 +- sounds/snd_vode/snd_vode.yy | 6 +- .../spr_psy_hood_alpha/spr_psy_hood_alpha.yy | 8 +-- .../spr_psy_hood_alpha2.yy | 8 +-- sprites/spr_ship_aconite/spr_ship_aconite.yy | 11 +-- sprites/spr_ship_aven/spr_ship_aven.yy | 11 +-- sprites/spr_ship_glad/spr_ship_glad.yy | 10 +-- sprites/spr_ship_song/spr_ship_song.yy | 6 +- 34 files changed, 163 insertions(+), 153 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 55be767b13..1265af5000 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -572,7 +572,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.808", + "IDEVersion":"2024.1400.0.815", }, "name":"ChapterMaster", "resources":[ diff --git a/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy b/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy index b3b3a91586..9546aa042b 100644 --- a/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy +++ b/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy @@ -1,5 +1,5 @@ { - "$GMNotes":"", + "$GMNotes":"v1", "%Name":"compatibility_report_040421_2234143414", "name":"compatibility_report_040421_2234143414", "parent":{ diff --git a/notes/notes/notes.yy b/notes/notes/notes.yy index 12c9b69e52..9d80786dae 100644 --- a/notes/notes/notes.yy +++ b/notes/notes/notes.yy @@ -1,5 +1,5 @@ { - "$GMNotes":"", + "$GMNotes":"v1", "%Name":"notes", "name":"notes", "parent":{ diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index 87ab5e25cf..75f1a1f3d0 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -1,10 +1,10 @@ // Manages space combat, checks if ships are destroyed and does the targeting and pointing of the ship var __b__; -var bull, ok, targe=0,rdir=0,dist=9999,xx=x,yy=y; +var bull, ok, targe=0,rdir=0,xx=x,yy=y; var front=0,right=0,left=0,rear=0; var f=0,facing="",ammo=0,range=0,wep="",dam=0; -var o_dist=0, spid=0; +var spid=0; var gud=0; var husk; var explo; @@ -29,14 +29,18 @@ if (!__b__){ // Check if ship is destroyed if (hp<=0){ gud=0; - for(var wh=1; wh<=5; wh++){if (obj_fleet.enemy[wh]==owner) then gud=wh;} + for(var wh=1; wh<=5; wh++){ + if (obj_fleet.enemy[wh]==owner) then gud=wh; + } if (class=="Gorbag's Revenge" or (class=="Dethdeala") or (class=="Kroolboy") or (class=="Desecrator")) or (class=="Custodian") then obj_fleet.en_capital_lost[gud]+=1; else if (class=="Battlekroozer") or (class=="Daemon") or (class=="Avenger Class Grand Cruiser") or (class=="Carnage") or (class=="Emissary") or (class=="Protector") then obj_fleet.en_frigate_lost[gud]+=1; else if (class=="Ravager") or (class=="Iconoclast") or (class=="Warden") or (class=="Castellan") then obj_fleet.en_escort_lost[gud]+=1; else if (class=="Leviathan") then obj_fleet.en_capital_lost[gud]+=1; else if (class=="Razorfiend") then obj_fleet.en_frigate_lost[gud]+=1; - else if (class=="Stalker") or (class=="Prowler") or (class=="Sword Class Frigate") then obj_fleet.en_escort_lost[gud]+=1; + else if (class=="Stalker") or (class=="Prowler") or (class=="Sword Class Frigate"){ + obj_fleet.en_escort_lost[gud]+=1; + } destroy_ship_and_leave_husk(); } @@ -156,20 +160,9 @@ if (!__b__){ // direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) }*/ // Controls speed based on action - var speed_down = 0.025; - var _start_slowing = start_slowing_telemetry(dist, speed_down); - if (_start_slowing){ - speed-=speed_down; - } else { - if (action="attack"){ - if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (target_distance0) then speed-=0.025; - } - if (action="broadside"){ - if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (target_distance0) then speed-=0.025; - } - } + speed_down = 0.025; + combat_acceleration_control(); + if (speed<0) then speed=speed*0.9; // Weapon reloads if (turret_cool>0) then turret_cool-=1; @@ -283,11 +276,15 @@ if (__b__){ if (instance_exists(target)){ dist=point_distance(x,y,target.x,target.y); - if (action=="swoop"){direction=turn_towards_point(direction,x,y,target.x,target.y,5-ship_size);} + if (action=="swoop"){ + direction=turn_towards_point(direction,x,y,target.x,target.y,5-ship_size); + } if (dist<=o_dist) and (collision_line(x,y,x+lengthdir_x(o_dist,direction),y+lengthdir_y(o_dist,direction),obj_en_ship,0,1)) then action="attack"; if (dist<300) and (action=="attack") then action="bank"; if (action=="bank") then direction=turn_towards_point(direction,x,y,room_width,room_height/2,5-ship_size); - if (action=="bank") and (dist>700) then action="attack"; + if (action=="bank") and (dist>700){ + action="attack"; + } } } diff --git a/objects/obj_en_ship/Create_0.gml b/objects/obj_en_ship/Create_0.gml index 3dd2d0728e..6e9f1fb2ff 100644 --- a/objects/obj_en_ship/Create_0.gml +++ b/objects/obj_en_ship/Create_0.gml @@ -37,6 +37,7 @@ armour_front=0; side_armour=0; weapons=[]; turrets=0; +max_speed = 20; turn_bonus=1; speed_bonus=1; diff --git a/objects/obj_en_ship/Step_0.gml b/objects/obj_en_ship/Step_0.gml index 31fad913d4..df18ed0152 100644 --- a/objects/obj_en_ship/Step_0.gml +++ b/objects/obj_en_ship/Step_0.gml @@ -8,9 +8,7 @@ if (obj_fleet.start!=5) then exit; if (class="Daemon") and (image_alpha<1) then image_alpha+=0.006; -var o_dist, dist, ch_rang, ex, spid;spid=0; - -if (shields>0) and (shields0) and (shieldspoint_distance(x,y,tp2.x,tp2.y)) then target=tp2; } if (!instance_exists(target)) then exit; if (hp<=0){ - var wh,gud;wh=0;gud=0; - repeat(5){wh+=1;if (obj_fleet.enemy[wh]=owner) then gud=wh;} + var wh=0,gud=0; + repeat(5){ + wh+=1; + if (obj_fleet.enemy[wh]=owner){ + gud=wh; + } + } - if (size=3) then obj_fleet.en_capital_lost[gud]+=1; + if (size>=3) then obj_fleet.en_capital_lost[gud]+=1; if (size=2) then obj_fleet.en_frigate_lost[gud]+=1; if (size=1) then obj_fleet.en_escort_lost[gud]+=1; @@ -41,7 +44,11 @@ if (hp<=0){ if (hp>0) and (instance_exists(obj_p_ship)){ is_targeted(); - if (class="Apocalypse Class Battleship"){o_dist=500;action="attack";spid=20;} + if (class="Apocalypse Class Battleship"){ + o_dist=500; + action="attack"; + spid=20; + } if (class="Nemesis Class Fleet Carrier"){o_dist=1000;action="attack";spid=20;} if (class="Leviathan"){o_dist=160;action="attack";spid=20;} if (class="Battle Barge") or (class="Custodian"){o_dist=300;action="attack";spid=20;} @@ -49,7 +56,11 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (class="Razorfiend"){o_dist=100;action="attack";spid=25;} if (class="Cairn Class") or (class="Reaper Class"){o_dist=199;action="attack";spid=25;if (class="Reaper Class") then spid=30;} - if (class="Dethdeala") or (class="Protector") or (class="Emissary"){o_dist=200;action="attack";spid=20;} + if (class="Dethdeala") or (class="Protector") or (class="Emissary"){ + o_dist=200; + action="attack"; + spid=20; + } if (class="Gorbag's Revenge"){o_dist=200;action="attack";spid=20;} if (class="Kroolboy") or (class="Slamblasta"){o_dist=200;action="attack";spid=25;} if (class="Battlekroozer"){o_dist=200;action="attack";spid=30;} @@ -63,6 +74,10 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (class="Avenger Class Grand Cruiser"){o_dist=48;action="broadside";spid=20;} if (class="Jackal Class"){o_dist=200;action="attack";spid=40;} if (class="Dirge Class"){o_dist=200;action="attack";spid=45;} + + if (ship_size==1){ + action = "flank"; + } // if (class!="big") then flank!!!! @@ -112,23 +127,12 @@ if (hp>0) and (instance_exists(obj_p_ship)){ // direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) - + }*/ + - var speed_down = 0.025; - var _start_slowing = start_slowing_telemetry(dist, speed_down); - if (_start_slowing && owner != eFACTION.Tyranids){ - speed-=speed_down; - } else { - if (action="attack"){ - if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (target_distance0) then speed-=0.025; - } - if (action="broadside"){ - if (target_distance>o_dist) and (speed<((spid)/10)) then speed+=0.005; - if (target_distance0) then speed-=0.025; - } - } + speed_down = 0.025; + combat_acceleration_control(); if (speed<0) then speed=speed*0.9; @@ -152,7 +156,8 @@ if (hp>0) and (instance_exists(obj_p_ship)){ bull.speed=20; bull.dam=3; bull.image_xscale=0.5; - bull.image_yscale=0.5;turret_cool=floor(60/turrets); + bull.image_yscale=0.5; + turret_cool=floor(60/turrets); if (owner = eFACTION.Necrons){ bull.sprite_index=spr_green_las; bull.image_yscale=1; @@ -168,6 +173,9 @@ if (hp>0) and (instance_exists(obj_p_ship)){ } +shields.step(); + + /* */ } __b__ = action_if_variable(owner, 6, 0); @@ -179,13 +187,6 @@ if (obj_fleet.start!=5) then exit; var o_dist, dist, ch_rang, ex, spid;spid=0; -if (shields>0) and (shields0) and (instance_exists(obj_p_ship)){ bull=instance_create(x,y,obj_en_round);bull.direction=point_direction(x,y,targe.x,targe.y); if (owner = eFACTION.Tyranids) then bull.sprite_index=spr_glob; if (owner = eFACTION.Tau) or (owner = eFACTION.Eldar) then bull.sprite_index=spr_pulse; - bull.speed=20;bull.dam=3;bull.image_xscale=0.5;bull.image_yscale=0.5;turret_cool=floor(60/turrets); + bull.speed=20; + bull.dam=3; + bull.image_xscale=0.5; + bull.image_yscale=0.5;turret_cool=floor(60/turrets); bull.direction+=choose(random(10),1*-(random(10))); } } diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index 9dc20ed7fe..d81c806f06 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -112,9 +112,9 @@ if (hp>0) and (instance_exists(target)){ dist=point_distance(x,y,draw_targets[0], draw_targets[1]); } - var speed_up = ship_data.final_acceleration(); + speed_up = ship_data.final_acceleration(); - var speed_down = ship_data.deceleration(); + speed_down = ship_data.deceleration(); if (paction="turn") or (paction="attack_turn"){ direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); @@ -130,23 +130,11 @@ if (hp>0) and (instance_exists(target)){ } if (paction!="move") and (paction!="turn") and (paction!="attack_move") and (paction!="attack_turn"){ - - var _start_slowing = start_slowing_telemetry(dist, speed_down); - if (_start_slowing){ - speed-=speed_down; - } else { - if (action="attack"){ - if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; - } else if (action="broadside"){ - if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; - } else if (action="flank"){// flank here - if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; - } - } + combat_acceleration_control(); } if (paction="move") or (paction="attack_move"){ direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); - var dist;dist=point_distance(x,y,target_x,target_y); + var dist=point_distance(x,y,target_x,target_y); if (y>target_y) then direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed); if (yo_dist) and (speed<(max_speed)) then speed+=speed_up; + } else if (action="broadside"){ + if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; + } else if (action="flank"){// flank here + if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; + } + } +} +/*function circle_mechanics(end_location){ var _turn_require = point_direction(x,y,end_location[0],end_location[1]); if (_turn_require<180){ time_to_face = 180/turning_speed; @@ -27,7 +41,7 @@ function circle_mechanics(end_location){ degtorad(); time_to_face = turning_speed max_speed = -} +}*/ function ideal_broadside(){ diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index d90433a378..da2596b9f9 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -213,6 +213,7 @@ function setup_player_combat_ship(){ var i=0, unit, b=0; + boarders = 0; for (var co=0;co<=obj_ini.companies;co++){ for (i=0;i":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"51ba9fd0-369a-4be7-b5c8-f8d75c8a38d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51ba9fd0-369a-4be7-b5c8-f8d75c8a38d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy b/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy index 7b04c905e4..adb3b5b37b 100644 --- a/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy +++ b/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood_alpha2", "bboxMode":0, "bbox_bottom":145, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e8a1632c-8084-4d13-8d30-4732feda986c","name":"e8a1632c-8084-4d13-8d30-4732feda986c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8a1632c-8084-4d13-8d30-4732feda986c","name":"e8a1632c-8084-4d13-8d30-4732feda986c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a1632c-8084-4d13-8d30-4732feda986c","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9985ee2-2374-47e6-89f4-6a2b25a8ec5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a1632c-8084-4d13-8d30-4732feda986c","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9985ee2-2374-47e6-89f4-6a2b25a8ec5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_aconite/spr_ship_aconite.yy b/sprites/spr_ship_aconite/spr_ship_aconite.yy index 64b55a553d..2fc24c804a 100644 --- a/sprites/spr_ship_aconite/spr_ship_aconite.yy +++ b/sprites/spr_ship_aconite/spr_ship_aconite.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":105.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":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08b75cf2-26f5-4e6f-ad20-0821d2aa305a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"08b75cf2-26f5-4e6f-ad20-0821d2aa305a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":52, "yorigin":16, diff --git a/sprites/spr_ship_aven/spr_ship_aven.yy b/sprites/spr_ship_aven/spr_ship_aven.yy index 54701be189..adeacc17b9 100644 --- a/sprites/spr_ship_aven/spr_ship_aven.yy +++ b/sprites/spr_ship_aven/spr_ship_aven.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":60.0, + "seqWidth":165.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":"3b549580-f553-4212-b6bb-c41c3ff18e19","path":"sprites/spr_ship_aven/spr_ship_aven.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c4593dc-7dbb-404f-8004-0357ea802527","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b549580-f553-4212-b6bb-c41c3ff18e19","path":"sprites/spr_ship_aven/spr_ship_aven.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5c4593dc-7dbb-404f-8004-0357ea802527","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":82, "yorigin":30, diff --git a/sprites/spr_ship_glad/spr_ship_glad.yy b/sprites/spr_ship_glad/spr_ship_glad.yy index 8f67c0bf03..276ee030e0 100644 --- a/sprites/spr_ship_glad/spr_ship_glad.yy +++ b/sprites/spr_ship_glad/spr_ship_glad.yy @@ -3,11 +3,11 @@ "%Name":"spr_ship_glad", "bboxMode":0, "bbox_bottom":29, - "bbox_left":1, + "bbox_left":2, "bbox_right":77, "bbox_top":1, - "collisionKind":1, - "collisionTolerance":0, + "collisionKind":2, + "collisionTolerance":140, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, @@ -70,7 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_song/spr_ship_song.yy b/sprites/spr_ship_song/spr_ship_song.yy index 3b0b109fbd..780e27ec22 100644 --- a/sprites/spr_ship_song/spr_ship_song.yy +++ b/sprites/spr_ship_song/spr_ship_song.yy @@ -6,7 +6,7 @@ "bbox_left":2, "bbox_right":345, "bbox_top":4, - "collisionKind":1, + "collisionKind":0, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, @@ -70,7 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","path":"sprites/spr_ship_song/spr_ship_song.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c049868-56f8-4a4a-b66e-0a379b5bd341","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","path":"sprites/spr_ship_song/spr_ship_song.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0c049868-56f8-4a4a-b66e-0a379b5bd341","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, From 8c8cceac28216d0e9a243e6512ca38bf55d13788 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 7 Jun 2025 00:01:49 +0100 Subject: [PATCH 091/155] move oobj_Defeat drawing to gui layer --- objects/obj_defeat/{Draw_0.gml => Draw_64.gml} | 5 +---- objects/obj_defeat/KeyPress_13.gml | 8 +++----- objects/obj_defeat/obj_defeat.yy | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) rename objects/obj_defeat/{Draw_0.gml => Draw_64.gml} (89%) diff --git a/objects/obj_defeat/Draw_0.gml b/objects/obj_defeat/Draw_64.gml similarity index 89% rename from objects/obj_defeat/Draw_0.gml rename to objects/obj_defeat/Draw_64.gml index 8fffcf8417..a56fc0f228 100644 --- a/objects/obj_defeat/Draw_0.gml +++ b/objects/obj_defeat/Draw_64.gml @@ -1,4 +1,3 @@ - draw_set_alpha(1); // draw_sprite(spr_defeat,global.defeat,331,73); scr_image("defeat",global.defeat,331,73,938,554); @@ -19,6 +18,4 @@ draw_set_color(c_black); draw_set_alpha(fade/faded); draw_rectangle(0,0,room_width,room_height,0); draw_set_alpha(fadeout/30); -draw_rectangle(0,0,room_width,room_height,0); - - +draw_rectangle(0,0,room_width,room_height,0); \ No newline at end of file diff --git a/objects/obj_defeat/KeyPress_13.gml b/objects/obj_defeat/KeyPress_13.gml index aa04db2e7a..ea9a5fa85c 100644 --- a/objects/obj_defeat/KeyPress_13.gml +++ b/objects/obj_defeat/KeyPress_13.gml @@ -1,6 +1,4 @@ -var __b__; -__b__ = action_if_variable(fade, 0, 3); -if __b__ -{ -goodbye = 1; + +if (fade <= 0){ + goodbye = 1; } diff --git a/objects/obj_defeat/obj_defeat.yy b/objects/obj_defeat/obj_defeat.yy index de66a6039e..69b5b02793 100644 --- a/objects/obj_defeat/obj_defeat.yy +++ b/objects/obj_defeat/obj_defeat.yy @@ -4,8 +4,8 @@ "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":13,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"obj_defeat", From 99e3d82fec23f86bdd22ff5eefe1e0fb9218df1d Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 7 Jun 2025 00:43:52 +0100 Subject: [PATCH 092/155] better variabel naming --- objects/obj_al_in/Step_0.gml | 12 +- objects/obj_al_ship/Step_0.gml | 72 +++++----- objects/obj_circular/Create_0.gml | 2 +- objects/obj_controller/Create_0.gml | 2 +- objects/obj_en_in/Step_0.gml | 12 +- objects/obj_en_ship/Create_0.gml | 2 + objects/obj_en_ship/Step_0.gml | 128 +++++++----------- objects/obj_enunit/Alarm_0.gml | 20 +-- objects/obj_fleet/Alarm_2.gml | 4 +- objects/obj_p_assra/Step_0.gml | 4 +- objects/obj_p_fleet/Alarm_1.gml | 12 +- objects/obj_p_ship/Create_0.gml | 4 +- objects/obj_p_ship/Step_0.gml | 115 ++++++++-------- objects/obj_p_th/Step_0.gml | 12 +- objects/obj_pnunit/Alarm_0.gml | 6 +- objects/obj_star_select/Draw_64.gml | 4 +- objects/obj_star_select/Mouse_50.gml | 4 +- .../scr_automated_ship_combat_functions.gml | 12 +- .../scr_enemy_fleet_spawn_combat.gml | 2 +- .../scr_fleet_functions.gml | 4 +- .../scr_ship_combat_data.gml | 5 + .../scr_ship_weapon_struct.gml | 2 +- 22 files changed, 213 insertions(+), 227 deletions(-) diff --git a/objects/obj_al_in/Step_0.gml b/objects/obj_al_in/Step_0.gml index c8a68ed0e9..d36373fff1 100644 --- a/objects/obj_al_in/Step_0.gml +++ b/objects/obj_al_in/Step_0.gml @@ -8,21 +8,21 @@ if (owner == eFACTION.Chaos) then sprite_index = spr_ship_dreadclaw; image_angle = direction; if (cooldown1 > 0) then cooldown1 -= 1; -var dist, range; +var target_distance, range; if (instance_exists(target)) { - dist = point_distance(x, y, target.x, target.y); + target_distance = point_distance(x, y, target.x, target.y); range = 100 + max(sprite_get_width(target.sprite_index), sprite_get_height(target.sprite_index)); if (action == "close") { speed = 4; direction = turn_towards_point(direction, x, y, target.x, target.y, 6); } - if (dist < range) and(dist > 100) and(action = "close") then action = "shoot"; - if (action == "shoot") and(dist > range) then action = "close"; - if (dist < 80) and(action = "shoot") then action = "bank"; + if (target_distance < range) and(target_distance > 100) and(action = "close") then action = "shoot"; + if (action == "shoot") and(target_distance > range) then action = "close"; + if (target_distance < 80) and(action = "shoot") then action = "bank"; if (action == "bank") then direction = turn_towards_point(direction, x, y, room_width, room_height / 2, 3); - if (action == "bank") and(dist > 300) then action = "close"; + if (action == "bank") and(target_distance > 300) then action = "close"; if (action == "shoot") and(cooldown1 <= 0) { var bull; diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index 75f1a1f3d0..c2895a8dd4 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -17,7 +17,7 @@ if (!__b__){ if (class="Daemon") and (image_alpha<1) then image_alpha+=0.006; - o_dist=0; + closing_distance=0; spid=0; if (shields>0) and (shields=dist){ + /*if (target!=0) and (action="broadside") and (closing_distance>=target_distance){ direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) }*/ - /*if (target!=0) and (action="broadside") and (o_dist>=dist){ + /*if (target!=0) and (action="broadside") and (closing_distance>=target_distance){ var re_deh;re_deh=relative_direction(direction,target.direction); // if (re_deh<45) or (re_deh>315) or ((re_deh>135) and (re_deh<225)) then direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) var wok; @@ -169,15 +169,15 @@ if (!__b__){ targe=0; rdir=0; - dist=9999; + target_distance=9999; xx=x; yy=y; // Turret targetting if (turrets>0) and (instance_exists(obj_en_in)) and (turret_cool==0){ targe=instance_nearest(x,y,obj_en_in); - if (instance_exists(targe)) then dist=point_distance(x,y,targe.x,targe.y); + if (instance_exists(targe)) then target_distance=point_distance(x,y,targe.x,targe.y); - if (dist>64) and (dist<300){ + if (target_distance>64) and (target_distance<300){ bull=instance_create(x,y,obj_al_round); bull.direction=point_direction(x,y,targe.x,targe.y); if (owner = eFACTION.Tyranids) then bull.sprite_index=spr_glob; @@ -218,7 +218,7 @@ if (__b__){ if (obj_fleet.start!=5) then exit; - o_dist=0; + closing_distance=0; spid=0; if (shields>0) and (shields0) and (instance_exists(obj_en_ship)){ if (class=="Void Stalker"){ - o_dist=300; + closing_distance=300; action="swoop"; spid=60; } if (class=="Shadow Class"){ - o_dist=200; + closing_distance=200; action="swoop"; spid=80; } if (class=="Hellebore") or (class=="Aconite"){ - o_dist=200; + closing_distance=200; action="swoop"; spid=100; } - dist=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(target.sprite_index),sprite_get_height(sprite_index))); + target_distance=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(target.sprite_index),sprite_get_height(sprite_index))); if (target!=0){ if (speed<((spid)/10)) then speed+=0.02; if (instance_exists(target)){ - dist=point_distance(x,y,target.x,target.y); + target_distance=point_distance(x,y,target.x,target.y); if (action=="swoop"){ direction=turn_towards_point(direction,x,y,target.x,target.y,5-ship_size); } - if (dist<=o_dist) and (collision_line(x,y,x+lengthdir_x(o_dist,direction),y+lengthdir_y(o_dist,direction),obj_en_ship,0,1)) then action="attack"; - if (dist<300) and (action=="attack") then action="bank"; + if (target_distance<=closing_distance) and (collision_line(x,y,x+lengthdir_x(closing_distance,direction),y+lengthdir_y(closing_distance,direction),obj_en_ship,0,1)) then action="attack"; + if (target_distance<300) and (action=="attack") then action="bank"; if (action=="bank") then direction=turn_towards_point(direction,x,y,room_width,room_height/2,5-ship_size); - if (action=="bank") and (dist>700){ + if (action=="bank") and (target_distance>700){ action="attack"; } } @@ -294,15 +294,15 @@ if (__b__){ if (turret_cool>0) then turret_cool-=1; targe=0; - dist=9999; + target_distance=9999; xx=x; yy=y; if (turrets>0) and (instance_exists(obj_en_in)) and (turret_cool==0){ targe=instance_nearest(x,y,obj_en_in); - if (instance_exists(targe)) then dist=point_distance(x,y,targe.x,targe.y); + if (instance_exists(targe)) then target_distance=point_distance(x,y,targe.x,targe.y); - if (dist>64) and (dist<300){ + if (target_distance>64) and (target_distance<300){ bull=instance_create(x,y,obj_al_round); bull.direction=point_direction(x,y,targe.x,targe.y); if (owner = eFACTION.Tyranids) then bull.sprite_index=spr_glob; diff --git a/objects/obj_circular/Create_0.gml b/objects/obj_circular/Create_0.gml index 625b3b6f6d..36f660813f 100644 --- a/objects/obj_circular/Create_0.gml +++ b/objects/obj_circular/Create_0.gml @@ -31,7 +31,7 @@ with(obj_p_ship){ if (ced<=30) then act="attack_turn"; med=point_distance(x,y,ce.x,ce.y); - if (med<=o_dist+50){ + if (med<=closing_distance+50){ act="attack"; target=ce; } diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 7bf35997fa..35b95177aa 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -1284,7 +1284,7 @@ if (global.load>=0){ -var xx,yy,me,dist,go,planet; +var xx,yy,me,target_distance,go,planet; global.custom=eCHAPTER_TYPE.RANDOM; // ** Sets up base training level and trainees at game start ** diff --git a/objects/obj_en_in/Step_0.gml b/objects/obj_en_in/Step_0.gml index f34332aebf..29cfbae3f3 100644 --- a/objects/obj_en_in/Step_0.gml +++ b/objects/obj_en_in/Step_0.gml @@ -8,17 +8,17 @@ if (owner = eFACTION.Chaos) then sprite_index=spr_ship_dreadclaw; image_angle=direction; if (cooldown1>0) then cooldown1-=1; -var dist, range; +var target_distance, range; if (instance_exists(target)){ - dist=point_distance(x,y,target.x,target.y); + target_distance=point_distance(x,y,target.x,target.y); range=100+max(sprite_get_width(target.sprite_index),sprite_get_height(target.sprite_index)); if (action="close"){speed=4;direction=turn_towards_point(direction,x,y,target.x,target.y,6);} - if (dist100) and (action="close") then action="shoot"; - if (action="shoot") and (dist>range) then action="close"; - if (dist<80) and (action="shoot") then action="bank"; + if (target_distance100) and (action="close") then action="shoot"; + if (action="shoot") and (target_distance>range) then action="close"; + if (target_distance<80) and (action="shoot") then action="bank"; if (action="bank") then direction=turn_towards_point(direction,x,y,room_width,room_height/2,3); - if (action="bank") and (dist>300) then action="close"; + if (action="bank") and (target_distance>300) then action="close"; if (action="shoot") and (cooldown1<=0){ var bull; diff --git a/objects/obj_en_ship/Create_0.gml b/objects/obj_en_ship/Create_0.gml index 6e9f1fb2ff..8bc816ed9b 100644 --- a/objects/obj_en_ship/Create_0.gml +++ b/objects/obj_en_ship/Create_0.gml @@ -14,6 +14,8 @@ whip=0; bridge=0; draw_targets = false; bullets_for = []; +target_distance = 9999; +closing_distance = 0; cooldown[0]=0; diff --git a/objects/obj_en_ship/Step_0.gml b/objects/obj_en_ship/Step_0.gml index df18ed0152..809dba3a39 100644 --- a/objects/obj_en_ship/Step_0.gml +++ b/objects/obj_en_ship/Step_0.gml @@ -10,7 +10,7 @@ if (class="Daemon") and (image_alpha<1) then image_alpha+=0.006; var ch_rang, ex, spid=0; - +target_distance = 9999 // Need to every couple of seconds check this // with obj_en_ship if not big then disable, check nearest, and activate once more @@ -45,35 +45,38 @@ if (hp>0) and (instance_exists(obj_p_ship)){ is_targeted(); if (class="Apocalypse Class Battleship"){ - o_dist=500; + closing_distance=500; action="attack"; spid=20; } - if (class="Nemesis Class Fleet Carrier"){o_dist=1000;action="attack";spid=20;} - if (class="Leviathan"){o_dist=160;action="attack";spid=20;} - if (class="Battle Barge") or (class="Custodian"){o_dist=300;action="attack";spid=20;} - if (class="Desecrator"){o_dist=300;action="attack";spid=20;} - if (class="Razorfiend"){o_dist=100;action="attack";spid=25;} - if (class="Cairn Class") or (class="Reaper Class"){o_dist=199;action="attack";spid=25;if (class="Reaper Class") then spid=30;} + if (class="Nemesis Class Fleet Carrier"){ + closing_distance=1000;action="attack"; + spid=20; + } + if (class="Leviathan"){closing_distance=160;action="attack";spid=20;} + if (class="Battle Barge") or (class="Custodian"){closing_distance=300;action="attack";spid=20;} + if (class="Desecrator"){closing_distance=300;action="attack";spid=20;} + if (class="Razorfiend"){closing_distance=100;action="attack";spid=25;} + if (class="Cairn Class") or (class="Reaper Class"){closing_distance=199;action="attack";spid=25;if (class="Reaper Class") then spid=30;} if (class="Dethdeala") or (class="Protector") or (class="Emissary"){ - o_dist=200; + closing_distance=200; action="attack"; spid=20; } - if (class="Gorbag's Revenge"){o_dist=200;action="attack";spid=20;} - if (class="Kroolboy") or (class="Slamblasta"){o_dist=200;action="attack";spid=25;} - if (class="Battlekroozer"){o_dist=200;action="attack";spid=30;} - if (class="Avenger") or (class="Carnage") or (class="Daemon"){o_dist=200;action="attack";spid=20;} - - if (class="Ravager") or (class="Iconoclast") or (class="Castellan") or (class="Warden"){o_dist=300;action="attack";spid=35;} - if (class="Shroud Class"){o_dist=250;action="attack";spid=35;} - - if (class="Stalker") or (class="Sword Class Frigate"){o_dist=100;action="attack";spid=20;} - if (class="Prowler"){o_dist=100;action="attack";spid=35;} - if (class="Avenger Class Grand Cruiser"){o_dist=48;action="broadside";spid=20;} - if (class="Jackal Class"){o_dist=200;action="attack";spid=40;} - if (class="Dirge Class"){o_dist=200;action="attack";spid=45;} + if (class="Gorbag's Revenge"){closing_distance=200;action="attack";spid=20;} + if (class="Kroolboy") or (class="Slamblasta"){closing_distance=200;action="attack";spid=25;} + if (class="Battlekroozer"){closing_distance=200;action="attack";spid=30;} + if (class="Avenger") or (class="Carnage") or (class="Daemon"){closing_distance=200;action="attack";spid=20;} + + if (class="Ravager") or (class="Iconoclast") or (class="Castellan") or (class="Warden"){closing_distance=300;action="attack";spid=35;} + if (class="Shroud Class"){closing_distance=250;action="attack";spid=35;} + + if (class="Stalker") or (class="Sword Class Frigate"){closing_distance=100;action="attack";spid=20;} + if (class="Prowler"){closing_distance=100;action="attack";spid=35;} + if (class="Avenger Class Grand Cruiser"){closing_distance=48;action="broadside";spid=20;} + if (class="Jackal Class"){closing_distance=200;action="attack";spid=40;} + if (class="Dirge Class"){closing_distance=200;action="attack";spid=45;} if (ship_size==1){ action = "flank"; @@ -81,54 +84,17 @@ if (hp>0) and (instance_exists(obj_p_ship)){ // if (class!="big") then flank!!!! - closing_distance = o_dist; + closing_distance = closing_distance; spid=spid*speed_bonus; - dist=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - target_distance = dist; + target_distance=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); + target_distance = target_distance; if (target!=0) and (action="attack"){ direction=turn_towards_point(direction,x,y,target.x,target.y,.1); } broadside_movement(); flank_behaviour(); - - - /*if (target!=0) and (action="broadside") and (o_dist>=dist){ - direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) - }*/ - - /*if (target!=0) and (action="broadside") and (o_dist>=dist){ - var re_deh;re_deh=relative_direction(direction,target.direction); - - // if (re_deh<45) or (re_deh>315) or ((re_deh>135) and (re_deh<225)) then direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) - - var wok; - wok=0; - - if (!instance_exists(target_l)) then wok=2; - if (!instance_exists(target_r)) then wok=1; - - if (instance_exists(target_l)) and (instance_exists(target_r)){ - if (point_distance(x,y,target_l.x,target_l.y))<(point_distance(x,y,target_r.x,target_r.y)) then wok=1; - else{wok=2;} - - } - - - if (wok=1){ - direction=turn_towards_point(direction,x,y,x+lengthdir_x(256,90),y+lengthdir_y(256,90),.2) - } - - if (wok=2){ - direction=turn_towards_point(direction,x,y,x+lengthdir_x(256,270),y+lengthdir_y(256,270),.2) - } - - // direction=turn_towards_point(direction,x+lengthdir_x(128,target.direction-90),y,target.x,target.y+lengthdir_y(128,target.direction-90),.2) - - - - }*/ speed_down = 0.025; @@ -140,14 +106,14 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (turret_cool>0) then turret_cool-=1; - var targe=0,rdir=0,dirr="",dist=9999,xx=x,yy=y; + var targe=0,rdir=0,dirr="",target_distance=9999,xx=x,yy=y; if (turrets>0) and (instance_exists(obj_p_small)) and (turret_cool=0){ targe=instance_nearest(x,y,obj_p_small); - if (instance_exists(targe)) then dist=point_distance(x,y,targe.x,targe.y); + if (instance_exists(targe)) then target_distance=point_distance(x,y,targe.x,targe.y); - if (dist>64) and (dist<300){ + if (target_distance>64) and (target_distance<300){ bull=instance_create(x,y,obj_en_round); bull.direction=point_direction(x,y,targe.x,targe.y); if (owner = eFACTION.Tyranids){ @@ -185,7 +151,7 @@ image_angle=direction; if (obj_fleet.start!=5) then exit; -var o_dist, dist, ch_rang, ex, spid;spid=0; +var ch_rang, ex, spid;spid=0; if (hp<=0){ var wh,gud;wh=0;gud=0; @@ -213,11 +179,15 @@ if (hp<=0){ } if (hp>0) and (instance_exists(obj_p_ship)){ - if (class="Void Stalker"){o_dist=300;action="swoop";spid=60;} - if (class="Shadow Class"){o_dist=200;action="swoop";spid=80;} - if (class="Hellebore") or (class="Aconite"){o_dist=200;action="swoop";spid=100;} + if (class="Void Stalker"){ + closing_distance=300; + action="swoop";spid=60;} + if (class="Shadow Class"){ + closing_distance=200; + action="swoop";spid=80;} + if (class="Hellebore") or (class="Aconite"){closing_distance=200;action="swoop";spid=100;} - dist=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(target.sprite_index),sprite_get_height(sprite_index))); + target_distance=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(target.sprite_index),sprite_get_height(sprite_index))); @@ -228,15 +198,15 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (target!=0){ if (speed<((spid)/10)) then speed+=0.02; - var dist, range; + var range; if (instance_exists(target)){ - dist=point_distance(x,y,target.x,target.y); + target_distance=point_distance(x,y,target.x,target.y); if (action="swoop"){direction=turn_towards_point(direction,x,y,target.x,target.y,5-ship_size);} - if (dist<=o_dist) and (collision_line(x,y,x+lengthdir_x(o_dist,direction),y+lengthdir_y(o_dist,direction),obj_p_ship,0,1)) then action="attack"; - if (dist<300) and (action="attack") then action="bank"; + if (target_distance<=closing_distance) and (collision_line(x,y,x+lengthdir_x(closing_distance,direction),y+lengthdir_y(closing_distance,direction),obj_p_ship,0,1)) then action="attack"; + if (target_distance<300) and (action="attack") then action="bank"; if (action="bank") then direction=turn_towards_point(direction,x,y,room_width,room_height/2,5-ship_size); - if (action="bank") and (dist>700) then action="attack"; + if (action="bank") and (target_distance>700) then action="attack"; } } @@ -246,15 +216,15 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (turret_cool>0) then turret_cool-=1; - var bull, targe, rdir, dirr, dist, xx, yy, ok; - targe=0;rdir=0;dirr="";dist=9999;xx=x;yy=y; + var bull, targe, rdir, dirr, target_distance, xx, yy, ok; + targe=0;rdir=0;dirr="";target_distance=9999;xx=x;yy=y; if (turrets>0) and (instance_exists(obj_p_small)) and (turret_cool=0){ targe=instance_nearest(x,y,obj_p_small); - if (instance_exists(targe)) then dist=point_distance(x,y,targe.x,targe.y); + if (instance_exists(targe)) then target_distance=point_distance(x,y,targe.x,targe.y); - if (dist>64) and (dist<300){ + if (target_distance>64) and (target_distance<300){ bull=instance_create(x,y,obj_en_round);bull.direction=point_direction(x,y,targe.x,targe.y); if (owner = eFACTION.Tyranids) then bull.sprite_index=spr_glob; if (owner = eFACTION.Tau) or (owner = eFACTION.Eldar) then bull.sprite_index=spr_pulse; diff --git a/objects/obj_enunit/Alarm_0.gml b/objects/obj_enunit/Alarm_0.gml index ba93e60882..74bf4b6d8c 100644 --- a/objects/obj_enunit/Alarm_0.gml +++ b/objects/obj_enunit/Alarm_0.gml @@ -43,14 +43,14 @@ if (!engaged){ // Shooting if (instance_exists(obj_nfort) && !flank) { enemy = instance_nearest(x,y,obj_nfort); - dist = 2; + target_distance = 2; } else { - dist=get_block_distance(enemy); + target_distance=get_block_distance(enemy); } target_unit_index=0; - if (range[i] >= dist) { // The weapon is in range; + if (range[i] >= target_distance) { // The weapon is in range; var _target_vehicles = apa[i] > 0 ? true : false; // AP weapons target vehicles // if (string_count("Gauss",wep[i])>0) then _target_vehicles=true; @@ -214,8 +214,8 @@ if (!engaged){ // Shooting //TODO: The melee code was not refactored; else if ((engaged || enemy.engaged) and target_block_is_valid( enemy,obj_pnunit)){// Melee engaged=1; - var i=0,dist=999,no_ap=1; - // dist=point_distance(x,y,enemy.x,enemy.y)/10; + var i=0,target_distance=999,no_ap=1; + // target_distance=point_distance(x,y,enemy.x,enemy.y)/10; if !(instance_exists(obj_pnunit))then exit; for (var i=0;i=dist) and (ammo[i]!=0){ + if (wep[i]!="") and (range[i]>=target_distance) and (ammo[i]!=0){ if (range[i]!=1) and (engaged=0) then range_shoot="ranged"; if ((range[i]!=floor(range[i])) or (range[i]=1)) and (engaged=1) then range_shoot="melee"; } @@ -350,7 +350,7 @@ var range_shooti; - if (wep[i]!="") and (range_shoot="ranged") and (range[i]>=dist){// Weapon meets preliminary checks + if (wep[i]!="") and (range_shoot="ranged") and (range[i]>=target_distance){// Weapon meets preliminary checks var _armour_piercing;_armour_piercing=0;if (apa[i]>att[i]) then _armour_piercing=1;// Determines if it is _armour_piercing or not // if (wep[i]="Missile Launcher") then _armour_piercing=1; diff --git a/objects/obj_fleet/Alarm_2.gml b/objects/obj_fleet/Alarm_2.gml index 8c0eb21236..7e87f39d30 100644 --- a/objects/obj_fleet/Alarm_2.gml +++ b/objects/obj_fleet/Alarm_2.gml @@ -109,8 +109,8 @@ if (enemy=6){// This is an orderly Tau ship formation if (enemy=7) or (enemy=10){// This is spew out random ships without regard for formations - var xx,yy,dist,targ,numb,man; - xx=0;yy=0;dist=0;target=0;numb=0;man=0; + var xx,yy,target_distance,targ,numb,man; + xx=0;yy=0;target_distance=0;target=0;numb=0;man=0; var i;i=0; diff --git a/objects/obj_p_assra/Step_0.gml b/objects/obj_p_assra/Step_0.gml index 8175b49f48..b1363bfb80 100644 --- a/objects/obj_p_assra/Step_0.gml +++ b/objects/obj_p_assra/Step_0.gml @@ -2,7 +2,7 @@ image_angle=direction; if (cooldown>0) then cooldown-=1; -var dist; +var target_distance; if (instance_exists(target)){ if (target.owner = eFACTION.Tyranids) or (target.owner = eFACTION.Necrons){damage=true;plasma_bomb=true;steal=false;} if (target.owner != eFACTION.Tyranids) and (target.owner != eFACTION.Necrons){ @@ -11,7 +11,7 @@ if (instance_exists(target)){ if (obj_controller.command_set[22]=1) then steal=true; // important for boarding and commandeering ships later down the line? } - dist=point_distance(x,y,target.x,target.y); + target_distance=point_distance(x,y,target.x,target.y); if (action="goto"){speed=4; direction=turn_towards_point(direction,x,y,target.x,target.y,8); diff --git a/objects/obj_p_fleet/Alarm_1.gml b/objects/obj_p_fleet/Alarm_1.gml index 9ad7ea80eb..d9625753ea 100644 --- a/objects/obj_p_fleet/Alarm_1.gml +++ b/objects/obj_p_fleet/Alarm_1.gml @@ -130,19 +130,19 @@ try_and_report_loop("player alarm 1",function(){ if (instance_exists(steh)) and (steh!=0){ if (steh.p_type[1]="Craftworld"){ - var dist, rando; - dist=999;rando=floor(random(100))+1; - dist=point_distance(x,y,steh.old_x,steh.old_y); + var target_distance, rando; + target_distance=999;rando=floor(random(100))+1; + target_distance=point_distance(x,y,steh.old_x,steh.old_y); - // show_message("Dist: "+string(dist)+", Rando: "+string(rando)); + // show_message("target_distance: "+string(target_distance)+", Rando: "+string(rando)); - if (rando>=95) and (dist<=300){ + if (rando>=95) and (target_distance<=300){ obj_controller.known[eFACTION.Eldar]=1; scr_alert("green","elfs","Eldar Craftworld discovered.",steh.old_x,steh.old_y); with(obj_en_fleet){if (owner = eFACTION.Eldar) then image_alpha=1;} } // Quene eldar introduction - // if (rando>=95) and (dist<=300) then show_message("MON'KEIGH"); + // if (rando>=95) and (target_distance<=300) then show_message("MON'KEIGH"); } } diff --git a/objects/obj_p_ship/Create_0.gml b/objects/obj_p_ship/Create_0.gml index a00c9d68f1..f7019c1d0a 100644 --- a/objects/obj_p_ship/Create_0.gml +++ b/objects/obj_p_ship/Create_0.gml @@ -1,7 +1,7 @@ ship_id=0; master_present=0; -o_dist=0; +closing_distance=0; selected=0; sel_x1=0; @@ -24,6 +24,8 @@ if (instance_exists(obj_en_ship)){ target=instance_nearest(x,y,obj_en_ship); } turn_bonus = false; +target_distance = 0; +closing_distance = 0; bullets_for = []; target_l=0; diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index d81c806f06..f7e022cfc0 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -1,9 +1,6 @@ image_angle=direction; if (obj_fleet.start!=5) then exit; - - -var dist; if (board_cooldown>=0) then board_cooldown-=1; // Need to every couple of seconds check this @@ -65,43 +62,49 @@ if (hp>0) and (instance_exists(target)){ is_targeted(); if (class="Apocalypse Class Battleship") or (class="Gloriana"){ - o_dist=500; + closing_distance=500; action="attack"; } else if (class="Nemesis Class Fleet Carrier"){ - o_dist=1000; + closing_distance=1000; action="attack"; } else if (class="Avenger Class Grand Cruiser"){ - o_dist=64; + closing_distance=64; action="broadside"; } else if (class="Battle Barge"){ - o_dist=300; + closing_distance=300; action="broadside"; } else if (class == "Strike Cruiser"){ action="broadside"; - o_dist=300; + closing_distance=300; } else if (class="Hunter") or (class="Gladius"){ - o_dist=64; + closing_distance=64; action="flank"; } - closing_distance = o_dist; + closing_distance = closing_distance; // if (class!="big") then flank!!!! - dist=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - target_distance = dist; + target_distance=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); + target_distance = target_distance; // STC Bonuses + turning_speed = ship_data.calc_turn_speed(); + speed_up = ship_data.final_acceleration(); + + speed_down = ship_data.deceleration(); + + var _player_action = (paction=="move" || paction=="attack_move" || paction=="turn" || paction=="attack_turn"); - if (paction!="move") and (paction!="attack_move") and (paction!="turn") and (paction!="attack_turn"){ + if (!_player_action){ if (target!=0) and (action=="attack"){ - direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed/2); + ship_turn_towards_point(target.x,target.y); } ideal_broadside(); //broadside_movement(); @@ -109,67 +112,71 @@ if (hp>0) and (instance_exists(target)){ } if (draw_targets != false){ - dist=point_distance(x,y,draw_targets[0], draw_targets[1]); - } - - speed_up = ship_data.final_acceleration(); - - speed_down = ship_data.deceleration(); - - if (paction="turn") or (paction="attack_turn"){ - direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); - dist=point_distance(x,y,target_x,target_y); - if (y>target_y) then direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed); - if (y0) then speed-=speed_down; - - if (direction-point_direction(x,y,target_x,target_y)<=2) and (direction-point_direction(x,y,target_x,target_y)>=-2){ - if (paction="turn") then paction="move"; - if (paction="attack_turn") then paction="attack_move"; - } + target_distance=point_distance(x,y,draw_targets[0], draw_targets[1]); } - if (paction!="move") and (paction!="turn") and (paction!="attack_move") and (paction!="attack_turn"){ + if (!_player_action){ combat_acceleration_control(); } - if (paction="move") or (paction="attack_move"){ - direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); - var dist=point_distance(x,y,target_x,target_y); - if (y>target_y) then direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed); - if (ytarget_y) || y0) then speed-=speed_down; + + if (direction-point_direction(x,y,target_x,target_y)<=2) and (direction-point_direction(x,y,target_x,target_y)>=-2){ + if (paction="turn") then paction="move"; + if (paction="attack_turn") then paction="attack_move"; + } + } - if (paction="attack_move") and (instance_exists(obj_en_ship)){ - if (!instance_exists(target)){ - target=instance_nearest(x,y,obj_en_ship); + + if (paction="move") or (paction="attack_move"){ + direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); + target_distance=point_distance(x,y,target_x,target_y); + + if( (y>target_y) || y20) and (speed<(max_speed)) then speed+=speed_up; + if (target_distance<=20) and (speed>0){ paction=""; action="attack"; } } - - if (dist>20) and (speed<(max_speed)) then speed+=speed_up; - if (dist<=20) and (speed>0){ - paction=""; - action="attack"; - } } if (speed<0) then speed=speed*0.9; - if (turret_cool>0) then turret_cool-=1; + if (turret_cool>0){ + turret_cool-=1; + } - var bull, targe, rdir, dirr, dist, xx, yy, ok; - targe=0;rdir=0;dirr="";dist=9999;xx=x;yy=y; + var bull, targe, rdir, dirr, target_distance, xx, yy, ok; + targe=0;rdir=0;dirr="";target_distance=9999;xx=x;yy=y; if (turrets>0) and (instance_exists(obj_en_in)) and (turret_cool=0){ targe=instance_nearest(x,y,obj_en_in); - if (instance_exists(targe)) then dist=point_distance(x,y,targe.x,targe.y); + if (instance_exists(targe)) then target_distance=point_distance(x,y,targe.x,targe.y); - if (dist>64) and (dist<300){ + if (target_distance>64) and (target_distance<300){ bull=instance_create(x,y,obj_p_round); bull.direction=point_direction(x,y,targe.x,targe.y); bull.speed=20; diff --git a/objects/obj_p_th/Step_0.gml b/objects/obj_p_th/Step_0.gml index 5be27e00c0..54c0ad010c 100644 --- a/objects/obj_p_th/Step_0.gml +++ b/objects/obj_p_th/Step_0.gml @@ -3,19 +3,19 @@ image_angle=direction; if (cooldown1>0) then cooldown1-=1; -var dist, range; +var target_distance, range; if (instance_exists(target)){ - dist=point_distance(x,y,target.x,target.y); + target_distance=point_distance(x,y,target.x,target.y); range=100+max(sprite_get_width(target.sprite_index),sprite_get_height(target.sprite_index)); if (action="close"){speed=4;direction=turn_towards_point(direction,x,y,target.x,target.y,8);} - if (dist100) and (action="close") then action="shoot"; - if (action="shoot") and (dist>range) then action="close"; - if (dist<80) and (action="shoot") then action="bank"; + if (target_distance100) and (action="close") then action="shoot"; + if (action="shoot") and (target_distance>range) then action="close"; + if (target_distance<80) and (action="shoot") then action="bank"; if (action="bank") then direction=turn_towards_point(direction,x,y,0,room_height/2,4); - if (action="bank") and (dist>300) then action="close"; + if (action="bank") and (target_distance>300) then action="close"; if (action="shoot") and (cooldown1<=0){ diff --git a/objects/obj_pnunit/Alarm_0.gml b/objects/obj_pnunit/Alarm_0.gml index 293a1c15b1..c3974e4e19 100644 --- a/objects/obj_pnunit/Alarm_0.gml +++ b/objects/obj_pnunit/Alarm_0.gml @@ -25,7 +25,7 @@ try { var once_only;once_only=0; var range_shoot=""; - var dist=point_distance(x,y,enemy.x,enemy.y)/10; + var target_distance=point_distance(x,y,enemy.x,enemy.y)/10; //* Psychic power buffs for (var i = 0; i < array_length(unit_struct); i++) { @@ -69,12 +69,12 @@ try { } - if (range[i]>=dist) and (ammo[i]!=0 || range[i]==1){ + if (range[i]>=target_distance) and (ammo[i]!=0 || range[i]==1){ if (range[i]!=1) and (engaged=0) then range_shoot="ranged"; if ((range[i]!=floor(range[i]) || floor(range[i])=1) && engaged=1) then range_shoot="melee"; } - if (range_shoot="ranged") and (range[i]>=dist){// Weapon meets preliminary checks + if (range_shoot="ranged") and (range[i]>=target_distance){// Weapon meets preliminary checks var ap=0; if (apa[i]>att[i]) then ap=1;// Determines if it is AP or not if (wep[i]="Missile Launcher") then ap=1; diff --git a/objects/obj_star_select/Draw_64.gml b/objects/obj_star_select/Draw_64.gml index 5ccdb4a11d..cd6cbf7ad8 100644 --- a/objects/obj_star_select/Draw_64.gml +++ b/objects/obj_star_select/Draw_64.gml @@ -24,8 +24,8 @@ if (loading=1){ xx=xx; yy=yy; } else if (loading==1){ - var temp1, dist; - dist=999; + var temp1, target_distance; + target_distance=999; obj_controller.selecting_planet=0; button1=""; diff --git a/objects/obj_star_select/Mouse_50.gml b/objects/obj_star_select/Mouse_50.gml index 6de0dd6a32..5a628812ed 100644 --- a/objects/obj_star_select/Mouse_50.gml +++ b/objects/obj_star_select/Mouse_50.gml @@ -15,10 +15,10 @@ draw_set_color(0); if (obj_controller.menu=60) then exit; -var xx, yy, dist, close; +var xx, yy, target_distance, close; xx=__view_get( e__VW.XView, 0 )+0; yy=__view_get( e__VW.YView, 0 )+0; -dist=999;close=false; +target_distance=999;close=false; diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index ba8af1e12c..4bf3829f7a 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -6,16 +6,16 @@ function point_on_circle(start_x, start_y, radius, angle){ } function combat_acceleration_control(){ - var _start_slowing = start_slowing_telemetry(dist, speed_down); + var _start_slowing = start_slowing_telemetry(target_distance, speed_down); if (_start_slowing){ speed-=speed_down; } else { if (action="attack"){ - if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; + if (target_distance>closing_distance) and (speed<(max_speed)) then speed+=speed_up; } else if (action="broadside"){ - if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; + if (target_distance>closing_distance) and (speed<(max_speed)) then speed+=speed_up; } else if (action="flank"){// flank here - if (dist>o_dist) and (speed<(max_speed)) then speed+=speed_up; + if (target_distance>closing_distance) and (speed<(max_speed)) then speed+=speed_up; } } } @@ -333,7 +333,7 @@ function fire_ship_weapon(wep_id){ */ if (facing="special") then ok=2; if (!instance_exists(targe)) then exit; - dist=point_distance(x,y,targe.x,targe.y); + target_distance=point_distance(x,y,targe.x,targe.y); if (facing="right") and (point_direction(x,y,target_r.x,target_r.y)<337) and (point_direction(x,y,target_r.x,target_r.y)>203) then ok=2; if (facing="left") and (point_direction(x,y,target_r.x,target_r.y)>22) and (point_direction(x,y,target_r.x,target_r.y)<157) then ok=2; @@ -344,7 +344,7 @@ function fire_ship_weapon(wep_id){ - if (ok=2) and (dist<(range+(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))))){ + if (ok=2) and (target_distance<(range+(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))))){ if (ammo>0) and (ammo<900) then ammo-=1; weapon_ammo[wep_id]=ammo; cooldown[wep_id]=weapon_cooldown[wep_id]; diff --git a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml index e4bba6fb7a..64ecf5ad35 100644 --- a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml +++ b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml @@ -661,7 +661,7 @@ function position_ships_and_assign_stats(){ if (owner = eFACTION.Ork) or (owner = eFACTION.Chaos){// This is spew out random ships without regard for formations - var xx = 0,yy = 0,dist = 0,targ = 0,numb = 0,man = 0; + var xx = 0,yy = 0,target_distance = 0,targ = 0,numb = 0,man = 0; var i; i=0; diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index 085441ed4c..72d8462525 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -1012,9 +1012,9 @@ function fleet_respond_crusade(){ var min_dist = 40; var to_ignore = [eFACTION.Imperium, eFACTION.Mechanicus,eFACTION.Inquisition, eFACTION.Ecclesiarchy]; - var dist = point_distance(x,y,ns.x,ns.y) + var target_distance = point_distance(x,y,ns.x,ns.y) var valid_target = !array_contains_ext(ns.p_owner, to_ignore, false) - if valid_target and dist <= max_dist and dist >= min_dist and (owner = eFACTION.Imperium) + if valid_target and target_distance <= max_dist and target_distance >= min_dist and (owner = eFACTION.Imperium) then ok = true; // if ((ns.owner>5) or (ns.owner = eFACTION.Player)) and (point_distance(x,y,ns.x,ns.y)<=max_dis) and (point_distance(x,y,ns.x,ns.y)>40) and (owner = eFACTION.Imperium){ diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index 33c3667cc0..26343f6bed 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -239,6 +239,10 @@ function assign_ship_stats(){ rear_armour = 1; shields_recharge_rate = 0.2; shields_reboot_time = 20; + max_speed = 20; + speed_up = 0.008; + speed_down = 0.004; + turning_speed = 0.2; if (class="Apocalypse Class Battleship"){ sprite_index=spr_ship_apoc; ship_size=3; @@ -255,6 +259,7 @@ function assign_ship_stats(){ capacity=150; carrying=0; max_speed = 20; + turning_speed = 0.23; add_weapon_to_ship("Lance Battery", {facing:"left"}); add_weapon_to_ship("Lance Battery", {facing:"right"}); add_weapon_to_ship("Nova Cannon"); diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index 7174ddf728..9fc6d517e3 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -85,7 +85,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ var _direction = point_direction(_bul_x,_bul_y, target.x,target.y); if (accuracy < 100){ - _direction += ((100-accuracy) * random_range(-1,1)); + _direction += ((100-accuracy) * random_range(-0.5,5)); } repeat(barrel_count){ var _bullet_qualities = { From 17a2e595a1f469d08bc85612faca57c60438b515 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 7 Jun 2025 18:41:26 +0100 Subject: [PATCH 093/155] fix acceleration and targetting --- objects/obj_en_ship/Draw_0.gml | 7 ++++++- objects/obj_en_ship/Step_0.gml | 4 +--- objects/obj_p_ship/Step_0.gml | 19 ++++++++++++++--- .../scr_automated_ship_combat_functions.gml | 21 ++++++++++++++----- .../scr_ship_weapon_struct.gml | 4 ++-- 5 files changed, 41 insertions(+), 14 deletions(-) diff --git a/objects/obj_en_ship/Draw_0.gml b/objects/obj_en_ship/Draw_0.gml index 8d5f66a0e1..ca652b88b8 100644 --- a/objects/obj_en_ship/Draw_0.gml +++ b/objects/obj_en_ship/Draw_0.gml @@ -14,7 +14,12 @@ draw_set_halign(fa_center); draw_set_alpha(1); - +if (point_distance(x, y, mouse_x, mouse_y)< 50){ + for (var i=0;i01) and (instance_exists(target)){ draw_set_color(c_lime); lightning-=1; diff --git a/objects/obj_en_ship/Step_0.gml b/objects/obj_en_ship/Step_0.gml index 809dba3a39..45e1b81f71 100644 --- a/objects/obj_en_ship/Step_0.gml +++ b/objects/obj_en_ship/Step_0.gml @@ -84,11 +84,9 @@ if (hp>0) and (instance_exists(obj_p_ship)){ // if (class!="big") then flank!!!! - closing_distance = closing_distance; spid=spid*speed_bonus; target_distance=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - target_distance = target_distance; if (target!=0) and (action="attack"){ direction=turn_towards_point(direction,x,y,target.x,target.y,.1); @@ -98,7 +96,7 @@ if (hp>0) and (instance_exists(obj_p_ship)){ speed_down = 0.025; - combat_acceleration_control(); + combat_acceleration_control(); if (speed<0) then speed=speed*0.9; diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index f7e022cfc0..a77ced2f26 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -85,7 +85,18 @@ if (hp>0) and (instance_exists(target)){ action="flank"; } - closing_distance = closing_distance; + if (action = "flank" && target.action == "flank"){ + action = "attack"; + } + + if (action == "broadside"){ + var _near_enemy = instance_nearest(obj_en_ship); + if (instance_nearest(obj_en_ship).size >= size){ + target = _near_enemy; + } + } + + show_debug_message($"closing:{closing_distance}"); // if (class!="big") then flank!!!! @@ -97,6 +108,7 @@ if (hp>0) and (instance_exists(target)){ turning_speed = ship_data.calc_turn_speed(); speed_up = ship_data.final_acceleration(); + show_debug_message($"accel:{speed_up}"); speed_down = ship_data.deceleration(); @@ -116,13 +128,14 @@ if (hp>0) and (instance_exists(target)){ } if (!_player_action){ + show_debug_message($"accelcalcs"); combat_acceleration_control(); } if (_player_action){ if (paction="turn") or (paction="attack_turn"){ direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); target_distance=point_distance(x,y,target_x,target_y); - if ((y>target_y) || ytarget_y || y0) then speed-=speed_down; @@ -138,7 +151,7 @@ if (hp>0) and (instance_exists(target)){ direction=turn_towards_point(direction,x,y,target_x,target_y,turning_speed/2); target_distance=point_distance(x,y,target_x,target_y); - if( (y>target_y) || ytarget_y || yclosing_distance) and (speed<(max_speed)) then speed+=speed_up; - } else if (action="broadside"){ + } else if (action=="broadside"){ if (target_distance>closing_distance) and (speed<(max_speed)) then speed+=speed_up; - } else if (action="flank"){// flank here + } else if (action=="flank"){// flank here if (target_distance>closing_distance) and (speed<(max_speed)) then speed+=speed_up; - } + }*/ + //if (object_index==obj_p_ship){ + //show_debug_message($"end_speed{speed}, {max_speed}"); + //} } } /*function circle_mechanics(end_location){ diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index 9fc6d517e3..e4b671da16 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -249,7 +249,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ draw_line(x, y, target.x, target.y); } } - static draw_weapon_firing_arc = function(){ + static draw_weapon_firing_arc = function(arc_col = CM_GREEN_COLOR){ var _tangent_direction = weapon_direction(); var _facing = facing @@ -265,7 +265,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ if (facing == "most"){ firing_arc = 110; } - draw_set_color(38144); + draw_set_color(arc_col); var _start_x = x + lengthdir_x(_max_distance, _tangent_direction - firing_arc); var _start_y = y + lengthdir_y(_max_distance, _tangent_direction - firing_arc); From 050d7d13af4bb78e1e3a07573b4b957689fa14fb Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 7 Jun 2025 21:22:35 +0100 Subject: [PATCH 094/155] more variable naming --- objects/obj_al_ship/Step_0.gml | 4 +- objects/obj_en_ship/Create_0.gml | 2 +- objects/obj_en_ship/Step_0.gml | 6 +- objects/obj_p_ship/Create_0.gml | 1 + objects/obj_p_ship/Step_0.gml | 4 +- .../scr_player_fleet_combat_functions.gml | 17 ++--- .../scr_ship_combat_data.gml | 59 +++++++++-------- .../scr_ship_weapon_struct.gml | 66 ++++++++----------- .../scr_tyranid_fleet_functions.gml | 8 +-- 9 files changed, 83 insertions(+), 84 deletions(-) diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index c2895a8dd4..a9d1c0cda6 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -277,11 +277,11 @@ if (__b__){ target_distance=point_distance(x,y,target.x,target.y); if (action=="swoop"){ - direction=turn_towards_point(direction,x,y,target.x,target.y,5-ship_size); + direction=turn_towards_point(direction,x,y,target.x,target.y,5-size); } if (target_distance<=closing_distance) and (collision_line(x,y,x+lengthdir_x(closing_distance,direction),y+lengthdir_y(closing_distance,direction),obj_en_ship,0,1)) then action="attack"; if (target_distance<300) and (action=="attack") then action="bank"; - if (action=="bank") then direction=turn_towards_point(direction,x,y,room_width,room_height/2,5-ship_size); + if (action=="bank") then direction=turn_towards_point(direction,x,y,room_width,room_height/2,5-size); if (action=="bank") and (target_distance>700){ action="attack"; } diff --git a/objects/obj_en_ship/Create_0.gml b/objects/obj_en_ship/Create_0.gml index 8bc816ed9b..2f3f9cdfca 100644 --- a/objects/obj_en_ship/Create_0.gml +++ b/objects/obj_en_ship/Create_0.gml @@ -29,7 +29,7 @@ turret_cool=0; name=""; class=""; -size=0; +size=1; hp=0; maxhp=0; conditions=""; diff --git a/objects/obj_en_ship/Step_0.gml b/objects/obj_en_ship/Step_0.gml index 45e1b81f71..e46bc3b8f5 100644 --- a/objects/obj_en_ship/Step_0.gml +++ b/objects/obj_en_ship/Step_0.gml @@ -78,7 +78,7 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (class="Jackal Class"){closing_distance=200;action="attack";spid=40;} if (class="Dirge Class"){closing_distance=200;action="attack";spid=45;} - if (ship_size==1){ + if (size==1){ action = "flank"; } @@ -200,10 +200,10 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (instance_exists(target)){ target_distance=point_distance(x,y,target.x,target.y); - if (action="swoop"){direction=turn_towards_point(direction,x,y,target.x,target.y,5-ship_size);} + if (action="swoop"){direction=turn_towards_point(direction,x,y,target.x,target.y,5-size);} if (target_distance<=closing_distance) and (collision_line(x,y,x+lengthdir_x(closing_distance,direction),y+lengthdir_y(closing_distance,direction),obj_p_ship,0,1)) then action="attack"; if (target_distance<300) and (action="attack") then action="bank"; - if (action="bank") then direction=turn_towards_point(direction,x,y,room_width,room_height/2,5-ship_size); + if (action="bank") then direction=turn_towards_point(direction,x,y,room_width,room_height/2,5-size); if (action="bank") and (target_distance>700) then action="attack"; } } diff --git a/objects/obj_p_ship/Create_0.gml b/objects/obj_p_ship/Create_0.gml index f7019c1d0a..8283a72e98 100644 --- a/objects/obj_p_ship/Create_0.gml +++ b/objects/obj_p_ship/Create_0.gml @@ -41,6 +41,7 @@ board_frigate=false; name=""; class=""; hp=0; +size = 1; maxhp=0; conditions=""; shields=1; diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index a77ced2f26..701595446e 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -90,8 +90,8 @@ if (hp>0) and (instance_exists(target)){ } if (action == "broadside"){ - var _near_enemy = instance_nearest(obj_en_ship); - if (instance_nearest(obj_en_ship).size >= size){ + var _near_enemy = instance_nearest(x,y,obj_en_ship); + if (_near_enemy.size >= size){ target = _near_enemy; } } diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index da2596b9f9..b226085efa 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -33,14 +33,14 @@ function sort_ships_into_columns(combat){ for (var k = 0;k0;col--){ - if ((combat.column[col]="capital" || _ship.size>=3)){ - combat.column_num[col]+=1; + if ((combat.column[col]="capital" && _ship.size>=3)){ + combat.column_num[col]++; } - if (_ship.class=combat.column[col]){ - combat.column_num[col]+=1; + else if (combat.column[col]=="frigate"&& _ship.size==2){ + combat.column_num[col]++; } - if ((combat.column[col]="escort" ||_ship.size=1)){ - combat.column_num[col]+=1; + else if ((combat.column[col]=="escort" && _ship.size==1)){ + combat.column_num[col]++; } } } @@ -182,8 +182,9 @@ function setup_player_combat_ship(){ name=ship_data.name; class=ship_data.class; - hp=ship_data.hp - maxhp=ship_data.max_hp + hp=ship_data.hp; + size = ship_data.size; + maxhp=ship_data.max_hp; shields=ship_data.shields*100; maxshields=shields; armour_front = ship_data.front_armour; diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index 26343f6bed..23b74835f8 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -230,6 +230,11 @@ function facing_weapon_angle(facing){ default: break; } + if (_direct_ > 360){ + _direct_-=360; + } else if (_direct_< 0){ + _direct_ +=360; + } return _direct_; } @@ -245,7 +250,7 @@ function assign_ship_stats(){ turning_speed = 0.2; if (class="Apocalypse Class Battleship"){ sprite_index=spr_ship_apoc; - ship_size=3; + size=3; name=""; hp=1200; maxhp=1200; @@ -269,7 +274,7 @@ function assign_ship_stats(){ if (class="Nemesis Class Fleet Carrier"){ sprite_index=spr_ship_nem; - ship_size=3; + size=3; name=""; hp=1000; maxhp=1000; @@ -291,7 +296,7 @@ function assign_ship_stats(){ if (class="Avenger Class Grand Cruiser"){ sprite_index=spr_ship_aven; - ship_size=2; + size=2; name=""; hp=1000; maxhp=1000; @@ -311,7 +316,7 @@ function assign_ship_stats(){ if (class="Sword Class Frigate"){ sprite_index=spr_ship_sword; - ship_size=1; + size=1; name=""; hp=100; maxhp=100; @@ -334,7 +339,7 @@ function assign_ship_stats(){ if (class="Void Stalker"){ sprite_index=spr_ship_void; - ship_size=3; + size=3; name=""; hp=1000; maxhp=1000; @@ -355,7 +360,7 @@ function assign_ship_stats(){ if (class="Shadow Class"){ sprite_index=spr_ship_shadow; - ship_size=3; + size=3; name=""; hp=600; maxhp=600; @@ -375,7 +380,7 @@ function assign_ship_stats(){ if (class="Hellebore"){ sprite_index=spr_ship_hellebore; - ship_size=1; + size=1; name=""; hp=200; maxhp=200; @@ -398,7 +403,7 @@ function assign_ship_stats(){ if (class="Aconite"){sprite_index=spr_ship_aconite; sprite_index=spr_ship_aconite; - ship_size=1; + size=1; name=""; hp=200; maxhp=200; @@ -422,7 +427,7 @@ function assign_ship_stats(){ if (class="Dethdeala"){ sprite_index=spr_ship_deth; - ship_size=3; + size=3; name=""; hp=1200; maxhp=1200; @@ -446,7 +451,7 @@ function assign_ship_stats(){ if (class="Gorbag's Revenge"){ sprite_index=spr_ship_gorbag; - ship_size=3; + size=3; name=""; hp=1200; maxhp=1200; @@ -468,7 +473,7 @@ function assign_ship_stats(){ } if (class=="Kroolboy") or (class=="Slamblasta"){ - ship_size=3; + size=3; sprite_index=spr_ship_krool; if (class=="Kroolboy") then sprite_index=spr_ship_krool; if (class=="Slamblasta") then sprite_index=spr_ship_slam; @@ -491,7 +496,7 @@ function assign_ship_stats(){ }else if (class=="Battlekroozer"){ sprite_index=spr_ship_kroozer; - ship_size=3; + size=3; name=""; hp=1000; maxhp=1000; @@ -512,7 +517,7 @@ function assign_ship_stats(){ }else if (class=="Ravager"){ sprite_index=spr_ship_ravager; - ship_size=1; + size=1; name=""; hp=100; maxhp=100; @@ -531,7 +536,7 @@ function assign_ship_stats(){ // ** Tau ** if (class=="Custodian"){ sprite_index=spr_ship_custodian; - ship_size=3; + size=3; name=""; hp=1000; maxhp=1000; @@ -552,7 +557,7 @@ function assign_ship_stats(){ }else if (class=="Protector"){ sprite_index=spr_ship_protector; - ship_size=2; + size=2; name=""; hp=600; maxhp=600; @@ -572,7 +577,7 @@ function assign_ship_stats(){ }else if (class=="Emissary"){ sprite_index=spr_ship_emissary; - ship_size=2; + size=2; name=""; hp=400; maxhp=400; @@ -592,7 +597,7 @@ function assign_ship_stats(){ }else if (class=="Warden"){ sprite_index=spr_ship_warden; - ship_size=1; + size=1; name="";hp=100; maxhp=100; conditions=""; @@ -610,7 +615,7 @@ function assign_ship_stats(){ }else if (class=="Castellan"){ sprite_index=spr_ship_castellan; - ship_size=1; + size=1; name=""; hp=100; maxhp=100; @@ -629,7 +634,7 @@ function assign_ship_stats(){ // ** Chaos ** if (class=="Desecrator"){ sprite_index=spr_ship_dese; - ship_size=3; + size=3; name=""; hp=1200; maxhp=1200; @@ -652,7 +657,7 @@ function assign_ship_stats(){ if (class="Avenger"){ sprite_index=spr_ship_veng; - ship_size=2; + size=2; name=""; hp=1000; maxhp=1000; @@ -672,7 +677,7 @@ function assign_ship_stats(){ if (class="Carnage") or (class="Daemon"){ sprite_index=spr_ship_carnage; - ship_size=2; + size=2; name=""; hp=1000; maxhp=1000; @@ -699,7 +704,7 @@ function assign_ship_stats(){ if (class="Iconoclast"){ sprite_index=spr_ship_icono; sprite_index=spr_ship_icono; - ship_size=1; + size=1; name=""; hp=100; maxhp=100; @@ -724,7 +729,7 @@ function assign_ship_stats(){ // Necrons if (class="Cairn Class"){ sprite_index=spr_ship_cairn; - ship_size=3; + size=3; name=""; hp=1100; @@ -753,7 +758,7 @@ function assign_ship_stats(){ } if (class="Reaper Class"){sprite_index=spr_ship_reaper; - ship_size=3; + size=3; name=""; hp=900; @@ -775,7 +780,7 @@ function assign_ship_stats(){ } - if (class="Shroud Class"){ship_size=2; + if (class="Shroud Class"){size=2; sprite_index=spr_ship_shroud; name=""; @@ -797,7 +802,7 @@ function assign_ship_stats(){ } if (class="Jackal Class"){ - ship_size=2; + size=2; sprite_index=spr_ship_jackal; name=""; @@ -819,7 +824,7 @@ function assign_ship_stats(){ } if (class="Dirge Class"){ - ship_size=2; + size=2; sprite_index=spr_ship_dirge; name=""; diff --git a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml index e4b671da16..fdc1e77ad4 100644 --- a/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml +++ b/scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.gml @@ -61,19 +61,16 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ with (ship){ _tangent_direction = facing_weapon_angle(_facing); } - return _tangent_direction; } + + static create_projectile = function(){ var _bullet = -1; - var _tangent_direction = weapon_direction(); var _bul_x = x var barrel_offset = 32; var _bul_y = y - if (barrel_count> 1){ - var barrel_offset = -20*(barrel_offset/2); - } if (bullet_obj==obj_en_round){ if (ship.ai_type = "player" ){ @@ -85,35 +82,34 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ var _direction = point_direction(_bul_x,_bul_y, target.x,target.y); if (accuracy < 100){ - _direction += ((100-accuracy) * random_range(-0.5,5)); + _direction += ((100-accuracy) * random_range(-0.5,0.5)); } - repeat(barrel_count){ - var _bullet_qualities = { - speed : bullet_speed, - dam : dam, - image_xscale : draw_scale, - image_yscale : draw_scale, - direction : _direction, - target : target, - target_x:target.x, - target_y:target.y, - sprite_index : img, - explosion_sprite : explosion_sprite, - } - _bullet = instance_create_layer( - _bul_x, - _bul_y, - layer_get_all()[0], - bullet_obj - ); - with (_bullet){ - move_data_to_current_scope(_bullet_qualities); - } - array_push(target.bullets_for, _bullet.id); - barrel_offset+=20 - _bul_y = ship.y+lengthdir_y(barrel_offset,_tangent_direction); - } + var _bullet_qualities = { + speed : bullet_speed, + dam : dam, + image_xscale : draw_scale, + image_yscale : draw_scale, + direction : _direction, + target : target, + target_x:target.x, + target_y:target.y, + sprite_index : img, + explosion_sprite : explosion_sprite, + } + + _bullet = instance_create_layer( + _bul_x, + _bul_y, + layer_get_all()[0], + bullet_obj + ); + with (_bullet){ + move_data_to_current_scope(_bullet_qualities); + } + array_push(target.bullets_for, _bullet.id); + barrel_offset+=20 + } static fire = function(){ if (cooldown_timer > 0){ @@ -176,11 +172,7 @@ function ShipWeapon(weapon_name, overide_data={}) constructor{ static find_target = function(){ calc_gun_position(); var _shoot_angle = weapon_direction(); - if (_shoot_angle > 360){ - _shoot_angle -= 360; - } else if (_shoot_angle< 0){ - _shoot_angle = 360 -_shoot_angle; - } + if (ship.ai_type == "player" || ship.ai_type == "allies"){ var _enemies = instance_number(obj_en_ship); diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index cb94ddd24b..0b04770657 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -292,7 +292,7 @@ function organise_tyranid_fleet_bio(){ function set_nid_ships(){ if (class=="Leviathan"){ sprite_index=spr_ship_leviathan; - ship_size=3; + size=3; name=""; hp=1000; maxhp=1000; @@ -329,7 +329,7 @@ function set_nid_ships(){ }else if (class=="Razorfiend"){ sprite_index=spr_ship_razorfiend; - ship_size=2; + size=2; name=""; hp=600; maxhp=600; @@ -351,7 +351,7 @@ function set_nid_ships(){ }else if (class=="Stalker"){ sprite_index=spr_ship_stalker; - ship_size=1; + size=1; name=""; hp=100; maxhp=100; @@ -373,7 +373,7 @@ function set_nid_ships(){ }else if (class=="Prowler"){ sprite_index=spr_ship_prowler; - ship_size=1; + size=1; name=""; hp=100; maxhp=100; From c93c87e35d3d63795b82d8afde74f5ba48ea03b2 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 8 Jun 2025 01:52:25 +0100 Subject: [PATCH 095/155] fix cult spawning and remove another alarm --- objects/obj_controller/Alarm_3.gml | 1 - .../scr_array_functions.gml | 6 ++ .../scr_planet_setup_functions.gml | 79 ++++++++++--------- scripts/scr_system_spawn/scr_system_spawn.gml | 9 +-- 4 files changed, 51 insertions(+), 44 deletions(-) delete mode 100644 objects/obj_controller/Alarm_3.gml diff --git a/objects/obj_controller/Alarm_3.gml b/objects/obj_controller/Alarm_3.gml deleted file mode 100644 index 04923e0c04..0000000000 --- a/objects/obj_controller/Alarm_3.gml +++ /dev/null @@ -1 +0,0 @@ -script_execute(scr_income,0,0,0,0,0); diff --git a/scripts/scr_array_functions/scr_array_functions.gml b/scripts/scr_array_functions/scr_array_functions.gml index c62271e7c1..b8499f6935 100644 --- a/scripts/scr_array_functions/scr_array_functions.gml +++ b/scripts/scr_array_functions/scr_array_functions.gml @@ -74,6 +74,12 @@ function array_random_element(choice_array){ return choice_array[irandom(array_length(choice_array) - 1)]; } +function array_pop_random(choice_array){ + var i = array_random_index(choice_array); + var _item = choice_array[i]; + array_delete(choice_array, i, 1); + return _item; +} function array_random_index(choice_array){ return irandom(array_length(choice_array) - 1); } diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml index 9a9da3ae01..731626b4f4 100644 --- a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -56,6 +56,45 @@ function setup_chaos_world(star, planet){ } } + +function setup_sisters_world(star, planet){ + var _p = planet; + with (star){ + p_owner[_p]=5; + p_first[_p]=5; + p_sisters[_p]=4; + adjust_influence(eFACTION.Ecclesiarchy, (p_sisters[_p]*10)-irandom(5), _p); + } +} + +function setup_genecult_infestation(){ + var _planets = shuffled_planet_array(); + var _culted = false; + for (var i = 0; i < planets; i++) { + var _planet = _planets[i]; + if (!_culted){ + _add_cult = true + } else { + _add_cult = irandom(1); + } + if (_add_cult){ + if (p_population[_planet] > 0) { + _culted = true; + var new_cult = new PlanetFeature(P_features.Gene_Stealer_Cult); + array_push(p_feature[_planet], new_cult); + new_cult.cult_age = irandom(300) + p_influence[_planet][eFACTION.Tyranids] = new_cult.cult_age/10 + irandom(30); + p_tyranids[_planet] = min(3, floor(p_influence[_planet][eFACTION.Tyranids]/15)) + if (p_tyranids[_planet]!=0){ + new_cult.hiding = false; + } + } + } + p_owner[_planet] = 2; + } + owner = 2; +} + function setup_star_planet_defualts(){ // the min population of a planet is usually 1/3 of the max. so lava has 1500 max. min is 500. min + random should = max // its important to know the population of a planet due to recruitment changing depending on population max @@ -350,38 +389,7 @@ function setup_star_planet_defualts(){ } // Create Nids if (owner == eFACTION.Tyranids){ - for (var i = 1; i <= planets; i++) { - if (p_population[i] > 0) { - p_tyranids[i] = 1; - - switch (p_type[i]) { - case "Forge": - case "Hive": - p_tyranids[i] = choose(4,5,5); - break; - } - //array_push(p_feature[i], new PlanetFeature(P_features.Gene_Stealer_Cult)); - - } - p_owner[i] = eFACTION.Imperium; - } - } - - if (owner>20){ - for (var i = 1; i <= planets; i++) { - if (p_population[i] > 0) { - var new_cult = new PlanetFeature(P_features.Gene_Stealer_Cult); - array_push(p_feature[i], new_cult); - new_cult.cult_age = irandom(300) - p_influence[i][eFACTION.Tyranids] = new_cult.cult_age/10 + irandom(30); - p_tyranids[i] = min(3, floor(p_influence[i][eFACTION.Tyranids]/15)) - if (p_tyranids[i]!=0){ - new_cult.hiding =false; - } - } - p_owner[i] = 2; - } - owner = eFACTION.Tyranids; + setup_genecult_infestation(); } for(var i=1; i<=planets; i++){ @@ -390,10 +398,7 @@ function setup_star_planet_defualts(){ p_guardsmen[i]=0; } if (p_type[i]="Shrine") and (p_owner[i]!=1) and (p_first[i]!=1){ - p_owner[i]=5; - p_first[i]=5; - p_sisters[i]=4; - adjust_influence(eFACTION.Ecclesiarchy, (p_sisters[i]*10)-irandom(5), i); + setup_sisters_world(self, i); } // if (p_owner[i]=3) or (p_owner[i]=5){p_feature[i]="Artifact|";}Testing ; 137 } @@ -407,7 +412,7 @@ function setup_star_planet_defualts(){ } } - obj_controller.alarm[3]=1; + wait_and_excecute(1,scr_income,[],obj_controller); var i=choose(0,1); if (i==1) and (planets>0){ diff --git a/scripts/scr_system_spawn/scr_system_spawn.gml b/scripts/scr_system_spawn/scr_system_spawn.gml index 8793cf477e..8f8a689a47 100644 --- a/scripts/scr_system_spawn/scr_system_spawn.gml +++ b/scripts/scr_system_spawn/scr_system_spawn.gml @@ -414,6 +414,7 @@ if (did){ } + //seeds genestealer cults if (field=="both"){ if (obj_ini.fleet_type==ePlayerBase.penitent){ orkz+=3; @@ -422,12 +423,8 @@ if (did){ n=array_length(_non_xenos_chaos); for (var j=0; j Date: Sun, 8 Jun 2025 02:21:35 +0100 Subject: [PATCH 096/155] update economy --- objects/obj_star/Alarm_2.gml | 23 ------ scripts/scr_income/scr_income.gml | 73 ++++++++++--------- .../scr_system_search_helpers.gml | 17 ++++- 3 files changed, 53 insertions(+), 60 deletions(-) delete mode 100644 objects/obj_star/Alarm_2.gml diff --git a/objects/obj_star/Alarm_2.gml b/objects/obj_star/Alarm_2.gml deleted file mode 100644 index 72e0de1e8e..0000000000 --- a/objects/obj_star/Alarm_2.gml +++ /dev/null @@ -1,23 +0,0 @@ -// Assigns the income to the player system based on its neighbours -if (instance_exists(obj_temp1)){ - var tempy=0,tempy_d=9999,biggy=0; - - tempy=instance_nearest(x,y,obj_temp1); - tempy_d=point_distance(x,y,tempy.x,tempy.y); - - // Nearby star system - if (tempy_d>10) and (tempy_d<=180){ - for(var i=1; i<=planets; i++){ - if (p_type[i]=="Forge") and (p_owner[i]==3) then obj_controller.income_forge+=6; - if (p_type[i]=="Agri") and (p_owner[i]==2) then obj_controller.income_agri+=3; - } - } - biggy=instance_nearest(obj_temp1.x,obj_temp1.y,obj_star); - var connected = determine_warp_join(biggy, self.id); - if (biggy.owner==eFACTION.Player) and (tempy_d>180) and (connected){ - for(var i=1; i<=planets; i++){ - if (p_type[i]=="Forge") and (p_owner[i]==3) then obj_controller.income_forge+=6; - if (p_type[i]=="Agri") and (p_owner[i]==2) then obj_controller.income_agri+=3; - } - } -} diff --git a/scripts/scr_income/scr_income.gml b/scripts/scr_income/scr_income.gml index 3f83c2f510..88dcc022bc 100644 --- a/scripts/scr_income/scr_income.gml +++ b/scripts/scr_income/scr_income.gml @@ -28,46 +28,46 @@ function scr_income() { } } - if (training_apothecary=1) then income_training-=1; - if (training_apothecary=2) then income_training-=2; - if (training_apothecary=3) then income_training-=3; - if (training_apothecary=4) then income_training-=4; - if (training_apothecary=5) then income_training-=6; - if (training_apothecary=6) then income_training-=12; - - if (training_chaplain=1) then income_training-=1; - if (training_chaplain=2) then income_training-=2; - if (training_chaplain=3) then income_training-=3; - if (training_chaplain=4) then income_training-=4; - if (training_chaplain=5) then income_training-=6; - if (training_chaplain=6) then income_training-=12; - - if (training_psyker=1) then income_training-=1; - if (training_psyker=2) then income_training-=2; - if (training_psyker=3) then income_training-=3; - if (training_psyker=4) then income_training-=4; - if (training_psyker=5) then income_training-=6; - if (training_psyker=6) then income_training-=12; - - if (training_techmarine=1) then income_training-=1; - if (training_techmarine=2) then income_training-=2; - if (training_techmarine=3) then income_training-=3; - if (training_techmarine=4) then income_training-=4; - if (training_techmarine=5) then income_training-=6; - if (training_techmarine=6) then income_training-=12; - - tau_stars=0;if (instance_exists(obj_turn_end)) then tau_messenger+=1; + static training_cost_chart = [0,1,2,3,4,6,12]; + + var training_sets = [training_apothecary,training_chaplain,training_psyker,training_techmarine]; + for (var i=0;i 0 && training_sets[i] < 7){ + income_training -=training_sets[training_sets[i]]; + } + } + + tau_stars=0; + if (instance_exists(obj_turn_end)) then tau_messenger+=1; if (obj_ini.fleet_type=ePlayerBase.home_world){ with(obj_star){ - if (planet_feature_bool(p_feature[1], P_features.Monastery)==1){obj_controller.income+=10;instance_create(x,y,obj_temp1);} - if (planet_feature_bool(p_feature[2], P_features.Monastery)==1){obj_controller.income+=10;instance_create(x,y,obj_temp1);} - if (owner = eFACTION.Tau) then obj_controller.tau_stars+=1; - alarm[2]=1; + if (system_feature_bool(P_features.Monastery)){ + obj_controller.income+=10; + var _joined = nearest_warp_joined(self); + if (_joined!="none"){ + with (_joined){ + for(var i=1; i<=planets; i++){ + if (p_type[i]=="Forge") and (p_owner[i]==3) then obj_controller.income_forge+=6; + if (p_type[i]=="Agri") and (p_owner[i]==2) then obj_controller.income_agri+=3; + } + } + } else { + var _nearest = distance_removed_star(x, y, 1); + if (point_distance(x,y,_nearest.x,_nearest.y) <= 180){ + with (nearest){ + if (p_type[i]=="Forge") and (p_owner[i]==3) then obj_controller.income_forge+=6; + if (p_type[i]=="Agri") and (p_owner[i]==2) then obj_controller.income_agri+=3; + } + } + } + } + if (owner = eFACTION.Tau){ + obj_controller.tau_stars+=1; + } } } - if (obj_ini.fleet_type != ePlayerBase.home_world){ with(obj_p_fleet){ if (action="") and (capital_number>0){ @@ -85,8 +85,9 @@ function scr_income() { with(obj_star){ - var o;o=0; - repeat(4){o+=1; + var o=0; + repeat(planets){ + o+=1; if (dispo[o]>=100){ if (planet_feature_bool(p_feature[1], P_features.Monastery)==0){ obj_controller.income_controlled_planets+=1;obj_controller.income_tribute+=1; diff --git a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml index 69ebb99125..844e53d7e4 100644 --- a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml +++ b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml @@ -244,9 +244,24 @@ function nearest_star_proper(xx,yy) { return "none"; } +function nearest_warp_joined(_start_star){ + var total_stars = instance_number(obj_star); + for (var i=0;i 0){ + instance_activate_object(obj_star); + return _trial_star.id; + } + instance_deactivate_object(id); + } + instance_activate_object(obj_star); + return "none"; +} + function nearest_star_with_ownership(xx,yy, ownership, start_star="none", ignore_dead = true){ - var nearest = "none" + var nearest = "none"; var total_stars = instance_number(obj_star); var i=0; if (!is_array(ownership)){ From a7dcd2f4f03f0cce29acc8509f6c489526a7689e Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 8 Jun 2025 18:40:02 +0100 Subject: [PATCH 097/155] more economy based stuff --- objects/obj_controller/obj_controller.yy | 1 - objects/obj_fleet/Alarm_0.gml | 3 +++ objects/obj_p_ship/obj_p_ship.yy | 2 +- objects/obj_star/obj_star.yy | 1 - scripts/scr_income/scr_income.gml | 20 ++++++++++++++----- .../scr_planet_setup_functions.gml | 2 +- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/objects/obj_controller/obj_controller.yy b/objects/obj_controller/obj_controller.yy index b6ba74300a..dd38870135 100644 --- a/objects/obj_controller/obj_controller.yy +++ b/objects/obj_controller/obj_controller.yy @@ -9,7 +9,6 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":6,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":5,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":84,"eventType":5,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, diff --git a/objects/obj_fleet/Alarm_0.gml b/objects/obj_fleet/Alarm_0.gml index a5c46ed6e7..5cfd277731 100644 --- a/objects/obj_fleet/Alarm_0.gml +++ b/objects/obj_fleet/Alarm_0.gml @@ -7,5 +7,8 @@ start=7; with(obj_controller){ if (zoomed=1) then scr_zoom(); + camera_set_view_size(view_camera[0], room_width, room_height); + x = room_width/2; + y = room_height/2; } diff --git a/objects/obj_p_ship/obj_p_ship.yy b/objects/obj_p_ship/obj_p_ship.yy index 318f3d5449..72aef3cf06 100644 --- a/objects/obj_p_ship/obj_p_ship.yy +++ b/objects/obj_p_ship/obj_p_ship.yy @@ -24,7 +24,7 @@ "physicsGroup":0, "physicsKinematic":false, "physicsLinearDamping":0.1, - "physicsObject":false, + "physicsObject":true, "physicsRestitution":0.1, "physicsSensor":false, "physicsShape":0, diff --git a/objects/obj_star/obj_star.yy b/objects/obj_star/obj_star.yy index d7c5b02f61..48a5509994 100644 --- a/objects/obj_star/obj_star.yy +++ b/objects/obj_star/obj_star.yy @@ -5,7 +5,6 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, diff --git a/scripts/scr_income/scr_income.gml b/scripts/scr_income/scr_income.gml index 88dcc022bc..34710dc2fa 100644 --- a/scripts/scr_income/scr_income.gml +++ b/scripts/scr_income/scr_income.gml @@ -3,11 +3,18 @@ function scr_income() { // Determines income - income_base=32;income_tribute=0;income_controlled_planets=0; - if (obj_ini.fleet_type != ePlayerBase.home_world) then income_base=40; + income_base=32; + + income_tribute=0; + income_controlled_planets=0; + if (obj_ini.fleet_type != ePlayerBase.home_world){ + income_base=40; + } income_home=0; - if (obj_ini.fleet_type=ePlayerBase.home_world) then income_home=8;// Homeworld-based income + if (obj_ini.fleet_type=ePlayerBase.home_world){ + income_home=8;// Homeworld-based income + } income_fleet=0; with(obj_p_fleet){ @@ -15,7 +22,10 @@ function scr_income() { obj_controller.income_fleet-=frigate_number/2; obj_controller.income_fleet-=escort_number/10; } - if (obj_ini.fleet_type = ePlayerBase.home_world) then obj_controller.income_fleet=round(obj_controller.income_fleet/2); + + if (obj_ini.fleet_type = ePlayerBase.home_world){ + obj_controller.income_fleet=round(obj_controller.income_fleet/2); + } income_forge=0; income_agri=0; @@ -42,7 +52,7 @@ function scr_income() { if (obj_ini.fleet_type=ePlayerBase.home_world){ with(obj_star){ - if (system_feature_bool(P_features.Monastery)){ + if (system_feature_bool(p_feature, P_features.Monastery)){ obj_controller.income+=10; var _joined = nearest_warp_joined(self); if (_joined!="none"){ diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml index 731626b4f4..c54ab574c6 100644 --- a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -412,7 +412,7 @@ function setup_star_planet_defualts(){ } } - wait_and_excecute(1,scr_income,[],obj_controller); + wait_and_execute(1,scr_income,[],obj_controller); var i=choose(0,1); if (i==1) and (planets>0){ From ac822acb49b4afcffe8034206d80457ef69c70fe Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 8 Jun 2025 22:37:44 +0100 Subject: [PATCH 098/155] bits and bobs --- ChapterMaster.yyp | 1 + objects/obj_turn_end/Create_0.gml | 1 + objects/obj_turn_end/Draw_0.gml | 175 +---------------- objects/obj_turn_end/Draw_64.gml | 36 +++- objects/obj_turn_end/Mouse_56.gml | 79 +------- .../scr_automated_ship_combat_functions.gml | 4 +- .../scr_end_turn_combat_helpers.gml | 178 ++++++++++++++++++ .../scr_end_turn_combat_helpers.yy | 13 ++ .../scr_enemy_fleet_spawn_combat.gml | 36 ++-- scripts/scr_income/scr_income.gml | 3 + .../scr_ship_combat_data.gml | 21 ++- sprites/spr_purge_panel/spr_purge_panel.yy | 11 +- 12 files changed, 276 insertions(+), 282 deletions(-) create mode 100644 scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml create mode 100644 scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 1265af5000..2f91302993 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -796,6 +796,7 @@ {"id":{"name":"scr_drop_fiddle","path":"scripts/scr_drop_fiddle/scr_drop_fiddle.yy",},}, {"id":{"name":"scr_drop_select_function","path":"scripts/scr_drop_select_function/scr_drop_select_function.yy",},}, {"id":{"name":"scr_en_weapon","path":"scripts/scr_en_weapon/scr_en_weapon.yy",},}, + {"id":{"name":"scr_end_turn_combat_helpers","path":"scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.yy",},}, {"id":{"name":"scr_enemy_ai_a","path":"scripts/scr_enemy_ai_a/scr_enemy_ai_a.yy",},}, {"id":{"name":"scr_enemy_ai_b","path":"scripts/scr_enemy_ai_b/scr_enemy_ai_b.yy",},}, {"id":{"name":"scr_enemy_ai_c","path":"scripts/scr_enemy_ai_c/scr_enemy_ai_c.yy",},}, diff --git a/objects/obj_turn_end/Create_0.gml b/objects/obj_turn_end/Create_0.gml index d635fe5838..208a2de628 100644 --- a/objects/obj_turn_end/Create_0.gml +++ b/objects/obj_turn_end/Create_0.gml @@ -27,6 +27,7 @@ first_y=obj_controller.y; combating=0; cooldown=10; +main_slate = new DataSlate(); obj_controller.menu=999;// show nothing, click nothing i=-1;repeat(11){i+=1;enemy_fleet[i]=0;allied_fleet[i]=0;ecap[i]=0;efri[i]=0;eesc[i]=0;acap[i]=0;afri[i]=0;aesc[i]=0;} diff --git a/objects/obj_turn_end/Draw_0.gml b/objects/obj_turn_end/Draw_0.gml index 4163584fe1..17a7fc0f1d 100644 --- a/objects/obj_turn_end/Draw_0.gml +++ b/objects/obj_turn_end/Draw_0.gml @@ -15,180 +15,9 @@ if (show=0) and (obj_controller.zoomed=1) and (current_popup=0) then draw_sprite if (show>0) and (current_battle<=battles){ - var xxx,yyy,i; - xxx=__view_get( e__VW.XView, 0 )+535; - yyy=__view_get( e__VW.YView, 0 )+200; - i=current_battle; - - draw_sprite(spr_purge_panel,0,xxx,yyy); - // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); - // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); - if (battle_world[i]=-50) then scr_image("attacked",1,xxx+12,yyy+54,254,174); - if (battle_world[i]>0) then scr_image("attacked",0,xxx+12,yyy+54,254,174); - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(c_gray); - draw_text(xxx+8,yyy+13,string_hash_to_newline(string(i)+"/"+string(battles))); - - draw_set_halign(fa_center); - draw_set_font(fnt_40k_30b); - - if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Forces Attacked! ("+string(battle_location[i])+" "+scr_roman(battle_world[i])+")"),0.7,0.7,0); - if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Fleet Attacked! ("+string(battle_location[i])+" System)"),0.7,0.7,0); - - scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); - // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left); - - - - if (battle_world[i]<0){ - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_left); - - draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Fleets:")); - draw_text(xxx+332,yyy+237,string_hash_to_newline("Allied Fleets:")); - - if (string(strin[1])="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleship ("+string(strin[4])+"% HP)")); - if (string(strin[2])="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigate ("+string(strin[5])+"% HP)")); - if (string(strin[3])="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escort ("+string(strin[6])+"% HP)")); - if (string(strin[1])!="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleships ("+string(strin[4])+"% HP)")); - if (string(strin[2])!="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigates ("+string(strin[5])+"% HP)")); - if (string(strin[3])!="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escorts ("+string(strin[6])+"% HP)")); - - - draw_set_halign(fa_center); - - if (enemy_fleet[1]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[1],xxx+44,yyy+269); - scr_image("ui/force",enemy_fleet[1],xxx+44-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[1]=1) then shw+=string(ecap[1])+" Battleship#"; - if (ecap[1]!=1) then shw+=string(ecap[1])+" Battleships#"; - if (efri[1]=1) then shw+=string(efri[1])+" Frigate#"; - if (efri[1]!=1) then shw+=string(efri[1])+" Frigates#"; - if (eesc[1]=1) then shw+=string(eesc[1])+" Escort#"; - if (eesc[1]!=1) then shw+=string(eesc[1])+" Escorts#"; - - draw_text_transformed(xxx+44,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (enemy_fleet[2]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[2],xxx+154,yyy+269); - scr_image("ui/force",enemy_fleet[2],xxx+154-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[2]=1) then shw+=string(ecap[2])+" Battleship#"; - if (ecap[2]!=1) then shw+=string(ecap[2])+" Battleships#"; - if (efri[2]=1) then shw+=string(efri[2])+" Frigate#"; - if (efri[2]!=1) then shw+=string(efri[2])+" Frigates#"; - if (eesc[2]=1) then shw+=string(eesc[2])+" Escort#"; - if (eesc[2]!=1) then shw+=string(eesc[2])+" Escorts#"; - - draw_text_transformed(xxx+154,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (enemy_fleet[3]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[3],xxx+264,yyy+269); - scr_image("ui/force",enemy_fleet[3],xxx+264-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[3]=1) then shw+=string(ecap[3])+" Battleship#"; - if (ecap[3]!=1) then shw+=string(ecap[3])+" Battleships#"; - if (efri[3]=1) then shw+=string(efri[3])+" Frigate#"; - if (efri[3]!=1) then shw+=string(efri[3])+" Frigates#"; - if (eesc[3]=1) then shw+=string(eesc[3])+" Escort#"; - if (eesc[3]!=1) then shw+=string(eesc[3])+" Escorts#"; - - draw_text_transformed(xxx+264,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - - if (allied_fleet[1]!=0){ - // draw_sprite(spr_force_icon,allied_fleet[1],xxx+374,yyy+269); - scr_image("ui/force",allied_fleet[1],xxx+374-32,yyy+269-32,64,64); - var shw;shw=""; - if (acap[1]=1) then shw+=string(acap[1])+" Battleship#"; - if (acap[1]!=1) then shw+=string(acap[1])+" Battleships#"; - if (afri[1]=1) then shw+=string(afri[1])+" Frigate#"; - if (afri[1]!=1) then shw+=string(afri[1])+" Frigates#"; - if (aesc[1]=1) then shw+=string(aesc[1])+" Escort#"; - if (aesc[1]!=1) then shw+=string(aesc[1])+" Escorts#"; - - draw_text_transformed(xxx+374,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (allied_fleet[2]!=0){ - // draw_sprite(spr_force_icon,allied_fleet[1],xxx+484,yyy+269); - scr_image("ui/force",allied_fleet[1],xxx+484-32,yyy+269-32,64,64); - var shw;shw=""; - if (acap[2]=1) then shw+=string(acap[2])+" Battleship#"; - if (acap[2]!=1) then shw+=string(acap[2])+" Battleships#"; - if (afri[2]=1) then shw+=string(afri[2])+" Frigate#"; - if (afri[2]!=1) then shw+=string(afri[2])+" Frigates#"; - if (aesc[2]=1) then shw+=string(aesc[2])+" Escort#"; - if (aesc[2]!=1) then shw+=string(aesc[2])+" Escorts#"; - - draw_text_transformed(xxx+484,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - - - - - - draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Retreat"),1.1,1.1,0); - if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); - } - - draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Fight"),1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); - } - - } - + - if (battle_world[i]>=1){ - if (battle_opponent[i]<=20){ - draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Marines")); - draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Vehicles")); - if (strin[3]!="") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Fortified"));// Not / Barely / Lightly / Moderately / Highly / Maximally - } - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_left); - - draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Factions:")); - draw_text(xxx+332,yyy+237,string_hash_to_newline("Allies:")); - - - - draw_set_halign(fa_center); - // draw_sprite(spr_force_icon,battle_opponent[i],xxx+44,yyy+289); - scr_image("ui/force",battle_opponent[i],xxx+44-32,yyy+289-32,64,64); - draw_text_transformed(xxx+44,yyy+316,string_hash_to_newline(string(strin[4])),0.75,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - - - draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Offensive"),1.1,1.1,0); - if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); - } - - draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Defensive"),1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); - } - - - - - - } + } diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 6748fd8ad7..9f58c9039f 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -32,6 +32,40 @@ if (alerts>0) and (popups_end=1){ } } } +main_slate.inside_method = function(){ + if (show>0) and (current_battle<=battles){ + var xxx=main_slate.XX; + var yyy=main_slate.YY; + var i=current_battle; + + draw_sprite(spr_purge_panel,0,xxx,yyy); + // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); + // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); + if (battle_world[i]=-50) then scr_image("attacked",1,xxx+12,yyy+54,254,174); + if (battle_world[i]>0) then scr_image("attacked",0,xxx+12,yyy+54,254,174); + + draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(c_gray); + draw_text(xxx+8,yyy+13,string_hash_to_newline(string(i)+"/"+string(battles))); + + draw_set_halign(fa_center); + draw_set_font(fnt_40k_30b); + + if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Forces Attacked! ("+string(battle_location[i])+" "+scr_roman(battle_world[i])+")"),0.7,0.7,0); + if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Fleet Attacked! ("+string(battle_location[i])+" System)"),0.7,0.7,0); + + scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); + // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + if (battle_world[current_battle]<0){ + draw_player_fleet_combat_options(); + } else if (battle_world[i]>=1){ + draw_player_ground_combat_options(); + } + } + draw_set_alpha(1); +} -draw_set_alpha(1); +main_slate.draw_with_dimensions(535, 200, 530, 400); diff --git a/objects/obj_turn_end/Mouse_56.gml b/objects/obj_turn_end/Mouse_56.gml index a2822f4842..3dd305256c 100644 --- a/objects/obj_turn_end/Mouse_56.gml +++ b/objects/obj_turn_end/Mouse_56.gml @@ -22,84 +22,7 @@ __b__ = action_if_number(obj_popup, 0, 0); xxx=__view_get( e__VW.XView, 0 )+535; yyy=__view_get( e__VW.YView, 0 )+200; - if (cooldown<=0) and (battle_world[current_battle]=-50) and (combating=0){ - if (mouse_x>=xxx+132) and (mouse_y>=yyy+354) and (mouse_x=xxx+272) and (mouse_y>=yyy+354) and (mouse_x 270){ - _enemy_points_left += size; - } else if (_rel_direct < 90) { _enemy_points_right += size; + } else if (_rel_direct < 90) { + _enemy_points_left += size; } } var _break_direction = (_enemy_points_right > _enemy_points_left) ? 90 : 270; diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml new file mode 100644 index 0000000000..0455331a0b --- /dev/null +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -0,0 +1,178 @@ + + + +function draw_player_fleet_combat_options(){ + var xxx=main_slate.XX; + var yyy=main_slate.YY; + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_left); + + draw_text(xxx+12,yyy+237,"Enemy Fleets:"); + draw_text(xxx+332,yyy+237,"Allied Fleets:"); + + draw_text(xxx+310,yyy+118,"{strin[1]} {string_plural(Battleship,strin[1])} ({strin[4]}% HP)"); + draw_text(xxx+310,yyy+138,"{strin[2]} {string_plural(Frigate,strin[2])} ({strin[5]}% HP)"); + draw_text(xxx+310,yyy+158,"{strin[3]} {string_plural(Escort,strin[3])} ({strin[6]}% HP)"); + + + draw_set_halign(fa_center); + + for (var i=1;i1){ + xxx+=110; + } + if (enemy_fleet[i]!=0){ + scr_image("ui/force",enemy_fleet[i],xxx+44-32,yyy+269-32,64,64); + var shw=""; + shw += "{ecap[i]} : {string_plural( "Battleship",ecap[i])} \n"; + shw += "{efri[i]} :{string_plural( "Frigate",efri[i])} \n"; + shw += "{eesc[i]} :{string_plural( "Escort",eesc[i])} \n"; + + draw_text_transformed(xxx+44,yyy+286,shw,0.7,1,0); + draw_set_halign(fa_center); + draw_set_font(fnt_40k_14b); + } + if (array_length(allied_fleet)0){ en_column[1]="Dethdeala"; - en_num[1]=floor(random(i))+1; - i-=en_num[1]; - en_size[1]=3;} - + en_num[1]=floor(random(i))+1; + i-=en_num[1]; + en_size[1]=3; + } + if (i>0){ en_column[2]="Gorbag's Revenge"; - en_num[2]=floor(random(i))+1; - i-=en_num[2]; - en_size[2]=3;}// en_num[2]+=en_num[1]+1; + en_num[2]=floor(random(i))+1; + i-=en_num[2]; + en_size[2]=3; + }// en_num[2]+=en_num[1]+1; if (i>0){ en_column[3]="Kroolboy"; - en_num[3]=i; - i-=en_num[3]; - en_size[3]=3;}// en_num[3]+=en_num[2]+1; + en_num[3]=i; + i-=en_num[3]; + en_size[3]=3; + }// en_num[3]+=en_num[2]+1; if (en_frigate>0){ en_column[4]="Battlekroozer"; - en_num[4]=en_frigate; - en_size[4]=2;}// en_num[4]+=en_num[3]+1; + en_num[4]=en_frigate; + en_size[4]=2; + }// en_num[4]+=en_num[3]+1; if (en_escort>0){ en_column[5]="Ravager"; - en_num[5]=en_escort; - en_size[5]=1;}// en_num[5]+=en_num[4]+1; + en_num[5]=en_escort; + en_size[5]=1; + }// en_num[5]+=en_num[4]+1; } if (owner = eFACTION.Tau){ @@ -674,6 +679,9 @@ function position_ships_and_assign_stats(){ if (en_size[i]>1){ man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_capital); } + else if (en_size[i]==2){ + man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_cruiser); + } else if (en_size[i]=1){ man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_cruiser); } diff --git a/scripts/scr_income/scr_income.gml b/scripts/scr_income/scr_income.gml index 34710dc2fa..16dabb946e 100644 --- a/scripts/scr_income/scr_income.gml +++ b/scripts/scr_income/scr_income.gml @@ -52,6 +52,9 @@ function scr_income() { if (obj_ini.fleet_type=ePlayerBase.home_world){ with(obj_star){ + if (space_hulk){ + continue; + } if (system_feature_bool(p_feature, P_features.Monastery)){ obj_controller.income+=10; var _joined = nearest_warp_joined(self); diff --git a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml index 23b74835f8..e2b3306665 100644 --- a/scripts/scr_ship_combat_data/scr_ship_combat_data.gml +++ b/scripts/scr_ship_combat_data/scr_ship_combat_data.gml @@ -475,8 +475,11 @@ function assign_ship_stats(){ if (class=="Kroolboy") or (class=="Slamblasta"){ size=3; sprite_index=spr_ship_krool; - if (class=="Kroolboy") then sprite_index=spr_ship_krool; - if (class=="Slamblasta") then sprite_index=spr_ship_slam; + if (class=="Kroolboy"){ + sprite_index=spr_ship_krool; + } else if (class=="Slamblasta"){ + sprite_index=spr_ship_slam; + } name=""; hp=1200; maxhp=1200; @@ -490,21 +493,21 @@ function assign_ship_stats(){ capacity=250; carrying=0; - add_weapon_to_ship("Fighta Bommerz", {ammo : 3, cooldown : 120}); + add_weapon_to_ship("Fighta Bommerz", {ammo : 12, cooldown : 120}); add_weapon_to_ship("Gunz Battery"); add_weapon_to_ship("Heavy Gunz"); }else if (class=="Battlekroozer"){ sprite_index=spr_ship_kroozer; - size=3; + size=2; name=""; - hp=1000; - maxhp=1000; + hp=800; + maxhp=800; conditions=""; shields=200; maxshields=200; leadership=100; - armour_front=6; + armour_front=5; side_armour=5; turrets=3; capacity=250; @@ -525,8 +528,8 @@ function assign_ship_stats(){ shields=100; maxshields=100; leadership=80; - armour_front=6; - side_armour=4; + armour_front=3; + side_armour=3; turrets=2; capacity=50; carrying=0; diff --git a/sprites/spr_purge_panel/spr_purge_panel.yy b/sprites/spr_purge_panel/spr_purge_panel.yy index 95ff974a51..9942712f36 100644 --- a/sprites/spr_purge_panel/spr_purge_panel.yy +++ b/sprites/spr_purge_panel/spr_purge_panel.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":400.0, + "seqWidth":530.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":"92a13947-7100-4a9e-96d0-2af58cd2d330","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89cc209d-0fa1-4713-be02-efb2bfdf7d52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a13947-7100-4a9e-96d0-2af58cd2d330","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"89cc209d-0fa1-4713-be02-efb2bfdf7d52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, From 75a1263770acb271d1f3d22ad546abf68d8f9322 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Fri, 13 Jun 2025 21:53:46 +0100 Subject: [PATCH 099/155] nuke data slate --- ChapterMaster.yyp | 1 - scripts/scr_DataSlate/scr_DataSlate.gml | 344 ------------------------ scripts/scr_DataSlate/scr_DataSlate.yy | 13 - 3 files changed, 358 deletions(-) delete mode 100644 scripts/scr_DataSlate/scr_DataSlate.gml delete mode 100644 scripts/scr_DataSlate/scr_DataSlate.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 2f91302993..e3ac3dd399 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -777,7 +777,6 @@ {"id":{"name":"scr_creation","path":"scripts/scr_creation/scr_creation.yy",},}, {"id":{"name":"scr_crusade","path":"scripts/scr_crusade/scr_crusade.yy",},}, {"id":{"name":"scr_culture_visuals","path":"scripts/scr_culture_visuals/scr_culture_visuals.yy",},}, - {"id":{"name":"scr_DataSlate","path":"scripts/scr_DataSlate/scr_DataSlate.yy",},}, {"id":{"name":"scr_demand","path":"scripts/scr_demand/scr_demand.yy",},}, {"id":{"name":"scr_destroy_planet","path":"scripts/scr_destroy_planet/scr_destroy_planet.yy",},}, {"id":{"name":"scr_destroy_vehicle","path":"scripts/scr_destroy_vehicle/scr_destroy_vehicle.yy",},}, diff --git a/scripts/scr_DataSlate/scr_DataSlate.gml b/scripts/scr_DataSlate/scr_DataSlate.gml deleted file mode 100644 index 444a43bd40..0000000000 --- a/scripts/scr_DataSlate/scr_DataSlate.gml +++ /dev/null @@ -1,344 +0,0 @@ -function draw_building_builder(xx, yy, req_require, building_sprite){ - var clicked =false; - draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); - var image_bottom = yy+50; - var image_middle = xx-15; - if (obj_controller.requisition>=req_require){ - if (scr_hit(image_middle+30, image_bottom+28, image_middle+78, image_bottom+44)){ - draw_sprite_ext(spr_slate_2, 5, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - if (scr_click_left()){ - clicked=true; - } - } else { - draw_sprite_ext(spr_slate_2, 3, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - } else { - draw_sprite_ext(spr_slate_2, 7, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - draw_sprite_ext(spr_requisition,0,image_middle+65,image_bottom+30,1,1,0,c_white,1); - draw_set_halign(fa_left); - draw_text(image_middle+32, image_bottom+30, req_require); - return clicked; -} - -function DataSlateMKTwo()constructor{ - height=0; - width=0; - XX=0; - YY=0; - static entered = function(){ - return scr_hit(XX, YY, XX+width, YY+height); - } - static draw = function(xx,yy,x_scale=1, y_scale=1){ - XX=xx; - YY=yy; - height = 250*y_scale; - width=365*x_scale; - draw_sprite_ext(spr_slate_2, 1, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 0, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 2, xx, yy, x_scale, y_scale, 0, c_white, 1); - //draw_sprite_ext(spr_slate_2, 0, xx, yy, 1, 1, 0, c_white, 1) - } -} - -function RackAndPinion(Type="forward") constructor{ - reverse =false; - rack_y=0; - rotation = 360; - type=Type - if (type="forward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x+=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation-=4; - } else { - rotation+=4; - } - rack_y = (75.3982236862/360)*(360-rotation); - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } - } - } else if (type="backward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x-=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation+=4; - } else { - rotation-=4; - } - rack_y = (75.3982236862/360)*(360-rotation) - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } - } - } -} -function SpeedingDot(XX,YY, limit) constructor{ - bottom_limit = limit; - stack = 0; - yyy=YY; - xxx=XX; - draw = function(xx,yy){ - if (bottom_limit+(48*0.7)0 ? 36-stack :0; - var bottom_cut = bottom_limit 1*flash_modifier){ - flash_size-=flash_modifier; - }else { - flash_size+=flash_modifier; - flash = 0; - } - } - draw_set_alpha(1); - } - draw_one_flash = function(xx, yy){ - if (one_flash_finished) then exit; - draw_set_color(c_green); - for (var i=0; i<=flash_size;i++){ - draw_set_alpha(1 - ((1/40)*i)) - draw_circle(xx, yy, (i/3), 1); - } - if (flash==0){ - if (flash_size<40){ - flash_size++; - } else { - flash = 1; - flash_size--; - } - } else { - if (flash_size > 1){ - flash_size--; - }else { - flash_size++; - flash = 0; - one_flash_finished = true; - } - } - } -} - -function ShutterButton() constructor{ - time_open = 0; - click_timer = 0; - Width = 315; - Height = 90; - XX=0; - YY=0; - width=0; - height=0; - right_rack = new RackAndPinion(); - left_rack = new RackAndPinion("backward"); - draw_shutter = function(xx,yy,text, scale=1, entered = ""){ - XX=xx; - YY=yy; - draw_set_alpha(1); - - draw_set_font(fnt_40k_12); - draw_set_halign(fa_left); - draw_set_color(c_gray); - width = Width *scale; - height = Height *scale; - if (text=="") then entered = false; - if (entered==""){ - entered = scr_hit(xx, yy, xx+width, yy+height); - } else { - entered=entered; - } - var shutter_backdrop = 5; - if (entered || click_timer>0){ - if (time_open<20){ - time_open++; - right_rack.draw(xx+width, yy, false, false); - left_rack.draw(xx, yy, false, false); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - if (point_and_click([xx, yy, xx+width, yy+height]) || click_timer>0 ){ - shutter_backdrop = 6; - click_timer++; - } - } else if (time_open>0){ - time_open--; - right_rack.draw(xx+width, yy, false, true); - left_rack.draw(xx, yy, false, true); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); - var main_sprite = 0; - if (time_open<2){ - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } else if (time_open<8 && time_open>=2){ - main_sprite=1; - }else if (time_open<13 && time_open>=8){ - main_sprite=2; - }else if (time_open<18 && time_open>=13){ - main_sprite=3; - } else if (time_open>=18){ - main_sprite=4; - } - if (time_open>=2){ - draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) - draw_set_color(c_red); - if (click_timer>0){ - draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); - } else { - draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); - } - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } - draw_set_color(c_grey); - if (click_timer>7){ - click_timer = 0; - return true; - } else { - return false; - } - } -} - -function DataSlate() constructor{ - static_line=1; - title=""; - sub_title=""; - body_text = ""; - inside_method = ""; - XX=0; - YY=0; - width=0; - height=0; - percent_cut=0; - - static entered = function(){ - return (scr_hit( - XX-4, - YY, - XX + width, - YY + height, - )); - } - static draw_with_dimensions = function(xx,yy, width , height){ - var _scale_x = width/860; - var _scale_y = height/850; - draw(xx,yy, _scale_x, _scale_y); - } - static draw = function(xx,yy, scale_x=1, scale_y=1){ - XX=xx; - YY=yy; - width = 860*scale_x; - height = 850*scale_y; - draw_sprite_ext(spr_data_slate,1, xx,yy, scale_x, scale_y, 0, c_white, 1); - if (is_callable(inside_method)){ - inside_method(); - } - if (static_line<=10) then draw_set_alpha(static_line/10); - if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); - draw_set_color(5998382); - var line_move = yy+(70*scale_y)+((36*scale_y)*static_line); - draw_line(xx+(30*scale_x),line_move,xx+(820*scale_x),line_move); - draw_set_alpha(1); - if (irandom(75)=0 && static_line>1){static_line--;} - else{ - static_line+=0.1; - } - if (static_line>20) then static_line=1; - draw_set_color(c_gray); - draw_set_halign(fa_center); - var draw_height = 5; - if (title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); - draw_height += (string_height(title)*3)*scale_y; - } - if (sub_title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); - draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; - } - if (body_text!=""){ - draw_text_ext(xx+(0.5*width), yy+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); - } - } - static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ - XX=xx; - YY=yy; - draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); - width = 860*scale_x; - height = (69+(683*(middle_percent/100))+98 )*scale_y; - if (is_callable(inside_method)){ - inside_method(); - } - } - - static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ - percent_cut = min(percent_cut+mod_edit, 100); - if (!percent_cut) then percent_cut=0; - draw_cut(xx,yy, scale_x, scale_y); - } -} - - - diff --git a/scripts/scr_DataSlate/scr_DataSlate.yy b/scripts/scr_DataSlate/scr_DataSlate.yy deleted file mode 100644 index d36967fe94..0000000000 --- a/scripts/scr_DataSlate/scr_DataSlate.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$GMScript":"v1", - "%Name":"scr_DataSlate", - "isCompatibility":false, - "isDnD":false, - "name":"scr_DataSlate", - "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", - }, - "resourceType":"GMScript", - "resourceVersion":"2.0", -} \ No newline at end of file From 7c23aeb20d758f636646aa530290b39c5c98249b Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Fri, 13 Jun 2025 21:58:20 +0100 Subject: [PATCH 100/155] move data slates out of draw_planets aand into it's own script --- ChapterMaster.yyp | 1 + scripts/scr_DataSlate/scr_DataSlate.gml | 344 +++++++++++++++++ scripts/scr_DataSlate/scr_DataSlate.yy | 13 + .../scr_draw_planet_features.gml | 345 ------------------ 4 files changed, 358 insertions(+), 345 deletions(-) create mode 100644 scripts/scr_DataSlate/scr_DataSlate.gml create mode 100644 scripts/scr_DataSlate/scr_DataSlate.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index f31874b70c..5a948375b3 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -776,6 +776,7 @@ {"id":{"name":"scr_creation","path":"scripts/scr_creation/scr_creation.yy",},}, {"id":{"name":"scr_crusade","path":"scripts/scr_crusade/scr_crusade.yy",},}, {"id":{"name":"scr_culture_visuals","path":"scripts/scr_culture_visuals/scr_culture_visuals.yy",},}, + {"id":{"name":"scr_DataSlate","path":"scripts/scr_DataSlate/scr_DataSlate.yy",},}, {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},}, {"id":{"name":"scr_demand","path":"scripts/scr_demand/scr_demand.yy",},}, {"id":{"name":"scr_destroy_planet","path":"scripts/scr_destroy_planet/scr_destroy_planet.yy",},}, diff --git a/scripts/scr_DataSlate/scr_DataSlate.gml b/scripts/scr_DataSlate/scr_DataSlate.gml new file mode 100644 index 0000000000..444a43bd40 --- /dev/null +++ b/scripts/scr_DataSlate/scr_DataSlate.gml @@ -0,0 +1,344 @@ +function draw_building_builder(xx, yy, req_require, building_sprite){ + var clicked =false; + draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); + var image_bottom = yy+50; + var image_middle = xx-15; + if (obj_controller.requisition>=req_require){ + if (scr_hit(image_middle+30, image_bottom+28, image_middle+78, image_bottom+44)){ + draw_sprite_ext(spr_slate_2, 5, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + if (scr_click_left()){ + clicked=true; + } + } else { + draw_sprite_ext(spr_slate_2, 3, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + } + } else { + draw_sprite_ext(spr_slate_2, 7, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + } + draw_sprite_ext(spr_requisition,0,image_middle+65,image_bottom+30,1,1,0,c_white,1); + draw_set_halign(fa_left); + draw_text(image_middle+32, image_bottom+30, req_require); + return clicked; +} + +function DataSlateMKTwo()constructor{ + height=0; + width=0; + XX=0; + YY=0; + static entered = function(){ + return scr_hit(XX, YY, XX+width, YY+height); + } + static draw = function(xx,yy,x_scale=1, y_scale=1){ + XX=xx; + YY=yy; + height = 250*y_scale; + width=365*x_scale; + draw_sprite_ext(spr_slate_2, 1, xx, yy, x_scale, y_scale, 0, c_white, 1); + draw_sprite_ext(spr_slate_2, 0, xx, yy, x_scale, y_scale, 0, c_white, 1); + draw_sprite_ext(spr_slate_2, 2, xx, yy, x_scale, y_scale, 0, c_white, 1); + //draw_sprite_ext(spr_slate_2, 0, xx, yy, 1, 1, 0, c_white, 1) + } +} + +function RackAndPinion(Type="forward") constructor{ + reverse =false; + rack_y=0; + rotation = 360; + type=Type + if (type="forward"){ + draw = function(x, y, freeze=false, Reverse=""){ + x+=19; + if (!freeze){ + if (Reverse != ""){ + if (Reverse){ + reverse=true; + } else { + reverse=false; + } + } + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + if (!reverse){ + rotation-=4; + } else { + rotation+=4; + } + rack_y = (75.3982236862/360)*(360-rotation); + if (rack_y > 70){ + reverse = true; + } else if (rack_y < 2){ + reverse = false; + } + draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) + } else { + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) + } + } + } else if (type="backward"){ + draw = function(x, y, freeze=false, Reverse=""){ + x-=19; + if (!freeze){ + if (Reverse != ""){ + if (Reverse){ + reverse=true; + } else { + reverse=false; + } + } + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + if (!reverse){ + rotation+=4; + } else { + rotation-=4; + } + rack_y = (75.3982236862/360)*(360-rotation) + if (rack_y > 70){ + reverse = true; + } else if (rack_y < 2){ + reverse = false; + } + draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) + } else { + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) + } + } + } +} +function SpeedingDot(XX,YY, limit) constructor{ + bottom_limit = limit; + stack = 0; + yyy=YY; + xxx=XX; + draw = function(xx,yy){ + if (bottom_limit+(48*0.7)0 ? 36-stack :0; + var bottom_cut = bottom_limit 1*flash_modifier){ + flash_size-=flash_modifier; + }else { + flash_size+=flash_modifier; + flash = 0; + } + } + draw_set_alpha(1); + } + draw_one_flash = function(xx, yy){ + if (one_flash_finished) then exit; + draw_set_color(c_green); + for (var i=0; i<=flash_size;i++){ + draw_set_alpha(1 - ((1/40)*i)) + draw_circle(xx, yy, (i/3), 1); + } + if (flash==0){ + if (flash_size<40){ + flash_size++; + } else { + flash = 1; + flash_size--; + } + } else { + if (flash_size > 1){ + flash_size--; + }else { + flash_size++; + flash = 0; + one_flash_finished = true; + } + } + } +} + +function ShutterButton() constructor{ + time_open = 0; + click_timer = 0; + Width = 315; + Height = 90; + XX=0; + YY=0; + width=0; + height=0; + right_rack = new RackAndPinion(); + left_rack = new RackAndPinion("backward"); + draw_shutter = function(xx,yy,text, scale=1, entered = ""){ + XX=xx; + YY=yy; + draw_set_alpha(1); + + draw_set_font(fnt_40k_12); + draw_set_halign(fa_left); + draw_set_color(c_gray); + width = Width *scale; + height = Height *scale; + if (text=="") then entered = false; + if (entered==""){ + entered = scr_hit(xx, yy, xx+width, yy+height); + } else { + entered=entered; + } + var shutter_backdrop = 5; + if (entered || click_timer>0){ + if (time_open<20){ + time_open++; + right_rack.draw(xx+width, yy, false, false); + left_rack.draw(xx, yy, false, false); + } else { + right_rack.draw(xx+width, yy, true); + left_rack.draw(xx, yy, true); + } + if (point_and_click([xx, yy, xx+width, yy+height]) || click_timer>0 ){ + shutter_backdrop = 6; + click_timer++; + } + } else if (time_open>0){ + time_open--; + right_rack.draw(xx+width, yy, false, true); + left_rack.draw(xx, yy, false, true); + } else { + right_rack.draw(xx+width, yy, true); + left_rack.draw(xx, yy, true); + } + var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); + var main_sprite = 0; + if (time_open<2){ + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) + } else if (time_open<8 && time_open>=2){ + main_sprite=1; + }else if (time_open<13 && time_open>=8){ + main_sprite=2; + }else if (time_open<18 && time_open>=13){ + main_sprite=3; + } else if (time_open>=18){ + main_sprite=4; + } + if (time_open>=2){ + draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) + draw_set_color(c_red); + if (click_timer>0){ + draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); + } else { + draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); + } + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) + } + draw_set_color(c_grey); + if (click_timer>7){ + click_timer = 0; + return true; + } else { + return false; + } + } +} + +function DataSlate() constructor{ + static_line=1; + title=""; + sub_title=""; + body_text = ""; + inside_method = ""; + XX=0; + YY=0; + width=0; + height=0; + percent_cut=0; + + static entered = function(){ + return (scr_hit( + XX-4, + YY, + XX + width, + YY + height, + )); + } + static draw_with_dimensions = function(xx,yy, width , height){ + var _scale_x = width/860; + var _scale_y = height/850; + draw(xx,yy, _scale_x, _scale_y); + } + static draw = function(xx,yy, scale_x=1, scale_y=1){ + XX=xx; + YY=yy; + width = 860*scale_x; + height = 850*scale_y; + draw_sprite_ext(spr_data_slate,1, xx,yy, scale_x, scale_y, 0, c_white, 1); + if (is_callable(inside_method)){ + inside_method(); + } + if (static_line<=10) then draw_set_alpha(static_line/10); + if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); + draw_set_color(5998382); + var line_move = yy+(70*scale_y)+((36*scale_y)*static_line); + draw_line(xx+(30*scale_x),line_move,xx+(820*scale_x),line_move); + draw_set_alpha(1); + if (irandom(75)=0 && static_line>1){static_line--;} + else{ + static_line+=0.1; + } + if (static_line>20) then static_line=1; + draw_set_color(c_gray); + draw_set_halign(fa_center); + var draw_height = 5; + if (title!=""){ + draw_text_transformed(xx+(0.5*width), yy+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); + draw_height += (string_height(title)*3)*scale_y; + } + if (sub_title!=""){ + draw_text_transformed(xx+(0.5*width), yy+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); + draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; + } + if (body_text!=""){ + draw_text_ext(xx+(0.5*width), yy+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); + } + } + static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ + XX=xx; + YY=yy; + draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); + width = 860*scale_x; + height = (69+(683*(middle_percent/100))+98 )*scale_y; + if (is_callable(inside_method)){ + inside_method(); + } + } + + static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ + percent_cut = min(percent_cut+mod_edit, 100); + if (!percent_cut) then percent_cut=0; + draw_cut(xx,yy, scale_x, scale_y); + } +} + + + diff --git a/scripts/scr_DataSlate/scr_DataSlate.yy b/scripts/scr_DataSlate/scr_DataSlate.yy new file mode 100644 index 0000000000..706bff707b --- /dev/null +++ b/scripts/scr_DataSlate/scr_DataSlate.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_DataSlate", + "isCompatibility":false, + "isDnD":false, + "name":"scr_DataSlate", + "parent":{ + "name":"User Interface", + "path":"folders/Scripts/User Interface.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index ff6b5d9205..1c186ea863 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -318,348 +318,3 @@ function FeatureSelected(Feature, system, planet) constructor{ return "done"; } } - -function draw_building_builder(xx, yy, req_require, building_sprite){ - var clicked =false; - draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); - var image_bottom = yy+50; - var image_middle = xx-15; - if (obj_controller.requisition>=req_require){ - if (scr_hit(image_middle+30, image_bottom+28, image_middle+78, image_bottom+44)){ - draw_sprite_ext(spr_slate_2, 5, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - if (scr_click_left()){ - clicked=true; - } - } else { - draw_sprite_ext(spr_slate_2, 3, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - } else { - draw_sprite_ext(spr_slate_2, 7, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - draw_sprite_ext(spr_requisition,0,image_middle+65,image_bottom+30,1,1,0,c_white,1); - draw_set_halign(fa_left); - draw_text(image_middle+32, image_bottom+30, req_require); - return clicked; -} - -function DataSlateMKTwo()constructor{ - height=0; - width=0; - XX=0; - YY=0; - static entered = function(){ - return scr_hit(XX, YY, XX+width, YY+height); - } - static draw = function(xx,yy,x_scale=1, y_scale=1){ - XX=xx; - YY=yy; - height = 250*y_scale; - width=365*x_scale; - draw_sprite_ext(spr_slate_2, 1, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 0, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 2, xx, yy, x_scale, y_scale, 0, c_white, 1); - //draw_sprite_ext(spr_slate_2, 0, xx, yy, 1, 1, 0, c_white, 1) - } -} - -function RackAndPinion(Type="forward") constructor{ - reverse =false; - rack_y=0; - rotation = 360; - type=Type - if (type="forward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x+=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation-=4; - } else { - rotation+=4; - } - rack_y = (75.3982236862/360)*(360-rotation); - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } - } - } else if (type="backward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x-=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation+=4; - } else { - rotation-=4; - } - rack_y = (75.3982236862/360)*(360-rotation) - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } - } - } -} -function SpeedingDot(XX,YY, limit) constructor{ - bottom_limit = limit; - stack = 0; - yyy=YY; - xxx=XX; - draw = function(xx,yy){ - if (bottom_limit+(48*0.7)0 ? 36-stack :0; - var bottom_cut = bottom_limit 1){ - flash_size--; - }else { - flash_size++; - flash = 0; - } - } - } - draw_one_flash = function(xx, yy){ - if (one_flash_finished) then exit; - draw_set_color(c_green); - for (var i=0; i<=flash_size;i++){ - draw_set_alpha(1 - ((1/40)*i)) - draw_circle(xx, yy, (i/3), 1); - } - if (flash==0){ - if (flash_size<40){ - flash_size++; - } else { - flash = 1; - flash_size--; - } - } else { - if (flash_size > 1){ - flash_size--; - }else { - flash_size++; - flash = 0; - one_flash_finished = true; - } - } - } -} - -function ShutterButton() constructor{ - time_open = 0; - click_timer = 0; - Width = 315; - Height = 90; - XX=0; - YY=0; - width=0; - height=0; - right_rack = new RackAndPinion(); - left_rack = new RackAndPinion("backward"); - draw_shutter = function(xx,yy,text, scale=1, entered = ""){ - XX=xx; - YY=yy; - draw_set_alpha(1); - - draw_set_font(fnt_40k_12); - draw_set_halign(fa_left); - draw_set_color(c_gray); - width = Width *scale; - height = Height *scale; - if (text=="") then entered = false; - if (entered==""){ - entered = scr_hit(xx, yy, xx+width, yy+height); - } else { - entered=entered; - } - var shutter_backdrop = 5; - if (entered || click_timer>0){ - if (time_open<20){ - time_open++; - right_rack.draw(xx+width, yy, false, false); - left_rack.draw(xx, yy, false, false); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - if (point_and_click([xx, yy, xx+width, yy+height]) || click_timer>0 ){ - shutter_backdrop = 6; - click_timer++; - } - } else if (time_open>0){ - time_open--; - right_rack.draw(xx+width, yy, false, true); - left_rack.draw(xx, yy, false, true); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); - var main_sprite = 0; - if (time_open<2){ - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } else if (time_open<8 && time_open>=2){ - main_sprite=1; - }else if (time_open<13 && time_open>=8){ - main_sprite=2; - }else if (time_open<18 && time_open>=13){ - main_sprite=3; - } else if (time_open>=18){ - main_sprite=4; - } - if (time_open>=2){ - draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) - draw_set_color(c_red); - if (click_timer>0){ - draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); - } else { - draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); - } - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } - draw_set_color(c_grey); - if (click_timer>7){ - click_timer = 0; - return true; - } else { - return false; - } - } -} - -function DataSlate() constructor{ - static_line=1; - title=""; - sub_title=""; - body_text = ""; - inside_method = ""; - XX=0; - YY=0; - width=0; - height=0; - percent_cut=0; - - static entered = function(){ - return (scr_hit( - XX-4, - YY, - XX + width, - YY + height, - )); - } - static draw = function(xx,yy, scale_x=1, scale_y=1){ - XX=xx; - YY=yy; - width = 860*scale_x; - height = 850*scale_y; - draw_sprite_ext(spr_data_slate,1, xx,yy, scale_x, scale_y, 0, c_white, 1); - if (is_callable(inside_method)){ - inside_method(); - } - if (static_line<=10) then draw_set_alpha(static_line/10); - if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); - draw_set_color(5998382); - var line_move = yy+(70*scale_y)+((36*scale_y)*static_line); - draw_line(xx+(30*scale_x),line_move,xx+(820*scale_x),line_move); - draw_set_alpha(1); - if (irandom(75)=0 && static_line>1){static_line--;} - else{ - static_line+=0.1; - } - if (static_line>20) then static_line=1; - draw_set_color(c_gray); - draw_set_halign(fa_center); - var draw_height = 5; - if (title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); - draw_height += (string_height(title)*3)*scale_y; - } - if (sub_title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); - draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; - } - if (body_text!=""){ - draw_text_ext(xx+(0.5*width), yy+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); - } - } - static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ - XX=xx; - YY=yy; - draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); - width = 860*scale_x; - height = (69+(683*(middle_percent/100))+98 )*scale_y; - if (is_callable(inside_method)){ - inside_method(); - } - } - - static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ - percent_cut = min(percent_cut+mod_edit, 100); - if (!percent_cut) then percent_cut=0; - draw_cut(xx,yy, scale_x, scale_y); - } -} - - - - - - - - - - From 972bcc32bac383885099234355b2b085edafea6d Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 10 Jul 2025 01:46:33 +0100 Subject: [PATCH 101/155] get fleet branch to work again --- ChapterMaster.yyp | 1 - objects/obj_en_fleet/Alarm_1.gml | 2 +- objects/obj_ground_mission/Alarm_0.gml | 2 +- objects/obj_ground_mission/Alarm_5.gml | 2 +- objects/obj_ground_mission/Alarm_6.gml | 2 +- objects/obj_ground_teams/Alarm_0.gml | 2 +- objects/obj_ncombat/Alarm_5.gml | 4 +- objects/obj_ncombat/Alarm_7.gml | 3 +- objects/obj_popup/Step_0.gml | 2 +- objects/obj_star/Alarm_0.gml | 2 +- objects/obj_star_select/Create_0.gml | 12 ++-- objects/obj_star_select/Draw_64.gml | 18 +++--- scripts/scr_PlanetData/scr_PlanetData.gml | 18 +++--- .../scr_ancient_ruins/scr_ancient_ruins.gml | 4 +- .../scr_apothecary_ground.gml | 2 +- scripts/scr_bomb_world/scr_bomb_world.gml | 4 +- scripts/scr_cheatcode/scr_cheatcode.gml | 6 +- .../scr_destroy_planet/scr_destroy_planet.gml | 2 +- .../scr_draw_planet_features.gml | 12 ++-- .../scr_end_turn_combat_helpers.gml | 18 +++--- scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml | 6 +- scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml | 2 +- scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml | 4 +- scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml | 6 +- scripts/scr_income/scr_income.gml | 2 +- .../scr_inquisition_mission.gml | 6 +- .../scr_mechanicus_missions.gml | 8 +-- .../scr_mission_functions.gml | 10 +-- scripts/scr_necron_tombs/scr_necron_tombs.gml | 2 +- .../scr_ork_fleet_functions.gml | 4 +- .../scr_planet_setup_functions.gml | 12 ++-- .../scr_planetary_feature.gml | 64 +++++++++---------- .../scr_player_fleet_functions.gml | 4 -- scripts/scr_purge_world/scr_purge_world.gml | 4 +- scripts/scr_random_event/scr_random_event.gml | 2 +- scripts/scr_recruit_data/scr_recruit_data.gml | 2 +- .../scr_star_ownership/scr_star_ownership.gml | 8 +-- scripts/scr_system_spawn/scr_system_spawn.gml | 4 +- .../scr_system_spawn_functions.gml | 4 +- .../scr_tyranid_fleet_functions.gml | 6 +- .../scr_tyranid_planet_functions.gml | 16 ++--- scripts/scr_ui_popup/scr_ui_popup.gml | 14 ++-- .../scr_unit_quick_find_pane.gml | 2 +- 43 files changed, 152 insertions(+), 158 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index a8da793d24..b759ea5556 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -783,7 +783,6 @@ {"id":{"name":"scr_crusade","path":"scripts/scr_crusade/scr_crusade.yy",},}, {"id":{"name":"scr_culture_visuals","path":"scripts/scr_culture_visuals/scr_culture_visuals.yy",},}, {"id":{"name":"scr_DataSlate","path":"scripts/scr_DataSlate/scr_DataSlate.yy",},}, - {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},}, {"id":{"name":"scr_demand","path":"scripts/scr_demand/scr_demand.yy",},}, {"id":{"name":"scr_destroy_planet","path":"scripts/scr_destroy_planet/scr_destroy_planet.yy",},}, {"id":{"name":"scr_destroy_vehicle","path":"scripts/scr_destroy_vehicle/scr_destroy_vehicle.yy",},}, diff --git a/objects/obj_en_fleet/Alarm_1.gml b/objects/obj_en_fleet/Alarm_1.gml index 18e15f52be..48211862e4 100644 --- a/objects/obj_en_fleet/Alarm_1.gml +++ b/objects/obj_en_fleet/Alarm_1.gml @@ -661,7 +661,7 @@ if (action=="" && _is_orbiting){ t+=1; tem1=tem1_base;// Repeat to check each of the planets if (cur_star.p_type[t]="Dead") and (array_length(cur_star.p_upgrades[t])>0){ - var base_search = search_planet_features(cur_star.p_upgrades[t], P_features.Secret_Base); + var base_search = search_planet_features(cur_star.p_upgrades[t], P_features.SecretBase); if (array_length(base_search) >0){ var player_base = cur_star.p_upgrades[t][base_search[0]] if (player_base.vox>0) then tem1+=2; diff --git a/objects/obj_ground_mission/Alarm_0.gml b/objects/obj_ground_mission/Alarm_0.gml index 6b48dd3798..dda53b8506 100644 --- a/objects/obj_ground_mission/Alarm_0.gml +++ b/objects/obj_ground_mission/Alarm_0.gml @@ -4,7 +4,7 @@ if (num > 0) { stah = instance_nearest(x, y, obj_star); obj_controller.menu = 0; - if (planet_feature_bool(stah.p_feature[num], P_features.STC_Fragment) == 1) { // STC is present + if (planet_feature_bool(stah.p_feature[num], P_features.STCFragment) == 1) { // STC is present var pop, own; own = stah.p_owner[num]; pop = instance_create(0, 0, obj_popup); diff --git a/objects/obj_ground_mission/Alarm_5.gml b/objects/obj_ground_mission/Alarm_5.gml index c353d62d6e..579e0993de 100644 --- a/objects/obj_ground_mission/Alarm_5.gml +++ b/objects/obj_ground_mission/Alarm_5.gml @@ -105,7 +105,7 @@ if (scr_has_adv("Tech-Scavengers")){ with(obj_star_select){instance_destroy();} with(obj_fleet_select){instance_destroy();} -delete_features(plan.p_feature[num], P_features.STC_Fragment); +delete_features(plan.p_feature[num], P_features.STCFragment); scr_add_stc_fragment();// STC here diff --git a/objects/obj_ground_mission/Alarm_6.gml b/objects/obj_ground_mission/Alarm_6.gml index 6ef5ce8e14..1babaee9cc 100644 --- a/objects/obj_ground_mission/Alarm_6.gml +++ b/objects/obj_ground_mission/Alarm_6.gml @@ -1,6 +1,6 @@ var _target_planet; _target_planet = instance_nearest(x, y, obj_star); -delete_features(_target_planet.p_feature[num], P_features.STC_Fragment); +delete_features(_target_planet.p_feature[num], P_features.STCFragment); scr_return_ship(loc, self, num); diff --git a/objects/obj_ground_teams/Alarm_0.gml b/objects/obj_ground_teams/Alarm_0.gml index 10351f4083..6aa0ae85af 100644 --- a/objects/obj_ground_teams/Alarm_0.gml +++ b/objects/obj_ground_teams/Alarm_0.gml @@ -1,4 +1,4 @@ -if (feature.f_type == P_features.Ancient_Ruins){ +if (feature.f_type == P_features.AncientRuins){ newline = "Your marines warily stalk through into the entrance of the ruins"; newline_color = "red"; scr_newtext(); diff --git a/objects/obj_ncombat/Alarm_5.gml b/objects/obj_ncombat/Alarm_5.gml index d53ba26ed3..aaa4ea6a8b 100644 --- a/objects/obj_ncombat/Alarm_5.gml +++ b/objects/obj_ncombat/Alarm_5.gml @@ -468,10 +468,10 @@ if (defeat=0) and (reduce_power=true){ var who_return=""; var make_alert = true; var planet_string = $"{name} {scr_roman(battle_planet)}"; - if (planet_feature_bool(p_feature[battle_planet], P_features.Gene_Stealer_Cult)==1){ + if (planet_feature_bool(p_feature[battle_planet], P_features.GeneStealerCult)==1){ who_cleansed="Gene Stealer Cult" make_alert=true; - delete_features(p_feature[battle_planet], P_features.Gene_Stealer_Cult); + delete_features(p_feature[battle_planet], P_features.GeneStealerCult); adjust_influence(eFACTION.Tyranids, -25, battle_planet); } if (make_alert){ diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 65f216bf9a..d9355c1594 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -8,8 +8,7 @@ try { audio_sound_gain(snd_royal,0.25*obj_controller.master_volume*obj_controller.music_volume,2000); } - // scr_dead_marines(1); - + // Execute the cleaning scripts // Check for any more battles diff --git a/objects/obj_popup/Step_0.gml b/objects/obj_popup/Step_0.gml index 6f590e8a1e..af317d96ee 100644 --- a/objects/obj_popup/Step_0.gml +++ b/objects/obj_popup/Step_0.gml @@ -1020,7 +1020,7 @@ try { var ppp = 0; remove_planet_problem(planet, "necron", mission_star); seal_tomb_world(mission_star.p_feature[planet]); - // mission_star.p_feature[planet][search_planet_features(mission_star.p_feature[planet], P_features.Necron_Tomb)[0]].sealed = 1; + // mission_star.p_feature[planet][search_planet_features(mission_star.p_feature[planet], P_features.NecronTomb)[0]].sealed = 1; with (obj_temp8) { instance_destroy(); } diff --git a/objects/obj_star/Alarm_0.gml b/objects/obj_star/Alarm_0.gml index 87b0edc033..da2c20a10e 100644 --- a/objects/obj_star/Alarm_0.gml +++ b/objects/obj_star/Alarm_0.gml @@ -180,7 +180,7 @@ switch (name) { planets = 3; p_type[1] = "Feudal"; planet[1] = 1; - array_push(p_feature[1], new PlanetFeature(P_features.Necron_Tomb)); + array_push(p_feature[1], new PlanetFeature(P_features.NecronTomb)); p_type[2] = "Dead"; planet[2] = 1; p_type[3] = "Dead"; diff --git a/objects/obj_star_select/Create_0.gml b/objects/obj_star_select/Create_0.gml index 57c3ecea61..aa6565d303 100644 --- a/objects/obj_star_select/Create_0.gml +++ b/objects/obj_star_select/Create_0.gml @@ -42,11 +42,11 @@ recruiting_button.update({ target : target, }); recruiting_button.bind_method = function(){ - if (!p_data.has_feature(P_features.Recruiting_World)) { - p_data.add_feature(P_features.Recruiting_World); + if (!p_data.has_feature(P_features.RecruitingWorld)) { + p_data.add_feature(P_features.RecruitingWorld); obj_controller.recruiting_worlds += $"{planet_numeral_name(obj_controller.selecting_planet, target)}|"; } else { - delete_features(target.p_feature[obj_controller.selecting_planet], P_features.Recruiting_World); + delete_features(target.p_feature[obj_controller.selecting_planet], P_features.RecruitingWorld); obj_controller.recruiting_worlds=string_replace(obj_controller.recruiting_worlds,string(target.name)+" "+scr_roman(obj_controller.selecting_planet)+"|",""); } }; @@ -58,7 +58,7 @@ recruitment_type_button.update({ target : target, }); recruitment_type_button.bind_method = function(){ - var _recruit_world = p_data.get_features(P_features.Recruiting_World)[0]; + var _recruit_world = p_data.get_features(P_features.RecruitingWorld)[0]; if (_recruit_world.recruit_type < 1) { _recruit_world.recruit_type++ } else { @@ -73,7 +73,7 @@ recruitment_costdown_button.update({ target : target, }); recruitment_costdown_button.bind_method = function(){ - var _recruit_world = p_data.get_features(P_features.Recruiting_World)[0]; + var _recruit_world = p_data.get_features(P_features.RecruitingWorld)[0]; _recruit_world.recruit_cost-- }; @@ -84,7 +84,7 @@ recruitment_costup_button.update({ target : target, }); recruitment_costup_button.bind_method = function(){ - var _recruit_world = p_data.get_features(P_features.Recruiting_World)[0]; + var _recruit_world = p_data.get_features(P_features.RecruitingWorld)[0]; _recruit_world.recruit_cost++ }; diff --git a/objects/obj_star_select/Draw_64.gml b/objects/obj_star_select/Draw_64.gml index cd6cbf7ad8..d7de24b0d8 100644 --- a/objects/obj_star_select/Draw_64.gml +++ b/objects/obj_star_select/Draw_64.gml @@ -208,11 +208,11 @@ if (obj_controller.selecting_planet!=0){ chock = !p_data.xenos_and_heretics(); if (chock==1){ - if (p_data.has_upgrade(P_features.Secret_Base)){ + if (p_data.has_upgrade(P_features.SecretBase)){ button1="Base"; }else if (p_data.has_upgrade(P_features.Arsenal)){ button1="Arsenal"; - }else if (p_data.has_upgrade(P_features.Gene_Vault)){ + }else if (p_data.has_upgrade(P_features.GeneVault)){ button1="Gene-Vault"; }else if (array_length(p_data.upgrades)==0){ button1="Build"; @@ -228,7 +228,7 @@ if (obj_controller.selecting_planet!=0){ } if (obj_controller.recruiting_worlds_bought>0 && !p_data.at_war()){ - if (!p_data.has_feature(P_features.Recruiting_World) && p_data.planet_type != "Dead" && !target.space_hulk){ + if (!p_data.has_feature(P_features.RecruitingWorld) && p_data.planet_type != "Dead" && !target.space_hulk){ button4="+Recruiting"; } } @@ -326,8 +326,8 @@ if (obj_controller.selecting_planet!=0){ allow_click : true, }); recruiting_button.draw(); - if (p_data.has_feature(P_features.Recruiting_World)) { - var _recruit_world = p_data.get_features(P_features.Recruiting_World)[0]; + if (p_data.has_feature(P_features.RecruitingWorld)) { + var _recruit_world = p_data.get_features(P_features.RecruitingWorld)[0]; if (_recruit_world.recruit_type == 0) && (obj_controller.faction_status[p_data.current_owner] != "War" && obj_controller.faction_status[p_data.current_owner] != "Antagonism" || p_data.player_disposition >= 50) { draw_text(xx+(spacing_x*3)+35, half_way-20, "Open: Voluntery"); } else if (_recruit_world.recruit_type == 0 && p_data.player_disposition <= 50) { @@ -381,9 +381,9 @@ if (obj_controller.selecting_planet!=0){ var building=instance_create(x,y,obj_temp_build); building.target=target; building.planet=obj_controller.selecting_planet; - if (p_data.has_upgrade(P_features.Secret_Base)) then building.lair=1; + if (p_data.has_upgrade(P_features.SecretBase)) then building.lair=1; if (p_data.has_upgrade(P_features.Arsenal)) then building.arsenal=1; - if (p_data.has_upgrade(P_features.Gene_Vault)) then building.gene_vault=1; + if (p_data.has_upgrade(P_features.GeneVault)) then building.gene_vault=1; obj_controller.temp[104]=string(scr_master_loc()); obj_controller.menu=60; with(obj_star_select){ @@ -444,11 +444,11 @@ if (obj_controller.selecting_planet!=0){ } }else if (current_button=="+Recruiting"){ if (obj_controller.recruiting_worlds_bought > 0 && p_data.current_owner <= 5 && !p_data.at_war()) { - if (!p_data.has_feature(P_features.Recruiting_World)) { + if (!p_data.has_feature(P_features.RecruitingWorld)) { if (obj_controller.faction_status[eFACTION.Imperium] == "War") { obj_controller.recruiting_worlds_bought -= 1; } - array_push(target.p_feature[obj_controller.selecting_planet], new PlanetFeature(P_features.Recruiting_World)); + array_push(target.p_feature[obj_controller.selecting_planet], new PlanetFeature(P_features.RecruitingWorld)); if (obj_controller.selecting_planet) { obj_controller.recruiting_worlds += planet_numeral_name(obj_controller.selecting_planet, target); diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml index f67b6c95a0..5ea6b7576f 100644 --- a/scripts/scr_PlanetData/scr_PlanetData.gml +++ b/scripts/scr_PlanetData/scr_PlanetData.gml @@ -476,7 +476,7 @@ function PlanetData(planet, system) constructor{ static planet_training = function(local_screening_points) { var _training_happend = false; - if (has_feature(P_features.Recruiting_World)) { + if (has_feature(P_features.RecruitingWorld)) { if (obj_controller.gene_seed == 0 && obj_controller.recruiting > 0) { obj_controller.recruiting = 0; scr_alert("red", "recruiting", "The Chapter has run out of gene-seed!", 0, 0); @@ -609,7 +609,7 @@ function PlanetData(planet, system) constructor{ if (current_owner== eFACTION.Tau){ return false; } - if (has_feature(P_features.Gene_Stealer_Cult) && current_owner==eFACTION.Tyranids){ + if (has_feature(P_features.GeneStealerCult) && current_owner==eFACTION.Tyranids){ return false; } @@ -641,8 +641,8 @@ function PlanetData(planet, system) constructor{ if (planet_forces[eFACTION.Tyranids]>=4){ guard_attack="tyranids"; }else if (planet_forces[eFACTION.Tyranids]<4 && planet_forces[eFACTION.Tyranids]>0){ - if (has_feature(P_features.Gene_Stealer_Cult)){ - var _hidden_cult = get_features(P_features.Gene_Stealer_Cult)[0].hiding; + if (has_feature(P_features.GeneStealerCult)){ + var _hidden_cult = get_features(P_features.GeneStealerCult)[0].hiding; if (!_hidden_cult){ guard_attack="tyranids"; } @@ -656,7 +656,7 @@ function PlanetData(planet, system) constructor{ static pdf_attack_matrix = function(){ var _no_notable_traitors = planet_forces[eFACTION.Heretics]<=1; var _pdf_attack = ""; - if (planet_forces[eFACTION.Tyranids]>=4 && !has_feature(P_features.Gene_Stealer_Cult)){ + if (planet_forces[eFACTION.Tyranids]>=4 && !has_feature(P_features.GeneStealerCult)){ _pdf_attack = "tyranids"; } @@ -772,8 +772,8 @@ function PlanetData(planet, system) constructor{ var bar_percent_length = (bar_width/100); var current_bar_percent = 0; var hidden_cult = false; - if (has_feature(P_features.Gene_Stealer_Cult)){ - hidden_cult = get_features(P_features.Gene_Stealer_Cult)[0].hiding; + if (has_feature(P_features.GeneStealerCult)){ + hidden_cult = get_features(P_features.GeneStealerCult)[0].hiding; } for (var i=1;i<13;i++){ @@ -964,7 +964,7 @@ function PlanetData(planet, system) constructor{ for (i =0; i < feat_count ;i++){ cur_feature= features[i] if (cur_feature.planet_display != 0){ - if (cur_feature.f_type == P_features.Gene_Stealer_Cult){ + if (cur_feature.f_type == P_features.GeneStealerCult){ if (!cur_feature.hiding){ array_push(planet_displays, [cur_feature.planet_display, cur_feature]); } @@ -986,7 +986,7 @@ function PlanetData(planet, system) constructor{ if (upgrade_count>0){ for (i =0; i < upgrade_count ;i++){ var _upgrade = upgrades[i]; - if (_upgrade.f_type == P_features.Secret_Base){ + if (_upgrade.f_type == P_features.SecretBase){ if (_upgrade.forge>0){ var forge = _upgrade.forge_data; var size_string= $"{size[forge.size]} Chapter Forge" diff --git a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml index a381ff7b30..ad586451da 100644 --- a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml +++ b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml @@ -8,7 +8,7 @@ function scr_ancient_ruins_setup(){ recoverables=[]; failed_exploration = 0; unrecovered_items = false; - f_type = P_features.Ancient_Ruins; + f_type = P_features.AncientRuins; exploration_complete= false; planet_display = $"{ruins_size} Unexplored Ancient Ruins"; completion_level = 0; @@ -216,7 +216,7 @@ function scr_explore_ruins() { function scr_check_for_ruins_exploration(select_planet, star){ var _planet_features = star.p_feature[select_planet] - var _ruins_list = search_planet_features( _planet_features, P_features.Ancient_Ruins) + var _ruins_list = search_planet_features( _planet_features, P_features.AncientRuins) var _explore_ruins=0; if (array_length(_ruins_list) > 0){ for (var _ruin = 0; _ruin < array_length(_ruins_list); _ruin++){ diff --git a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml index d3e48a48c5..5cac4df478 100644 --- a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml +++ b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml @@ -165,7 +165,7 @@ function apothecary_simple(){ } if (!marines_present){ if (obj_controller.gene_seed == 0) and (obj_controller.recruiting > 0) { - var _training_ground = system_feature_bool(self.p_feature, P_features.Recruiting_World); + var _training_ground = system_feature_bool(self.p_feature, P_features.RecruitingWorld); if (_training_ground){ obj_controller.recruiting = 0; scr_alert("red", "recruiting", "The Chapter has run out of gene-seed!", 0, 0); diff --git a/scripts/scr_bomb_world/scr_bomb_world.gml b/scripts/scr_bomb_world/scr_bomb_world.gml index 70662fab14..4b17f23a0b 100644 --- a/scripts/scr_bomb_world/scr_bomb_world.gml +++ b/scripts/scr_bomb_world/scr_bomb_world.gml @@ -293,8 +293,8 @@ function scr_bomb_world(bombard_target_faction, bombard_ment_power, target_stren } scr_audience(eFACTION.Mechanicus, "bombard_angry", _disp_neg,); } - if (planet_feature_bool(system.p_feature[planet], P_features.Gene_Stealer_Cult)) { - delete_features(system.p_feature[planet], P_features.Gene_Stealer_Cult); + if (planet_feature_bool(system.p_feature[planet], P_features.GeneStealerCult)) { + delete_features(system.p_feature[planet], P_features.GeneStealerCult); adjust_influence(eFACTION.Tyranids, -100, planet, system); pip.text += " The xeno taint of the tyranids that was infesting the population has been completely eradicated with the planets cleansing"; } else { diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index fb188e356e..f19bc721bc 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -189,14 +189,14 @@ function scr_cheatcode(argument0) { case "ruinspopulate": with (obj_star) { for (var i = 1; i <= planets; i++) { - array_push(p_feature[i], new PlanetFeature(P_features.Ancient_Ruins)); + array_push(p_feature[i], new PlanetFeature(P_features.AncientRuins)); } } break; case "stcpopulate": with (obj_star) { for (var i = 1; i <= planets; i++) { - array_push(p_feature[i], new NewPlanetFeature(P_features.STC_Fragment)); + array_push(p_feature[i], new NewPlanetFeature(P_features.STCFragment)); } } break; @@ -352,7 +352,7 @@ function scr_cheatcode(argument0) { break; case "nidinvasion": with (obj_star){ - if (system_feature_bool(p_feature,P_features.Gene_Stealer_Cult)){ + if (system_feature_bool(p_feature,P_features.GeneStealerCult)){ summon_new_hive_fleet(); } } diff --git a/scripts/scr_destroy_planet/scr_destroy_planet.gml b/scripts/scr_destroy_planet/scr_destroy_planet.gml index d6c6634a2d..6c748a9b86 100644 --- a/scripts/scr_destroy_planet/scr_destroy_planet.gml +++ b/scripts/scr_destroy_planet/scr_destroy_planet.gml @@ -117,7 +117,7 @@ function scr_destroy_planet(destruction_method) { } scr_audience(eFACTION.Imperium, "declare_war", -50, "War", 9999, 2); - } else if (obj_controller.faction_status[eFACTION.Imperium] != "War" && planet_feature_bool(you.p_feature[baid], P_features.Daemonic_Incursion) == 0 && you.p_tyranids[baid] < 5) { + } else if (obj_controller.faction_status[eFACTION.Imperium] != "War" && planet_feature_bool(you.p_feature[baid], P_features.DaemonicIncursion) == 0 && you.p_tyranids[baid] < 5) { if (you.p_first[baid] == eFACTION.Imperium && you.p_type[baid] == "Hive") { obj_controller.loyalty -= 50; obj_controller.loyalty_hidden -= 50; diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index 4436a601a1..eea4feea10 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -109,7 +109,7 @@ function FeatureSelected(Feature, system, planet) constructor{ //TODO somthing if the forge has a hanger } break; - case P_features.Necron_Tomb: + case P_features.NecronTomb: generic=true; if (feature.awake==0 && feature.sealed==0){ @@ -128,17 +128,17 @@ function FeatureSelected(Feature, system, planet) constructor{ title = "Unknown Artifact"; body = "Unload Marines onto the planet to search for the artifact"; break; - case P_features.Ancient_Ruins: + case P_features.AncientRuins: generic=true; title = "Ancinet Ruins"; body = "Unload Marines onto the planet to explore the ruins"; break; - case P_features.STC_Fragment: + case P_features.STCFragment: generic=true; title = "STC Fragment"; body = $"Unload a {obj_ini.role[100][16]} and whatever entourage you deem necessary to recover the STC Fragment"; break; - case P_features.Gene_Stealer_Cult: + case P_features.GeneStealerCult: generic=true; var cult_control = planet_data.population_influences[eFACTION.Tyranids]; title = $"Cult of {feature.name}"; @@ -186,12 +186,12 @@ function FeatureSelected(Feature, system, planet) constructor{ body = "Without a force of orks to hold it together the fortress is slowly pulled apart from within by the inhabitants, It's capabilities will constantly decrease until soon there will be nothing left"; } break - case P_features.Recruiting_World: + case P_features.RecruitingWorld: generic = true; var _planet = planet_data.planet; var _star = obj_star_select.target; var p_data = new PlanetData(_planet, _star); - var _recruit_world = p_data.get_features(P_features.Recruiting_World)[0]; + var _recruit_world = p_data.get_features(P_features.RecruitingWorld)[0]; var _spare_apoth_points = p_data.get_local_apothecary_points(); title = "Marine Recruitment"; body = $"There are {_spare_apoth_points} apothecary rescource points available for recruit screening,\n\n"; diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 0455331a0b..2a1e79f490 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -10,9 +10,9 @@ function draw_player_fleet_combat_options(){ draw_text(xxx+12,yyy+237,"Enemy Fleets:"); draw_text(xxx+332,yyy+237,"Allied Fleets:"); - draw_text(xxx+310,yyy+118,"{strin[1]} {string_plural(Battleship,strin[1])} ({strin[4]}% HP)"); - draw_text(xxx+310,yyy+138,"{strin[2]} {string_plural(Frigate,strin[2])} ({strin[5]}% HP)"); - draw_text(xxx+310,yyy+158,"{strin[3]} {string_plural(Escort,strin[3])} ({strin[6]}% HP)"); + draw_text(xxx+310,yyy+118,$"{strin[1]} {string_plural(Battleship,strin[1])} ({strin[4]}% HP)"); + draw_text(xxx+310,yyy+138,$"{strin[2]} {string_plural(Frigate,strin[2])} ({strin[5]}% HP)"); + draw_text(xxx+310,yyy+158,$"{strin[3]} {string_plural(Escort,strin[3])} ({strin[6]}% HP)"); draw_set_halign(fa_center); @@ -25,9 +25,9 @@ function draw_player_fleet_combat_options(){ if (enemy_fleet[i]!=0){ scr_image("ui/force",enemy_fleet[i],xxx+44-32,yyy+269-32,64,64); var shw=""; - shw += "{ecap[i]} : {string_plural( "Battleship",ecap[i])} \n"; - shw += "{efri[i]} :{string_plural( "Frigate",efri[i])} \n"; - shw += "{eesc[i]} :{string_plural( "Escort",eesc[i])} \n"; + shw += $"{ecap[i]} :"+string_plural( "Battleship",ecap[i]) + "\n"; + shw += $"{efri[i]} :"+string_plural("Frigate",efri[i]) + "\n"; + shw +=$"{eesc[i]} :"+string_plural( "Escort",eesc[i]) + "\n"; draw_text_transformed(xxx+44,yyy+286,shw,0.7,1,0); draw_set_halign(fa_center); @@ -39,9 +39,9 @@ function draw_player_fleet_combat_options(){ // draw_sprite(spr_force_icon,allied_fleet[1],xxx+374,yyy+269); scr_image("ui/force",allied_fleet[i],xxx+44+_ali_mod-32,yyy+269-32,64,64); var shw=""; - shw += "{acap[i]} : {string_plural( "Battleship",acap[i])} \n"; - shw += "{afri[i]} :{string_plural( "Frigate",afri[i])} \n"; - shw += "{aesc[i]} :{string_plural( "Escort",aesc[i])} \n"; + shw += $"{acap[i]} : {string_plural( "Battleship",acap[i])} \n"; + shw += $"{afri[i]} :{string_plural( "Frigate",afri[i])} \n"; + shw +=$"{aesc[i]} :{string_plural( "Escort",aesc[i])} \n"; draw_text_transformed(xxx+44+_ali_mod,yyy+286,shw,0.7,1,0); draw_set_halign(fa_center); diff --git a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml index 693e99049b..11d7dab2bd 100644 --- a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml +++ b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml @@ -56,7 +56,7 @@ function scr_enemy_ai_a() { cur_planet+=1; if (p_first[cur_planet]=1) and (p_owner[cur_planet]=2) then p_owner[cur_planet]=1; if (p_type[cur_planet]=="Dead") and (array_length(p_upgrades[cur_planet])>0){ - if (planet_feature_bool(p_feature[cur_planet], [P_features.Secret_Base,P_features.Arsenal,P_features.Gene_Vault])==0) /*and (string_count(".0|",p_upgrades[cur_planet])>0)*/{ + if (planet_feature_bool(p_feature[cur_planet], [P_features.SecretBase,P_features.Arsenal,P_features.GeneVault])==0) /*and (string_count(".0|",p_upgrades[cur_planet])>0)*/{ yep=cur_planet; } } @@ -853,10 +853,10 @@ function scr_enemy_ai_a() { }else if (p_owner[_run] = 10) { who_cleansed="Chaos" make_alert=true; - } else if (planet_feature_bool(p_feature[_run], P_features.Gene_Stealer_Cult) && p_tyranids[_run] <= 0){ + } else if (planet_feature_bool(p_feature[_run], P_features.GeneStealerCult) && p_tyranids[_run] <= 0){ who_cleansed="Gene Stealer Cult" make_alert=true; - delete_features(p_feature[_run], P_features.Gene_Stealer_Cult); + delete_features(p_feature[_run], P_features.GeneStealerCult); adjust_influence(eFACTION.Tyranids, -25, _run); } if (make_alert){ diff --git a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml index 941775497f..b79e2bb403 100644 --- a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml +++ b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml @@ -291,7 +291,7 @@ function scr_enemy_ai_b() { if ((rando >= 100) && (p_traitors[i] < 5)) { p_traitors[i] = 6; p_owner[i] = 10; - array_push(p_feature[i], new PlanetFeature(P_features.Daemonic_Incursion)); + array_push(p_feature[i], new PlanetFeature(P_features.DaemonicIncursion)); if (p_heresy[i] >= 80) { p_heresy[i] = 95; diff --git a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml index a89148a4c0..a483075e2d 100644 --- a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml +++ b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml @@ -95,7 +95,7 @@ function scr_enemy_ai_d() { if (result="imperial"){alert_text+="."; scr_alert("green","succession",alert_text,x,y); } - delete_features(p_feature[i], P_features.Succession_War); + delete_features(p_feature[i], P_features.SuccessionWar); if (result="chaos") then scr_event_log("purple",alert_text); if (result="tau") then scr_event_log("red",alert_text); if (result="imperial") then scr_event_log("",alert_text); @@ -244,7 +244,7 @@ function scr_enemy_ai_d() { } } - if (p_tyranids[i] > 3 && planet_feature_bool(p_feature[i], P_features.Gene_Stealer_Cult) && obj_controller.turn > 120){ + if (p_tyranids[i] > 3 && planet_feature_bool(p_feature[i], P_features.GeneStealerCult) && obj_controller.turn > 120){ if (!(has_problem_planet(i, "Hive Fleet"))){ var roll=irandom_range(0,300); var cont=0; diff --git a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml index 1c97668e94..55536d66ac 100644 --- a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml +++ b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml @@ -669,10 +669,10 @@ function scr_enemy_ai_e() { if (upgrade_type == P_features.Arsenal) { display_type = "Arsenal"; obj_controller.und_armouries++; - }else if (upgrade_type == P_features.Secret_Base) { + }else if (upgrade_type == P_features.SecretBase) { display_type = "Lair"; obj_controller.und_lairs++; - }else if (upgrade_type == P_features.Gene_Vault) { + }else if (upgrade_type == P_features.GeneVault) { display_type = "Gene Vault"; obj_controller.und_gene_vaults++; } @@ -680,7 +680,7 @@ function scr_enemy_ai_e() { scr_alert("green", "owner", string(tx), x, y); scr_event_log("", string(tx)); } - if (upgrade.built<=obj_controller.turn && upgrade_type == P_features.Secret_Base){ + if (upgrade.built<=obj_controller.turn && upgrade_type == P_features.SecretBase){ if (upgrade.forge > 0){ obj_controller.player_forge_data.player_forges+=sqr(upgrade.forge_data.size); if (upgrade.forge_data.vehicle_hanger){ diff --git a/scripts/scr_income/scr_income.gml b/scripts/scr_income/scr_income.gml index 16dabb946e..c7655c4053 100644 --- a/scripts/scr_income/scr_income.gml +++ b/scripts/scr_income/scr_income.gml @@ -68,7 +68,7 @@ function scr_income() { } else { var _nearest = distance_removed_star(x, y, 1); if (point_distance(x,y,_nearest.x,_nearest.y) <= 180){ - with (nearest){ + with (_nearest){ if (p_type[i]=="Forge") and (p_owner[i]==3) then obj_controller.income_forge+=6; if (p_type[i]=="Agri") and (p_owner[i]==2) then obj_controller.income_agri+=3; } diff --git a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml index 562abb2ba2..a7b2378434 100644 --- a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml +++ b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml @@ -49,7 +49,7 @@ function scr_inquisition_mission(event, forced_mission = -1){ for(var s = 0, _len = array_length(all_stars); s <_len; s++){ var star = all_stars[s]; - if(scr_star_has_planet_with_feature(star, P_features.Necron_Tomb) && !awake_necron_Star(star.id)){ + if(scr_star_has_planet_with_feature(star, P_features.NecronTomb) && !awake_necron_Star(star.id)){ array_push(necron_tomb_worlds, star); found_sleeping_necrons = true; } @@ -190,7 +190,7 @@ function mission_inquisition_tyranid_organism(worlds){ function mission_inquisition_tomb_world(tomb_worlds){ log_message("RE: Necron Tomb Bombing"); var star = choose_array(tomb_worlds) - var planet = scr_get_planet_with_feature(star, P_features.Necron_Tomb); + var planet = scr_get_planet_with_feature(star, P_features.NecronTomb); var eta = scr_mission_eta(star.x, star.y,1) var text=$"The Inquisition is trusting you with a special mission. They have reason to suspect the Necron Tomb on planet {string(star.name)} {scr_roman(planet)}"; @@ -371,7 +371,7 @@ function mission_investigate_planet(){ } var star = stars[irandom(valid_stars-1)]; - var planet = scr_get_planet_with_feature(star, P_features.Ancient_Ruins); + var planet = scr_get_planet_with_feature(star, P_features.AncientRuins); if (planet == -1){ log_error("RE: Investigate Planet, couldn't pick a planet"); exit; diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 7884636e61..fc982db679 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -198,8 +198,8 @@ function spawn_mechanicus_mission(){ with(obj_star){ - if(scr_star_has_planet_with_feature(id,P_features.Necron_Tomb)) and (awake_necron_Star(id)!= 0){ - var planet = scr_get_planet_with_feature(id, P_features.Necron_Tomb); + if(scr_star_has_planet_with_feature(id,P_features.NecronTomb)) and (awake_necron_Star(id)!= 0){ + var planet = scr_get_planet_with_feature(id, P_features.NecronTomb); if(scr_is_planet_owned_by_allies(self, planet)){ array_push(mechanicus_missions, "mech_tomb"); break; @@ -256,8 +256,8 @@ function spawn_mechanicus_mission(){ stars = scr_get_stars(); var valid_stars = array_filter_ext(stars, function(star,index) { - if(scr_star_has_planet_with_feature(star,P_features.Necron_Tomb)) and (awake_necron_Star(star)!= 0){ - var planet = scr_get_planet_with_feature(star, P_features.Necron_Tomb); + if(scr_star_has_planet_with_feature(star,P_features.NecronTomb)) and (awake_necron_Star(star)!= 0){ + var planet = scr_get_planet_with_feature(star, P_features.NecronTomb); if(scr_is_planet_owned_by_allies(star, planet)) { return true; } diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 4056306e83..32c9cfc2bc 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -228,8 +228,8 @@ function complete_garrison_mission(targ_planet, problem_index){ _mission_string+=$"while stationed {p_garrison.garrison_leader.name_role()} makes several notable observations and is able to instruct the planets defense core leaving the world better defended (fortifications++)."; } //TODO just generall apply this each turn with a garrison to see if a cult is found - if (planet_feature_bool(p_feature[targ_planet], P_features.Gene_Stealer_Cult)){ - var cult = return_planet_features(planet.features,P_features.Gene_Stealer_Cult)[0]; + if (planet_feature_bool(p_feature[targ_planet], P_features.GeneStealerCult)){ + var cult = return_planet_features(planet.features,P_features.GeneStealerCult)[0]; if (cult.hiding){ widom_test = tester.standard_test(p_garrison.garrison_leader, "wisdom",0, ["tyranids"]); if (widom_test[0]){ @@ -265,10 +265,10 @@ function complete_train_forces_mission(targ_planet, problem_index){ var _tyannic_vet = _trainer.has_trait("tyrannic_vet"); if (_tyannic_vet){ _wis_test_difficulty += 10; - if (planet.has_feature(P_features.Gene_Stealer_Cult)){ - var _cult = planet.get_features(P_features.Gene_Stealer_Cult)[0]; + if (planet.has_feature(P_features.GeneStealerCult)){ + var _cult = planet.get_features(P_features.GeneStealerCult)[0]; if (_cult.hiding){ - planet.delete_feature(P_features.Gene_Stealer_Cult); + planet.delete_feature(P_features.GeneStealerCult); _mission_string += $"Fortune has smiled on this mission, {_trainer.name_role()}'s abilities as a Veteran of dealing with the Tyranids came in handy and in a short period was able to discern the existencee of a cult. He was able to organise those he considered to be still loyal to rally an extermiation of the cult, reeports suggest he was so successful as to have completely wiped the genestealer presence from the planet"; } } diff --git a/scripts/scr_necron_tombs/scr_necron_tombs.gml b/scripts/scr_necron_tombs/scr_necron_tombs.gml index cb7adb1005..8d6480071d 100644 --- a/scripts/scr_necron_tombs/scr_necron_tombs.gml +++ b/scripts/scr_necron_tombs/scr_necron_tombs.gml @@ -5,7 +5,7 @@ function awaken_tomb_event(){ var valid_stars = array_filter_ext(stars, function(star, index){ - var tomb_world = scr_get_planet_with_feature(star,P_features.Necron_Tomb); + var tomb_world = scr_get_planet_with_feature(star,P_features.NecronTomb); if (tomb_world == -1) then return false; else { diff --git a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml index b12529f015..cbae87cacd 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -84,8 +84,8 @@ function ork_fleet_arrive_target(){ //generate refugee ships to spread tyranids if (p_tyranids[ork_attack_planet]<=0){ - if (planet_feature_bool(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult)){ - _pdata.delete_feature(P_features.Gene_Stealer_Cult); + if (planet_feature_bool(p_feature[ork_attack_planet], P_features.GeneStealerCult)){ + _pdata.delete_feature(P_features.GeneStealerCult); adjust_influence(eFACTION.Tyranids, -25, ork_attack_planet); var nearest_imperial = nearest_star_with_ownership(x,y,eFACTION.Imperium, self.id); if (nearest_imperial != "none"){ diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml index c54ab574c6..72952f6ece 100644 --- a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -80,7 +80,7 @@ function setup_genecult_infestation(){ if (_add_cult){ if (p_population[_planet] > 0) { _culted = true; - var new_cult = new PlanetFeature(P_features.Gene_Stealer_Cult); + var new_cult = new PlanetFeature(P_features.GeneStealerCult); array_push(p_feature[_planet], new_cult); new_cult.cult_age = irandom(300) p_influence[_planet][eFACTION.Tyranids] = new_cult.cult_age/10 + irandom(30); @@ -460,7 +460,7 @@ function setup_star_planet_defualts(){ break; case 2: if (p_type[i]!="Hive") and (p_type[i]!="Lava") and (goo==0){ - array_push(p_feature[i], new PlanetFeature(P_features.Necron_Tomb)) + array_push(p_feature[i], new PlanetFeature(P_features.NecronTomb)) goo=1; } break; @@ -469,19 +469,19 @@ function setup_star_planet_defualts(){ goo=1; break; case 4: - array_push(p_feature[i], new PlanetFeature( P_features.STC_Fragment)) + array_push(p_feature[i], new PlanetFeature( P_features.STCFragment)) goo=1; break; case 5: if (p_type[i]!="Ice") and (p_type[i]!="Dead") and (p_type[i]!="Feudal"){ goo=1; - array_push(p_feature[i], new PlanetFeature( P_features.Ancient_Ruins)) + array_push(p_feature[i], new PlanetFeature( P_features.AncientRuins)) } break; //alternative spawn for necron tomb probably needs merging with other method case 6: if ((p_type[i]=="Ice") or (p_type[i]=="Dead")){ - array_push(p_feature[i], new PlanetFeature( P_features.Necron_Tomb)) + array_push(p_feature[i], new PlanetFeature( P_features.NecronTomb)) goo=1; } break; @@ -489,7 +489,7 @@ function setup_star_planet_defualts(){ if ((p_type[i]=="Dead") or (p_type[i]=="Desert")){ var randum=floor(random(100))+1; if (randum<=25){ - array_push(p_feature[i], new PlanetFeature( P_features.Cave_Network)) + array_push(p_feature[i], new PlanetFeature( P_features.CaveNetwork)) goo=1; } } diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 76e3a949c0..2091684a1f 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -1,33 +1,33 @@ enum P_features { Sororitas_Cathedral, - Necron_Tomb, + NecronTomb, Artifact, - STC_Fragment, - Ancient_Ruins, - Cave_Network, - Recruiting_World, + STCFragment, + AncientRuins, + CaveNetwork, + RecruitingWorld, Monastery, Warlord6, OrkWarboss, Warlord10, - Special_Force, + SpecialForce, ChaosWarband, Webway, - Secret_Base, + SecretBase, Starship, - Succession_War, - Mechanicus_Forge, - Reclamation_pools, - Capillary_Towers, - Daemonic_Incursion, - Victory_Shrine, + SuccessionWar, + MechanicusForge, + ReclamationPools, + CapillaryTowers, + DaemonicIncursion, + VictoryShrine, Arsenal, - Gene_Vault, + GeneVault, Forge, - Gene_Stealer_Cult, + GeneStealerCult, Mission, - OrkStronghold - ShipDock + OrkStronghold, + ShipDock }; enum base_type{ @@ -53,7 +53,7 @@ function PlanetFeature(feature_type, other_data={}) constructor{ } uid = scr_uuid_generate(); switch(f_type){ - case P_features.Gene_Stealer_Cult: + case P_features.GeneStealerCult: PDF_control = 0; sealed = 0; player_hidden = false; @@ -64,14 +64,14 @@ function PlanetFeature(feature_type, other_data={}) constructor{ name = global.name_generator.generate_genestealer_cult_name(); break; - case P_features.Necron_Tomb: + case P_features.NecronTomb: awake = 0; sealed = 0; player_hidden = 1 planet_display = "Dormant Necron Tomb"; break; - case P_features.Secret_Base: + case P_features.SecretBase: base_type = 0; inquis_hidden =1; planet_display = "Hidden Secret Base"; @@ -101,7 +101,7 @@ function PlanetFeature(feature_type, other_data={}) constructor{ player_hidden = 0; built = obj_controller.turn+3; break; - case P_features.Gene_Vault: + case P_features.GeneVault: inquis_hidden=1; planet_display = "Arsenal"; player_hidden = 0; @@ -114,7 +114,7 @@ function PlanetFeature(feature_type, other_data={}) constructor{ player_hidden = 0; engineer_score = 0; break; - case P_features.Ancient_Ruins: + case P_features.AncientRuins: static ruins_explored = scr_ruins_explored; static explore = scr_explore_ruins; static determine_race = scr_ruins_determine_race; @@ -125,12 +125,12 @@ function PlanetFeature(feature_type, other_data={}) constructor{ static ruins_combat_end=scr_ruins_combat_end; scr_ancient_ruins_setup(); break; - case P_features.STC_Fragment: + case P_features.STCFragment: player_hidden = 1; Fragment_type =0; planet_display = "STC Fragment"; break; - case P_features.Cave_Network: + case P_features.CaveNetwork: player_hidden = 1; cave_depth =irandom(3);//allow_multiple levels of caves, option to go deeper planet_display = "Unexplored Cave Network"; @@ -161,7 +161,7 @@ function PlanetFeature(feature_type, other_data={}) constructor{ forge=0; name=global.name_generator.generate_imperial_ship_name(); break; - case P_features.Recruiting_World: + case P_features.RecruitingWorld: planet_display="Recruitment"; player_hidden = 0; recruit_type = 0; @@ -348,7 +348,7 @@ function system_player_hidden_feature(system){ //returns 1 if awake tomb world on planet 0 if tombs on planet but not awake and 2 if no tombs on planet function awake_tomb_world(planet){ var awake_tomb = 0; - var tombs = search_planet_features(planet, P_features.Necron_Tomb); + var tombs = search_planet_features(planet, P_features.NecronTomb); if (array_length(tombs)>0){ for (var tomb =0;tomb0){ for (var tomb =0;tomb0){ for (var tomb =0;tomb10) then p_heresy[planet_num]-=10; p_sisters[planet_num]=choose(2,2,3);goo=1; break; - case P_features.Necron_Tomb: + case P_features.NecronTomb: var lop=$"Necron Tomb discovered on {numeral_n}."; scr_alert("red","feature",lop,x,y); scr_event_log("red",lop); @@ -424,17 +424,17 @@ function scr_planetary_feature(planet_num) { scr_alert("green","feature",lop,x,y); scr_event_log("",lop); break; - case P_features.STC_Fragment: + case P_features.STCFragment: var lop=$"STC Fragment located on {numeral_n}."; scr_alert("green","feature",lop,x,y); scr_event_log("",lop); break; - case P_features.Ancient_Ruins: + case P_features.AncientRuins: var lop=$"A {feat.ruins_size} Ancient Ruins discovered on {string(name)} {scr_roman(planet_num)}."; scr_alert("green","feature",lop,x,y); scr_event_log("",lop); break; - case P_features.Cave_Network: + case P_features.CaveNetwork: var lop=$"Extensive Cave Network discovered on {numeral_n}."; scr_alert("green","feature",lop,x,y); scr_event_log("",lop); diff --git a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml index 84fae74663..df15ddd5e3 100644 --- a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml +++ b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml @@ -420,10 +420,6 @@ function player_retreat_from_fleet_combat(){ } with(obj_fleet_select){instance_destroy();} - /* - with(obj_ini){scr_dead_marines(1);} - with(obj_ini){scr_ini_ship_cleanup();} - */ } catch(_exception){ handle_exception(_exception) } diff --git a/scripts/scr_purge_world/scr_purge_world.gml b/scripts/scr_purge_world/scr_purge_world.gml index be5f2955d0..8e5014cf0c 100644 --- a/scripts/scr_purge_world/scr_purge_world.gml +++ b/scripts/scr_purge_world/scr_purge_world.gml @@ -160,8 +160,8 @@ function scr_purge_world(star, planet, action_type, action_score) { if (pop_before>0) and (pop_after=0) then heres_after=0; var nid_influence = star.p_influence[planet][eFACTION.Tyranids]; - if (planet_feature_bool(star.p_feature[planet], P_features.Gene_Stealer_Cult)) { - var cult = return_planet_features(star.p_feature[planet], P_features.Gene_Stealer_Cult)[0]; + if (planet_feature_bool(star.p_feature[planet], P_features.GeneStealerCult)) { + var cult = return_planet_features(star.p_feature[planet], P_features.GeneStealerCult)[0]; if (cult.hiding) {} } else { if (nid_influence > 25) { diff --git a/scripts/scr_random_event/scr_random_event.gml b/scripts/scr_random_event/scr_random_event.gml index 5279ef5e80..d90a0d9a86 100644 --- a/scripts/scr_random_event/scr_random_event.gml +++ b/scripts/scr_random_event/scr_random_event.gml @@ -589,7 +589,7 @@ function scr_random_event(execute_now) { } } - array_push(star.p_feature[planet], new PlanetFeature(P_features.Succession_War)); + array_push(star.p_feature[planet], new PlanetFeature(P_features.SuccessionWar)); add_new_problem(planet, "succession",irandom(6) + 4, star); star.dispo[planet] = -5000; diff --git a/scripts/scr_recruit_data/scr_recruit_data.gml b/scripts/scr_recruit_data/scr_recruit_data.gml index 17ad9e28b3..2310769378 100644 --- a/scripts/scr_recruit_data/scr_recruit_data.gml +++ b/scripts/scr_recruit_data/scr_recruit_data.gml @@ -21,7 +21,7 @@ enum eTrials{ function find_recruit_success_chance(local_apothecary_points, system, planet, ui=0) { var p_data = new PlanetData(planet, system); - var _recruit_world = p_data.get_features(P_features.Recruiting_World)[0]; + var _recruit_world = p_data.get_features(P_features.RecruitingWorld)[0]; var _recruit_cost = _recruit_world.recruit_cost; var recruit_type = scr_trial_data(obj_controller.recruit_trial); diff --git a/scripts/scr_star_ownership/scr_star_ownership.gml b/scripts/scr_star_ownership/scr_star_ownership.gml index 6cfb3a685a..d7b2c473e2 100644 --- a/scripts/scr_star_ownership/scr_star_ownership.gml +++ b/scripts/scr_star_ownership/scr_star_ownership.gml @@ -40,7 +40,7 @@ function scr_star_ownership(argument0) { if (p_type[run]="Daemon") then p_owner[run]=10; var _nid_chosen = false; - if (planet_feature_bool(p_feature[run], P_features.Gene_Stealer_Cult)){ + if (planet_feature_bool(p_feature[run], P_features.GeneStealerCult)){ if (p_influence[run][eFACTION.Tyranids]>50){ p_owner[run]=9; tyranids_owner+=1; @@ -68,7 +68,7 @@ function scr_star_ownership(argument0) { if (argument0!=false){ if (array_length(p_feature[run]) != 0){ - if (planet_feature_bool(p_feature[run], P_features.Daemonic_Incursion)==1){ + if (planet_feature_bool(p_feature[run], P_features.DaemonicIncursion)==1){ p_heresy[run]+=2; if (p_large[run]=0) and (p_population[run]>10000) then p_population[run]=floor(p_population[run]*0.5); if (p_large[run]=1) then p_population[run]=p_population[run]*0.7; @@ -80,14 +80,14 @@ function scr_star_ownership(argument0) { if (p_large[run]=1) then p_population[run]=p_population[run]*0.1; } if (array_length(p_feature[run])!=0){ - if (p_type[run]!="Dead") and (planet_feature_bool(p_feature[run], P_features.Daemonic_Incursion)==1) and (p_heresy[run]>=100){ + if (p_type[run]!="Dead") and (planet_feature_bool(p_feature[run], P_features.DaemonicIncursion)==1) and (p_heresy[run]>=100){ var randoo=choose(1,2,3,4); if (randoo=4){ p_type[run]="Daemon"; p_fortified[run]=6; p_traitors[run]=7; p_owner[run]=10; - delete_features(p_feature[run],P_features.Daemonic_Incursion); + delete_features(p_feature[run],P_features.DaemonicIncursion); } } } diff --git a/scripts/scr_system_spawn/scr_system_spawn.gml b/scripts/scr_system_spawn/scr_system_spawn.gml index 8f8a689a47..6451301a55 100644 --- a/scripts/scr_system_spawn/scr_system_spawn.gml +++ b/scripts/scr_system_spawn/scr_system_spawn.gml @@ -55,7 +55,7 @@ if (did){ } with(_current_system){ for(var f=1; f<=4; f++){ - if (array_length( search_planet_features(p_feature[f], P_features.Monastery)) >0)and (array_length( search_planet_features(p_feature[f], P_features.Recruiting_World)) >0){ + if (array_length( search_planet_features(p_feature[f], P_features.Monastery)) >0)and (array_length( search_planet_features(p_feature[f], P_features.RecruitingWorld)) >0){ if (p_owner[f]==eFACTION.Player) then p_owner[f]=eFACTION.Imperium; } if (array_length( search_planet_features(p_feature[f], P_features.Monastery)) >0){ @@ -99,7 +99,7 @@ if (did){ instance_activate_object(obj_star); instance_deactivate_object(_current_system); with (obj_star){ - if (system_feature_bool(p_feature, P_features.Recruiting_World)){ + if (system_feature_bool(p_feature, P_features.RecruitingWorld)){ instance_deactivate_object(id); break; } diff --git a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml index 877e130033..803def44a4 100644 --- a/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml +++ b/scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml @@ -122,7 +122,7 @@ function set_player_recruit_planet(recruit_planet){ name=obj_ini.home_name; } } - array_push(p_feature[recruit_planet], new PlanetFeature(P_features.Recruiting_World));//recruiting world + array_push(p_feature[recruit_planet], new PlanetFeature(P_features.RecruitingWorld));//recruiting world if (p_type[recruit_planet]=="random") then p_type[recruit_planet]=choose("Death","Temperate","Desert","Ice","Hive", "Fuedal"); if (global.chapter_name!="Lamenters") then obj_controller.recruiting_worlds+=string(name)+" II|"; } @@ -149,7 +149,7 @@ function set_player_homeworld_star(chosen_star){ var _recruit_star = array_random_element(_possible_planets) set_player_recruit_planet(_recruit_star); } else if (obj_ini.recruit_relative_loc==0){ - array_push(p_feature[_home_star], new PlanetFeature(P_features.Recruiting_World));//recruiting world + array_push(p_feature[_home_star], new PlanetFeature(P_features.RecruitingWorld));//recruiting world for (var i=1;i<=planets;i++){ if (i!=_home_star){ p_type[i] = array_random_element(_planet_types); diff --git a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml index 0b04770657..b0664ea4aa 100644 --- a/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml +++ b/scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.gml @@ -38,7 +38,7 @@ function tyranid_fleet_planet_action(){ is_dead = is_dead_star(); if (!is_dead) { for (var i=1;i<=planets;i++){ - if (planet_feature_bool(p_feature[i], P_features.Gene_Stealer_Cult)){ + if (planet_feature_bool(p_feature[i], P_features.GeneStealerCult)){ if (p_influence[i][eFACTION.Tyranids]>50){ var alert = $"The Genestealer Cult on {planet_numeral_name(i)} is exceedingly thorough, there is almost no resistance as the swarm descends and what little resistance remains is quickly quelled by infiltrators, most of the populations willingly offer themselves to their new gods jumping into acid vats to form biomass for their newly arrived gods or otherwise allowing themselves to be devoured by the teaming ripper swarms"; scr_popup("Tyranids",alert,"",""); @@ -49,7 +49,7 @@ function tyranid_fleet_planet_action(){ scr_popup("Tyranids",scr_alert,"",""); p_pdf[i]*=(p_influence[i][eFACTION.Tyranids]/100); } - delete_features(p_feature[i], P_features.Gene_Stealer_Cult); + delete_features(p_feature[i], P_features.GeneStealerCult); } } } @@ -158,7 +158,7 @@ function star_biomass_value(star, fleet=false){ _bio_val++; } } - var _cults = return_planet_features(p_features[i], P_features.Gene_Stealer_Cult) + var _cults = return_planet_features(p_features[i], P_features.GeneStealerCult) if (array_length(_cults)){ var _cult = _cults[0]; _bio_val++; diff --git a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml index dda09b8864..d95624f74a 100644 --- a/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml +++ b/scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.gml @@ -5,14 +5,14 @@ function tyranids_planet_biomass_extraction(){ if (p_tyranids[planet]>=5) and (planets>=planet) and (p_player[planet]+p_orks[planet]+p_guardsmen[planet]+p_pdf[planet]+p_chaos[planet]=0){ var ship=scr_orbiting_fleet(eFACTION.Tyranids); if (ship!="none" && p_type[planet]!="Dead" && ship.capital_number){ - if (planet_feature_bool(p_feature[planet], P_features.Reclamationpools) ==1){ + if (planet_feature_bool(p_feature[planet], P_features.ReclamationPools) ==1){ p_tyranids[planet]=0; if (p_type[planet]="Death") or (p_type[planet]="Hive") then ship.capital_number+=choose(0,1,1); ship.capital_number+=1; ship.escort_number+=3; ship.image_index=floor((ship.capital_number)+(ship.frigate_number/2)+(ship.escort_number/4)); p_type[planet]="Dead"; - delete_features(p_feature[planet], P_features.Reclamationpools);// show_message("D"); + delete_features(p_feature[planet], P_features.ReclamationPools);// show_message("D"); if (is_dead_star()) then image_alpha=0.33; // if image_alpha = 0.33 then send the ship somewhere new @@ -23,10 +23,10 @@ function tyranids_planet_biomass_extraction(){ } if (planet_feature_bool(p_feature[planet], P_features.CapillaryTowers)==1) and (p_type[planet]!="Dead"){ p_feature[planet]=[]; - array_push(p_feature[planet], new PlanetFeature(P_features.Reclamationpools)); + array_push(p_feature[planet], new PlanetFeature(P_features.ReclamationPools)); p_population[planet]=0;// show_message("C"); } - if (planet_feature_bool(p_feature[planet], P_features.CapillaryTowers)==0) and (planet_feature_bool(p_feature[planet], P_features.Reclamationpools)==0) and (p_type[planet]!="Dead"){ + if (planet_feature_bool(p_feature[planet], P_features.CapillaryTowers)==0) and (planet_feature_bool(p_feature[planet], P_features.ReclamationPools)==0) and (p_type[planet]!="Dead"){ array_push(p_feature[planet], new PlanetFeature(P_features.CapillaryTowers));// show_message("B"); } @@ -37,7 +37,7 @@ function tyranids_planet_biomass_extraction(){ function deploy_reclamation_pools(planet){ if (p_pdf[planet] <= 0){ - new PlanetFeature(P_features.Reclamationpools); + new PlanetFeature(P_features.ReclamationPools); array_push(p_feature[planet], ) } } @@ -45,8 +45,8 @@ function deploy_reclamation_pools(planet){ function genestealer_cult_end_turn_growth(planet){ - if (planet_feature_bool(p_feature[planet], P_features.Gene_Stealer_Cult)) { - var cult = return_planet_features(p_feature[planet], P_features.Gene_Stealer_Cult)[0]; + if (planet_feature_bool(p_feature[planet], P_features.GeneStealerCult)) { + var cult = return_planet_features(p_feature[planet], P_features.GeneStealerCult)[0]; cult.cult_age++; adjust_influence(eFACTION.Tyranids, cult.cult_age / 100, planet); var planet_garrison = system_garrison[planet - 1]; @@ -109,7 +109,7 @@ function genestealer_cult_end_turn_growth(planet){ } else if (p_influence[planet][eFACTION.Tyranids] > 5) { adjust_influence(eFACTION.Tyranids, -1, planet); if ((irandom(200) + (p_influence[planet][eFACTION.Tyranids] / 10)) > 195) { - array_push(p_feature[planet], new PlanetFeature(P_features.Gene_Stealer_Cult)); + array_push(p_feature[planet], new PlanetFeature(P_features.GeneStealerCult)); } } } \ No newline at end of file diff --git a/scripts/scr_ui_popup/scr_ui_popup.gml b/scripts/scr_ui_popup/scr_ui_popup.gml index cd4dd2c763..283124d74b 100644 --- a/scripts/scr_ui_popup/scr_ui_popup.gml +++ b/scripts/scr_ui_popup/scr_ui_popup.gml @@ -15,9 +15,9 @@ function scr_ui_popup() { var planet_upgrades = obj_temp_build.target.p_upgrades[obj_controller.selecting_planet]; var un_upgraded = 0,arsenal = 0, gene_vault=0,s_base=0,ttitle="",i=0; - if (planet_feature_bool(planet_upgrades, P_features.Secret_Base)==1){s_base=1} + if (planet_feature_bool(planet_upgrades, P_features.SecretBase)==1){s_base=1} if (planet_feature_bool(planet_upgrades, P_features.Arsenal)==1){arsenal=1} - if (planet_feature_bool(planet_upgrades, P_features.Gene_Vault)==1){gene_vault=1} + if (planet_feature_bool(planet_upgrades, P_features.GeneVault)==1){gene_vault=1} un_upgraded = gene_vault+arsenal+s_base; if (obj_temp_build.isnew == 1) { title = "Secret Lair (" + string(obj_temp_build.target.name) + " " + scr_roman(obj_temp_build.planet) + ")"; @@ -62,7 +62,7 @@ function scr_ui_popup() { if (scr_click_left()) { var base_options = {style: style.tag}; obj_temp_build.isnew = 0; - array_push(planet_upgrades, new PlanetFeature(P_features.Secret_Base, base_options)); + array_push(planet_upgrades, new PlanetFeature(P_features.SecretBase, base_options)); } } @@ -89,7 +89,7 @@ function scr_ui_popup() { draw_set_halign(fa_left); if (s_base>0){ - var search_list =search_planet_features(planet_upgrades, P_features.Secret_Base); + var search_list =search_planet_features(planet_upgrades, P_features.SecretBase); if (array_length(search_list) > 0){ var woob="",secret=true; var s_base = planet_upgrades[search_list[0]]; @@ -273,8 +273,8 @@ function scr_ui_popup() { if (arsenal.inquis_hidden == 1) then woob="A moderate sized secret Arsenal, this structure has ample holding area to store any number of artifacts and wargear. Chaos and Daemonic items will be sent here by your Master of Relics, and due to the secret nature of its existance, the Inquisition will not find them during routine inspections."; if (arsenal.inquis_hidden == 0) then woob="A moderate sized Arsenal, this structure has ample holding area to store any number of artifacts and wargear. Since being discovered it may no longer hide Chaos and Daemonic wargear from routine Inquisition inspections. You may wish to construct another Arsenal on a different planet."; } - if (planet_feature_bool(planet_upgrades, P_features.Gene_Vault)==1){ - var gene_vault = planet_upgrades[search_planet_features(planet_upgrades, P_features.Gene_Vault)[0]]; + if (planet_feature_bool(planet_upgrades, P_features.GeneVault)==1){ + var gene_vault = planet_upgrades[search_planet_features(planet_upgrades, P_features.GeneVault)[0]]; if (gene_vault.inquis_hidden == 1) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Due to its secret nature you may amass Gene-Seed and Test-Slave Incubators without fear of Inquisition reprisal or taking offense."; if (gene_vault.inquis_hidden == 0) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Since being discovered all the contents are known to the Inquisition. Your Gene-Seed remains protected but you may wish to build a new, secret one."; } @@ -334,7 +334,7 @@ function scr_ui_popup() { draw_set_alpha(0.2);draw_rectangle(xx+300,yy+175,xx+400,yy+195,0);draw_set_alpha(1); if (scr_click_left()) and (obj_controller.requisition>=4000){ - array_push(planet_upgrades, new PlanetFeature(P_features.Gene_Vault)); + array_push(planet_upgrades, new PlanetFeature(P_features.GeneVault)); obj_controller.requisition-=4000; } }draw_set_halign(fa_left); diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index 1c62865d3f..ffb92f4011 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -898,7 +898,7 @@ function planet_selection_action(){ } // STC Grab - if (planet_feature_bool(target.p_feature[sel_plan], P_features.STC_Fragment) == 1) and (recon=0){ + if (planet_feature_bool(target.p_feature[sel_plan], P_features.STCFragment) == 1) and (recon=0){ var tch,mch;frag=0;tch=0;mch=0; for (var frag=0;frag Date: Fri, 11 Jul 2025 14:01:45 +0100 Subject: [PATCH 102/155] further code cleanup --- .../scr_end_turn_combat_helpers.gml | 19 ++++++++++++------- .../scr_fleet_functions.gml | 6 ++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 2a1e79f490..de722ea3e0 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -163,16 +163,21 @@ function draw_player_ground_combat_options(){ draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Offensive"),1.1,1.1,0); - if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); + draw_set_color(c_gray); + draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); + draw_set_color(0); + draw_text_transformed(xxx+195,yyy+362,"Offensive",1.1,1.1,0); + if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)){ + draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); + draw_set_alpha(1); } draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Defensive"),1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); + draw_set_color(0); + draw_text_transformed(xxx+335,yyy+362,"Defensive",1.1,1.1,0); + if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)){ + draw_set_alpha(0.2); + draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); } } \ No newline at end of file diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index 5dd1a0fe20..b03ce6db7c 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -178,10 +178,8 @@ function set_fleet_movement(fastest_route = true, new_action="move"){ var _eta = calculate_fleet_eta(x,y,action_x,action_y,action_spd,_target_is_sys,is_orbiting(),warp_able); action_eta = _eta; - if (action_eta<=0) or (owner != eFACTION.Inquisition){ - action_eta=eta; - - } else if (owner = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0){ + + if (owner = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0){ action_eta=2; } From 1cb07de249a3e6081c22d23e6edb85670b0d0dad Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 16 Jul 2025 21:48:55 +0100 Subject: [PATCH 103/155] final bit --- scripts/scr_event_code/scr_event_code.gml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/scr_event_code/scr_event_code.gml b/scripts/scr_event_code/scr_event_code.gml index b1d28a65be..5c32da3b7d 100644 --- a/scripts/scr_event_code/scr_event_code.gml +++ b/scripts/scr_event_code/scr_event_code.gml @@ -134,11 +134,10 @@ function event_end_turn_action(){ var last_ship = new_player_ship(new_ship_event, ship_spawn.system.name); add_ship_to_fleet(last_ship, _new_player_fleet) + var _ship = obj_ini.ship_data[last_ship]; - // show_message(string(obj_ini.ship_class[last_ship])+":"+string(obj_ini.ship[last_ship])); - - if (obj_ini.ship_size[last_ship]!=1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); - if (obj_ini.ship_size[last_ship]==1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} Escort '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); + if (_ship.size!=1) then scr_popup("Ship Constructed",$"Your new {_ship.class} '{_ship.name}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); + if (_ship.size==1) then scr_popup("Ship Constructed",$"Your new {_ship.class} Escort '{_ship.name}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); var bob=instance_create(ship_spawn.system.x+16,ship_spawn.system.y-24,obj_star_event); bob.image_alpha=1; bob.image_speed=1; From 27f5c52f9ddbd0db8ae817f65afbd1baa0ed2ae3 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 2 Aug 2025 15:13:13 +0100 Subject: [PATCH 104/155] crash and merge issues --- .../scr_end_turn_combat_helpers.gml | 8 ++++---- .../scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index de722ea3e0..5d6add3a73 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -10,9 +10,9 @@ function draw_player_fleet_combat_options(){ draw_text(xxx+12,yyy+237,"Enemy Fleets:"); draw_text(xxx+332,yyy+237,"Allied Fleets:"); - draw_text(xxx+310,yyy+118,$"{strin[1]} {string_plural(Battleship,strin[1])} ({strin[4]}% HP)"); - draw_text(xxx+310,yyy+138,$"{strin[2]} {string_plural(Frigate,strin[2])} ({strin[5]}% HP)"); - draw_text(xxx+310,yyy+158,$"{strin[3]} {string_plural(Escort,strin[3])} ({strin[6]}% HP)"); + draw_text(xxx+310,yyy+118,$"{strin[1]} {string_plural("Battleship",strin[1])} ({strin[4]}% HP)"); + draw_text(xxx+310,yyy+138,$"{strin[2]} {string_plural("Frigate",strin[2])} ({strin[5]}% HP)"); + draw_text(xxx+310,yyy+158,$"{strin[3]} {string_plural("Escort",strin[3])} ({strin[6]}% HP)"); draw_set_halign(fa_center); @@ -180,4 +180,4 @@ function draw_player_ground_combat_options(){ draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); } -} \ No newline at end of file +} diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index e868f6f2d6..8762f25ea5 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -50,9 +50,9 @@ function UnitQuickFindPanel() constructor{ group.techies++; } } else if (unit_location[0]==location_types.ship){ - if (unit.ship_location<_ship_count && unit.ship_location>-1){ - var _ship = obj_ini.ship_data[unit.ship_location]; - _ship.carrying+=unit.get_unit_size(); + if (_unit.ship_location<_ship_count && _unit.ship_location>-1){ + var _ship = obj_ini.ship_data[_unit.ship_location]; + _ship.carrying+=_unit.get_unit_size(); } } } From 4b63bae07a7ba8cadf2bdb1ebfdad0295c54e34c Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 3 Aug 2025 16:33:53 +0100 Subject: [PATCH 105/155] finissh moving end turn logic --- objects/obj_turn_end/Draw_64.gml | 15 +- objects/obj_turn_end/Mouse_56.gml | 130 ------------------ .../scr_end_turn_combat_helpers.gml | 121 +++++++++++++--- 3 files changed, 109 insertions(+), 157 deletions(-) delete mode 100644 objects/obj_turn_end/Mouse_56.gml diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 9f58c9039f..0dff11ba27 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -32,6 +32,7 @@ if (alerts>0) and (popups_end=1){ } } } + main_slate.inside_method = function(){ if (show>0) and (current_battle<=battles){ var xxx=main_slate.XX; @@ -41,17 +42,19 @@ main_slate.inside_method = function(){ draw_sprite(spr_purge_panel,0,xxx,yyy); // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); - if (battle_world[i]=-50) then scr_image("attacked",1,xxx+12,yyy+54,254,174); - if (battle_world[i]>0) then scr_image("attacked",0,xxx+12,yyy+54,254,174); + var _img = battle_world[i]==-50; + scr_image("attacked",_img,xxx+12,yyy+54,254,174); - draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(c_gray); - draw_text(xxx+8,yyy+13,string_hash_to_newline(string(i)+"/"+string(battles))); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_set_color(c_gray); + draw_text(xxx+8,yyy+13,"{i}/{battles}"); draw_set_halign(fa_center); draw_set_font(fnt_40k_30b); - if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Forces Attacked! ("+string(battle_location[i])+" "+scr_roman(battle_world[i])+")"),0.7,0.7,0); - if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Fleet Attacked! ("+string(battle_location[i])+" System)"),0.7,0.7,0); + if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({battle_location[i]} {scr_roman(battle_world[i])})"),0.7,0.7,0); + if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({battle_location[i]} System)"),0.7,0.7,0); scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); diff --git a/objects/obj_turn_end/Mouse_56.gml b/objects/obj_turn_end/Mouse_56.gml deleted file mode 100644 index 3dd305256c..0000000000 --- a/objects/obj_turn_end/Mouse_56.gml +++ /dev/null @@ -1,130 +0,0 @@ -var __b__; - -//so this only runs if there aren't these types of instances -__b__ = action_if_number(obj_saveload, 0, 0); -if __b__ -{ -__b__ = action_if_number(obj_popup, 0, 0); - if __b__ - { - __b__ = action_if_number(obj_ncombat, 0, 0); - if __b__ - { - __b__ = action_if_number(obj_fleet, 0, 0); - if __b__ - { - - if (obj_controller.complex_event=true) or (instance_exists(obj_temp_meeting)) then exit; - - - - var xxx,yyy; - xxx=__view_get( e__VW.XView, 0 )+535; - yyy=__view_get( e__VW.YView, 0 )+200; - - - - - - if (cooldown<=0) and (battle_world[current_battle]>0) and (combating=0){ - - var tip;tip=""; - - if (mouse_x>=xxx+132) and (mouse_y>=yyy+354) and (mouse_x=xxx+272) and (mouse_y>=yyy+354) and (mouse_x5){ - obj_ncombat.threat = _planet_data.planet_forces[_enemy]; - } - else if (_enemy=30){ - obj_ncombat.threat=1; - } - - // - _roster = new Roster(); - with (_roster){ - roster_location = _loc; - roster_planet = _planet; - determine_full_roster(); - only_locals(); - update_roster(); - if (array_length(selected_units)){ - setup_battle_formations(); - add_to_battle(); - } - } - delete _roster - instance_deactivate_object(battle_object[current_battle]); - } - } - } - } - } -} diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 5d6add3a73..bef5f0f43c 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -53,11 +53,12 @@ function draw_player_fleet_combat_options(){ var xxx=main_slate.XX; var _retreat_button = draw_unit_buttons([xxx+195,yyy+354],"Retreat"); + var _battle_sys = battle_pobject[current_battle]; if (point_and_click(_retreat_button)){ with(obj_fleet_select){ instance_destroy(); } - var that=instance_nearest(battle_pobject[current_battle].x,battle_pobject[current_battle].y,obj_p_fleet); + var that=instance_nearest(_battle_sys.x,_battle_sys.y,obj_p_fleet); that.alarm[3]=1; var that2=instance_create(0,0,obj_popup); that2.type=99; @@ -87,7 +88,8 @@ function draw_player_fleet_combat_options(){ var g=1;ee=1; - repeat(5){g+=1; + repeat(5){ + g+=1; if (enemy_fleet[g]!=0){ee+=1; obj_fleet.enemy[ee]=enemy_fleet[g]; obj_fleet.enemy_status[ee]=-1; @@ -98,7 +100,8 @@ function draw_player_fleet_combat_options(){ } } var g=0; - repeat(6){g+=1; + repeat(6){ + g+=1; if (allied_fleet[g]!=0){ ee+=1; obj_fleet.enemy[ee]=allied_fleet[g]; @@ -118,14 +121,14 @@ function draw_player_fleet_combat_options(){ } instance_activate_all(); - var stahr=instance_nearest(battle_pobject[current_battle].x,battle_pobject[current_battle].y,obj_star); + var stahr=instance_nearest(_battle_sys.x,_battle_sys.y,obj_star); obj_fleet.star_name=stahr.name; for (var p_num = 1; p_num5){ + obj_ncombat.threat = _planet_data.planet_forces[_enemy]; + } + else if (_enemy=30){ + obj_ncombat.threat=1; + } + + // + _roster = new Roster(); + with (_roster){ + roster_location = _loc; + roster_planet = _planet; + determine_full_roster(); + only_locals(); + update_roster(); + if (array_length(selected_units)){ + setup_battle_formations(); + add_to_battle(); + } + } + delete _roster + instance_deactivate_object(battle_object[current_battle]); } - - draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0); - draw_text_transformed(xxx+335,yyy+362,"Defensive",1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)){ - draw_set_alpha(0.2); - draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); - } } From 40ba745859340a4380cbd719e831790cabb5c5c0 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 3 Aug 2025 20:04:04 +0100 Subject: [PATCH 106/155] keep updating --- objects/obj_fleet/Create_0.gml | 38 ++--- objects/obj_star_select/Mouse_50.gml | 145 +----------------- objects/obj_turn_end/Draw_64.gml | 13 +- objects/obj_turn_end/obj_turn_end.yy | 1 - .../scr_end_turn_combat_helpers.gml | 12 +- .../scr_player_fleet_combat_functions.gml | 63 ++++++++ 6 files changed, 98 insertions(+), 174 deletions(-) diff --git a/objects/obj_fleet/Create_0.gml b/objects/obj_fleet/Create_0.gml index d2c3fb48f7..1261ff691b 100644 --- a/objects/obj_fleet/Create_0.gml +++ b/objects/obj_fleet/Create_0.gml @@ -78,27 +78,23 @@ k=-1; j=-1; -repeat(6){k+=1;j=-1; - repeat(11){j+=1; - enemy[j]=0; - enemy_status[j]=0; - - /*en_column[j,k]=""; - en_width[j,k]=0;en_height[j,k]=0; - en_num[j,k]=0;en_size[j,k]=0;*/ - - en_capital[j]=0; - en_capital_max[j]=0; - en_capital_lost[j]=0; - en_frigate[j]=0; - en_frigate_max[j]=0; - en_frigate_lost[j]=0; - en_escort[j]=0; - en_escort_max[j]=0; - en_escort_lost[j]=0; - en_ships_max[j]=0; - } -} +enemy = []; +enemy_status = []; + +/*en_column[j,k]=""; +en_width[j,k]=0;en_height[j,k]=0; +en_num[j,k]=0;en_size[j,k]=0;*/ + +en_capital = []; +en_capital_max = []; +en_capital_lost = []; +en_frigate = []; +en_frigate_max = []; +en_frigate_lost = []; +en_escort = []; +en_escort_max = []; +en_escort_lost = []; +en_ships_max = []; // Should be 0-5 for each of the factions diff --git a/objects/obj_star_select/Mouse_50.gml b/objects/obj_star_select/Mouse_50.gml index 63793a4dac..5ac57feca7 100644 --- a/objects/obj_star_select/Mouse_50.gml +++ b/objects/obj_star_select/Mouse_50.gml @@ -78,150 +78,17 @@ if (player_fleet>0) and (imperial_fleet+mechanicus_fleet+inquisitor_fleet+eldar_ repeat(7){i+=1; if (en_fleet[i]>0) and (mouse_x>=x3-24) and (mouse_y>=y3-24) and (mouse_x0){ - obj_controller.combat=combating; - - var xx=false, yy=false, good=false, e1=false,e2=false,e3=false; - - - var enemy_fleet = array_create(20, 0); - var allied_fleet = array_create(20, 0); - var ecap = array_create(20, 0); - var efri = array_create(20, 0); - var eesc = array_create(20, 0); - var acap = array_create(20, 0); - var afri = array_create(20, 0); - var aesc = array_create(20, 0); - - good=1; - - var p_fleet = get_nearest_player_fleet(x,y,true); - - obj_controller.temp[1099]=target.name; - good = (p_fleet!="none" and instance_exists(target)); - - if (good=1){// trying to find the star - instance_activate_object(obj_star); - obj_controller.x=target.x; - obj_controller.y=target.y;// show=current_battle; - - strin[1]=string(p_fleet.capital_number); - strin[2]=string(p_fleet.frigate_number); - strin[3]=string(p_fleet.escort_number); - // pull health values here - strin[4]=string(p_fleet.capital_health); - strin[5]=string(p_fleet.frigate_health); - strin[6]=string(p_fleet.escort_health); - - // pull enemy ships here - - var e=1; - var khorne_count=0; - var chaos_space_marine_count=0; - var en_capitals, en_frigates, en_escorts; - repeat(9){e+=1; - if (target.present_fleet[e]>0){ - obj_controller.temp[1070]=target.id; - obj_controller.temp[1071]=e; - en_capitals=0; - en_frigates=0; - en_escorts=0; - - with(obj_en_fleet){ - if (orbiting=obj_controller.temp[1070]) and (owner=obj_controller.temp[1071]){ - en_capitals+=capital_number; - en_frigates+=frigate_number; - en_escorts+=escort_number; - if (fleet_has_cargo("warband")) then khorne_count++; - if (fleet_has_cargo("csm")){ - chaos_space_marine_count++; - } - } - } - - var l1,l2;l1=0;l2=0; - if (obj_controller.faction_status[e]!="War") and (e!=combating){ - repeat(10){ - l1+=1; - if (allied_fleet[l1]=0) and (l2=0) then l2=l1; - } - allied_fleet[l2]=e; - acap[l2]=en_capitals; - afri[l2]=en_frigates; - aesc[l2]=en_escorts; - }else if (obj_controller.faction_status[e]="War") or (e=9) or (e=combating){ - repeat(10){ - l1+=1; - if (enemy_fleet[l1]=0) and (l2=0) then l2=l1; - } - enemy_fleet[l2]=e; - ecap[l2]=en_capitals; - efri[l2]=en_frigates; - eesc[l2]=en_escorts; - } - } - } - - - obj_controller.cooldown=8000; - - // Start battle here - - combating=1; - - instance_deactivate_all(true); - instance_activate_object(obj_controller); - instance_activate_object(obj_ini); - // instance_activate_object(battle_object[current_battle]); - instance_activate_object(p_fleet); - instance_activate_object(obj_star); - - instance_create(0,0,obj_fleet); - obj_fleet.star_name=target.name; - // - obj_fleet.enemy[1]=enemy_fleet[1]; - obj_fleet.enemy_status[1]=-1; - - obj_fleet.en_capital[1]=ecap[1]; - obj_fleet.en_frigate[1]=efri[1]; - obj_fleet.en_escort[1]=eesc[1]; - - // Plug in all of the enemies first - // And then plug in the allies after then with their status set to positive - - if (chaos_space_marine_count){ - obj_fleet.csm_exp=1; - } - if (khorne_count){ - obj_fleet.csm_exp=2; - } - - - for (var i=0;i0) and (popups_end=1){ } main_slate.inside_method = function(){ - if (show>0) and (current_battle<=battles){ + if (show>0 && current_battle<=battles && current_battle>-1){ var xxx=main_slate.XX; var yyy=main_slate.YY; var i=current_battle; - draw_sprite(spr_purge_panel,0,xxx,yyy); // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); var _img = battle_world[i]==-50; @@ -48,13 +47,13 @@ main_slate.inside_method = function(){ draw_set_font(fnt_40k_14); draw_set_halign(fa_left); draw_set_color(c_gray); - draw_text(xxx+8,yyy+13,"{i}/{battles}"); + draw_text(xxx+8,yyy+13,$"{i}/{battles}"); draw_set_halign(fa_center); draw_set_font(fnt_40k_30b); - if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({battle_location[i]} {scr_roman(battle_world[i])})"),0.7,0.7,0); - if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({battle_location[i]} System)"),0.7,0.7,0); + if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({battle_location[i]} {scr_roman(battle_world[i])})",0.7,0.7,0); + if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({battle_location[i]} System)",0.7,0.7,0); scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); @@ -70,5 +69,7 @@ main_slate.inside_method = function(){ draw_set_alpha(1); } -main_slate.draw_with_dimensions(535, 200, 530, 400); +if (show>0 && current_battle<=battles && current_battle>-1){ + main_slate.draw_with_dimensions(535, 200, 530, 400); +} diff --git a/objects/obj_turn_end/obj_turn_end.yy b/objects/obj_turn_end/obj_turn_end.yy index dd6d187e86..b82d4eb138 100644 --- a/objects/obj_turn_end/obj_turn_end.yy +++ b/objects/obj_turn_end/obj_turn_end.yy @@ -10,7 +10,6 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":56,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index bef5f0f43c..8267c0a8de 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -52,7 +52,7 @@ function draw_player_fleet_combat_options(){ } var xxx=main_slate.XX; - var _retreat_button = draw_unit_buttons([xxx+195,yyy+354],"Retreat"); + var _retreat_button = draw_unit_buttons([xxx+180,yyy+350],"Retreat"); var _battle_sys = battle_pobject[current_battle]; if (point_and_click(_retreat_button)){ with(obj_fleet_select){ @@ -65,9 +65,8 @@ function draw_player_fleet_combat_options(){ obj_controller.force_scroll=1; } - var _fight_button = draw_unit_buttons([xxx+272,yyy+354],"Fight"); + var _fight_button = draw_unit_buttons([xxx+272,yyy+350],"Fight"); if (point_and_click(_fight_button)){ - obj_controller.cooldown=8000; instance_activate_all(); // Start battle here @@ -86,8 +85,7 @@ function draw_player_fleet_combat_options(){ // Plug in all of the enemies first // And then plug in the allies after then with their status set to positive - - var g=1;ee=1; + var g=1, ee=1; repeat(5){ g+=1; if (enemy_fleet[g]!=0){ee+=1; @@ -167,12 +165,12 @@ function draw_player_ground_combat_options(){ var _init_battle = false; - if (point_and_click(draw_unit_buttons([xxx+195,yyy+362],"Offensive")){ + if (point_and_click(draw_unit_buttons([xxx+195,yyy+362],"Offensive"))){ _init_battle = true; var _battle_stance = "offensive" } - if (point_and_click(draw_unit_buttons([xxx+335,yyy+362],"Defensive")){ + if (point_and_click(draw_unit_buttons([xxx+335,yyy+362],"Defensive"))){ _init_battle = true; var _battle_stance = "defensive" } diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index b226085efa..17d467c50e 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -27,6 +27,69 @@ function add_fleet_ships_to_combat(fleet, combat){ } } +function add_ai_fleet_to_combat(en_fleet, fleet_battle, status = -1){ + array_push(fleet_battle.enemy, en_fleet.owner); + array_push(fleet_battle.enemy_status, status); + + array_push(fleet_battle.en_capital, en_fleet.capital_number); + array_push(fleet_battle.en_frigate, en_fleet.frigate_number); + array_push(fleet_battle.en_escort, en_fleet.escort_number); + + if (fleet_has_cargo("warband")){ + fleet_battle.csm_exp+=2; + } + if (fleet_has_cargo("csm")){ + fleet_battle.csm_exp++; + } +} + +function setup_fleet_battle(combating, star){ + obj_controller.combat=combating; + var _p_fleet = get_nearest_player_fleet(x,y,true); + var good = (_p_fleet!="none" and instance_exists(star)); + if (!good){ + obj_controller.combat = 0; + exit; + } + instance_create(0,0,obj_fleet); + for (var e=2;e<12;e++){ + var _fleets = get_orbiting_fleets(e, target); + if (!array_length(_fleets)){ + continue; + } + if (e == combating || obj_controller.faction_status[e]=="War"){ + for (var f=0;f Date: Sun, 3 Aug 2025 22:28:50 +0100 Subject: [PATCH 107/155] keep on chugging --- objects/obj_al_ship/Step_0.gml | 2 +- objects/obj_en_ship/Step_0.gml | 9 ++++--- objects/obj_fleet/Alarm_4.gml | 8 +++--- objects/obj_fleet/Step_0.gml | 4 +-- objects/obj_p_assra/Step_0.gml | 4 ++- objects/obj_star_select/Draw_64.gml | 26 ++++++++++++------- objects/obj_star_select/Mouse_50.gml | 26 ------------------- .../scr_automated_ship_combat_functions.gml | 10 ++++--- .../scr_enemy_fleet_spawn_combat.gml | 7 +++-- .../scr_player_fleet_combat_functions.gml | 1 + 10 files changed, 43 insertions(+), 54 deletions(-) diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index a9d1c0cda6..7dab9a10d3 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -29,7 +29,7 @@ if (!__b__){ // Check if ship is destroyed if (hp<=0){ gud=0; - for(var wh=1; wh<=5; wh++){ + for (var wh=0;wh-1) and (instance_number(obj_en_ship)=0) then combat_end-=1; diff --git a/objects/obj_p_assra/Step_0.gml b/objects/obj_p_assra/Step_0.gml index b1363bfb80..5e5ed76c29 100644 --- a/objects/obj_p_assra/Step_0.gml +++ b/objects/obj_p_assra/Step_0.gml @@ -169,7 +169,9 @@ if (boarding=true) and (board_cooldown>=0) and (instance_exists(target)) and (in with(target){ var wh,gud;wh=0;gud=0; - repeat(5){wh+=1;if (obj_fleet.enemy[wh]=owner) then gud=wh;} + for (var wh=0;wh0){ // draw_sprite_ext(spr_force_icon,en_fleet[i],x3,y3,0.5,0.5,0,c_white,1); scr_image("ui/force",en_fleet[i],x3-16,y3-16,32,32); x3+=64; + + if (point_and_click([x3-24, y3-24, x3+48, y3+48])){ + combating=en_fleet[i]; + } } } - + if (_combating>0){ + setup_fleet_battle(combating, target); + + if (instance_exists(obj_fleet)){ + start_fleet_battle(); + } + } } } @@ -544,14 +555,9 @@ if (debug){ draw_text(38, 296, ("Necrons: " + string(target.p_necrons[current_planet]))); draw_text(38, 316, ("Sisters: " + string(target.p_sisters[current_planet]))); - draw_text(147, 176, string_hash_to_newline("[-] [+]")); - draw_text(147, 196, string_hash_to_newline("[-] [+]")); - draw_text(147, 216, string_hash_to_newline("[-] [+]")); - draw_text(147, 236, string_hash_to_newline("[-] [+]")); - draw_text(147, 256, string_hash_to_newline("[-] [+]")); - draw_text(147, 276, string_hash_to_newline("[-] [+]")); - draw_text(147, 296, string_hash_to_newline("[-] [+]")); - draw_text(147, 316, string_hash_to_newline("[-] [+]")); + for (var i=0;i<=7;i++){ + draw_text(147, 176+(i*20), "[-] [+]"); + } if (point_and_click([147, 176, 167, 196])) { target.p_orks[current_planet] = clamp(target.p_orks[current_planet] - 1, 0, 6); diff --git a/objects/obj_star_select/Mouse_50.gml b/objects/obj_star_select/Mouse_50.gml index 5ac57feca7..874d0157f1 100644 --- a/objects/obj_star_select/Mouse_50.gml +++ b/objects/obj_star_select/Mouse_50.gml @@ -69,32 +69,6 @@ if (obj_controller.cooldown<=0) and (loading==1){ attack=0;bombard=0;raid=0;purge=0; -if (player_fleet>0) and (imperial_fleet+mechanicus_fleet+inquisitor_fleet+eldar_fleet+ork_fleet+tau_fleet+heretic_fleet>0) and (obj_controller.cooldown<=0){ - var i,x3,y3;i=0; - // x3=xx+46;y3=yy+252; - x3=xx+49;y3=yy+441; - - var combating=0; - - repeat(7){i+=1; - if (en_fleet[i]>0) and (mouse_x>=x3-24) and (mouse_y>=y3-24) and (mouse_x0){ - setup_fleet_battle(combating, target); - - if (instance_exists(obj_fleet)){ - start_fleet_battle(); - } - } -} - - - /* */ } } diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 9ebfa529b9..6608362c11 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -437,17 +437,21 @@ function ship_combat_cleanup(){ op=0;var ofleet;ofleet=0; - repeat(5) { + for (var op=0;op0){ t=1; y2=room_height/total_enemies/2;tt=0; - for (var fug=1;fug<=5;fug++){ + for (var fug=0;fug0){ tt+=1; y1=(t*y2); diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 17d467c50e..cbca5e37ec 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -52,6 +52,7 @@ function setup_fleet_battle(combating, star){ exit; } instance_create(0,0,obj_fleet); + obj_fleet.target_enemy = combating; for (var e=2;e<12;e++){ var _fleets = get_orbiting_fleets(e, target); if (!array_length(_fleets)){ From 5e5631eedfe642d9c27bcafe42141f25a0b75cb3 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 9 Aug 2025 13:58:57 +0100 Subject: [PATCH 108/155] debug --- objects/obj_star_select/Draw_64.gml | 9 +++++---- .../scr_player_fleet_combat_functions.gml | 13 +++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/objects/obj_star_select/Draw_64.gml b/objects/obj_star_select/Draw_64.gml index f0dc735175..b380a73dec 100644 --- a/objects/obj_star_select/Draw_64.gml +++ b/objects/obj_star_select/Draw_64.gml @@ -507,16 +507,17 @@ if (target!=0){ if (en_fleet[i]>0){ // draw_sprite_ext(spr_force_icon,en_fleet[i],x3,y3,0.5,0.5,0,c_white,1); scr_image("ui/force",en_fleet[i],x3-16,y3-16,32,32); - x3+=64; - + //draw_rectangle_array() if (point_and_click([x3-24, y3-24, x3+48, y3+48])){ - combating=en_fleet[i]; + _combating=en_fleet[i]; + show_debug_message("batle ") } + x3+=64; } } if (_combating>0){ - setup_fleet_battle(combating, target); + setup_fleet_battle(_combating, target); if (instance_exists(obj_fleet)){ start_fleet_battle(); diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index cbca5e37ec..c9c1108e19 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -5,6 +5,7 @@ function add_fleet_ships_to_combat(fleet, combat){ var _ship_id; var _ships = fleet_full_ship_array(fleet); var _ship_array_length = array_length(_ships); + show_debug_message($"{_ships}") for (var i=0;i<_ship_array_length;i++){ try{ if (i>=array_length(_ships)) then break; @@ -44,6 +45,7 @@ function add_ai_fleet_to_combat(en_fleet, fleet_battle, status = -1){ } function setup_fleet_battle(combating, star){ + obj_controller.combat=combating; var _p_fleet = get_nearest_player_fleet(x,y,true); var good = (_p_fleet!="none" and instance_exists(star)); @@ -51,24 +53,27 @@ function setup_fleet_battle(combating, star){ obj_controller.combat = 0; exit; } + show_debug_message("create combat"); instance_create(0,0,obj_fleet); obj_fleet.target_enemy = combating; for (var e=2;e<12;e++){ var _fleets = get_orbiting_fleets(e, target); + show_debug_message(_fleets); if (!array_length(_fleets)){ continue; } if (e == combating || obj_controller.faction_status[e]=="War"){ + show_debug_message("target combat fleet"); for (var f=0;f Date: Mon, 11 Aug 2025 15:32:34 +0100 Subject: [PATCH 109/155] more debug --- objects/obj_star_select/Alarm_1.gml | 19 ++++--------- objects/obj_star_select/Draw_64.gml | 16 +++++++---- .../scr_player_fleet_combat_functions.gml | 4 +-- sprites/spr_blog/spr_blog.yy | 26 ++++++++++++++---- .../spr_creation_check/spr_creation_check.yy | 18 +++++++++--- .../spr_creation_existing.yy | 6 +++- .../spr_creation_founding.yy | 6 +++- .../71b3704f-7424-4cb3-852e-03a47b1f609c.png | Bin 0 -> 295 bytes .../d07f3659-6442-4004-bcfa-c2f9ad3619bf.png | Bin 0 -> 295 bytes .../spr_creation_other/spr_creation_other.yy | 19 ++++++++----- .../5386c8da-edfc-46b5-84d6-8b7f0dc471d6.png | Bin 0 -> 295 bytes .../edca4948-39ec-4e5f-ab97-4d1d7c174675.png | Bin 0 -> 295 bytes .../spr_creation_slate/spr_creation_slate.yy | 19 ++++++++----- .../spr_planet_splash/spr_planet_splash.yy | 6 +++- .../spr_servo_harness/spr_servo_harness.yy | 6 +++- sprites/spr_settings_bg/spr_settings_bg.yy | 6 +++- .../spr_terminator_laurel.yy | 6 +++- 17 files changed, 105 insertions(+), 52 deletions(-) create mode 100644 sprites/spr_creation_other/71b3704f-7424-4cb3-852e-03a47b1f609c.png create mode 100644 sprites/spr_creation_other/layers/71b3704f-7424-4cb3-852e-03a47b1f609c/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png create mode 100644 sprites/spr_creation_slate/5386c8da-edfc-46b5-84d6-8b7f0dc471d6.png create mode 100644 sprites/spr_creation_slate/layers/5386c8da-edfc-46b5-84d6-8b7f0dc471d6/edca4948-39ec-4e5f-ab97-4d1d7c174675.png diff --git a/objects/obj_star_select/Alarm_1.gml b/objects/obj_star_select/Alarm_1.gml index ce93d559ae..ab0555a30a 100644 --- a/objects/obj_star_select/Alarm_1.gml +++ b/objects/obj_star_select/Alarm_1.gml @@ -9,21 +9,12 @@ tau_fleet=target.present_fleet[8]; tyranid_fleet=target.present_fleet[9]; heretic_fleet=target.present_fleet[10]; -en_fleet[0]=0; -var i;i=-1; -repeat(15){i+=1;en_fleet[i]=0;} +en_fleet = []; -if (player_fleet>0) and (imperial_fleet+mechanicus_fleet+inquisitor_fleet+eldar_fleet+ork_fleet+tau_fleet+heretic_fleet>0){ - var open;open=1;i=-1; - - if (imperial_fleet>0){en_fleet[open]=2;open+=1;} - if (mechanicus_fleet>0){en_fleet[open]=3;open+=1;} - if (inquisitor_fleet>0){en_fleet[open]=4;open+=1;} - if (eldar_fleet>0){en_fleet[open]=6;open+=1;} - if (ork_fleet>0){en_fleet[open]=7;open+=1;} - if (tau_fleet>0){en_fleet[open]=8;open+=1;} - if (tyranid_fleet>0){en_fleet[open]=9;open+=1;} - if (heretic_fleet>0){en_fleet[open]=10;open+=1;} +for (var i=2;i<15;i++){ + if (scr_orbiting_fleet(i, target) != "none"){ + array_push(en_fleet, i); + } } diff --git a/objects/obj_star_select/Draw_64.gml b/objects/obj_star_select/Draw_64.gml index b380a73dec..81582fb933 100644 --- a/objects/obj_star_select/Draw_64.gml +++ b/objects/obj_star_select/Draw_64.gml @@ -504,13 +504,13 @@ if (target!=0){ var _combating = 0; for (var i=0;i0){ + if (en_fleet[i]>1){ // draw_sprite_ext(spr_force_icon,en_fleet[i],x3,y3,0.5,0.5,0,c_white,1); scr_image("ui/force",en_fleet[i],x3-16,y3-16,32,32); //draw_rectangle_array() if (point_and_click([x3-24, y3-24, x3+48, y3+48])){ _combating=en_fleet[i]; - show_debug_message("batle ") + show_debug_message("battle ") } x3+=64; } @@ -518,15 +518,19 @@ if (target!=0){ if (_combating>0){ setup_fleet_battle(_combating, target); - - if (instance_exists(obj_fleet)){ - start_fleet_battle(); - } + fleet_start = 0; } } } +if (instance_exists(obj_fleet)){ + fleet_start++; + if (fleet_start == 500){ + start_fleet_battle(); + } +} + diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index c9c1108e19..12072e2d7c 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -53,11 +53,11 @@ function setup_fleet_battle(combating, star){ obj_controller.combat = 0; exit; } - show_debug_message("create combat"); + show_debug_message($"create combat {combating}"); instance_create(0,0,obj_fleet); obj_fleet.target_enemy = combating; for (var e=2;e<12;e++){ - var _fleets = get_orbiting_fleets(e, target); + var _fleets = get_orbiting_fleets(e, star); show_debug_message(_fleets); if (!array_length(_fleets)){ continue; diff --git a/sprites/spr_blog/spr_blog.yy b/sprites/spr_blog/spr_blog.yy index 3551bd7584..dda850d0cb 100644 --- a/sprites/spr_blog/spr_blog.yy +++ b/sprites/spr_blog/spr_blog.yy @@ -68,17 +68,31 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":31.0, + "seqWidth":80.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":"c21a34a6-d266-489b-b6a0-0c679cf27c53","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40cf980a-c533-4a0f-8ff5-f24cfcfb77ad","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"535cb6f7-000e-4721-b110-366ed91586fd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c75c05d9-2ab6-451f-b4ba-17a06bacd03c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fecfc36-bb6d-4b7d-9923-5b749b1d36c4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82c9e0e1-20b5-4047-9966-b43b76e593f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"355f3481-2d74-4cce-932d-dc10af3c877b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"108fb78c-f692-4d04-9238-2f4fa17f5a1e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"40cf980a-c533-4a0f-8ff5-f24cfcfb77ad","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"535cb6f7-000e-4721-b110-366ed91586fd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c75c05d9-2ab6-451f-b4ba-17a06bacd03c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1fecfc36-bb6d-4b7d-9923-5b749b1d36c4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"82c9e0e1-20b5-4047-9966-b43b76e593f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"355f3481-2d74-4cce-932d-dc10af3c877b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"108fb78c-f692-4d04-9238-2f4fa17f5a1e","IsCreationKey":false,"Key":5.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_creation_check/spr_creation_check.yy b/sprites/spr_creation_check/spr_creation_check.yy index 2440c8b801..be967ad76d 100644 --- a/sprites/spr_creation_check/spr_creation_check.yy +++ b/sprites/spr_creation_check/spr_creation_check.yy @@ -66,15 +66,25 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.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":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4e462ad-1f0a-4b83-a287-77a37a746b99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c23faa1-9d33-420c-abee-14a54a948dbf","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd6d5659-448d-46f4-9338-1ce1f10a8664","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c38f65bc-11d7-4bd6-ac49-4cc4ca363472","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"254f0303-cebd-476e-b05b-d23837a0eb42","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abe0f3dc-6d7f-4162-a9fa-febc8f647d0b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a4e462ad-1f0a-4b83-a287-77a37a746b99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c23faa1-9d33-420c-abee-14a54a948dbf","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dd6d5659-448d-46f4-9338-1ce1f10a8664","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c38f65bc-11d7-4bd6-ac49-4cc4ca363472","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"254f0303-cebd-476e-b05b-d23837a0eb42","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"abe0f3dc-6d7f-4162-a9fa-febc8f647d0b","IsCreationKey":false,"Key":3.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_creation_existing/spr_creation_existing.yy b/sprites/spr_creation_existing/spr_creation_existing.yy index 46c72559b7..7fb651473a 100644 --- a/sprites/spr_creation_existing/spr_creation_existing.yy +++ b/sprites/spr_creation_existing/spr_creation_existing.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.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":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","path":"sprites/spr_creation_existing/spr_creation_existing.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27183917-bca7-4f08-bc34-9aabdb49048e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","path":"sprites/spr_creation_existing/spr_creation_existing.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"27183917-bca7-4f08-bc34-9aabdb49048e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_creation_founding/spr_creation_founding.yy b/sprites/spr_creation_founding/spr_creation_founding.yy index 40e9498613..dce7c3976c 100644 --- a/sprites/spr_creation_founding/spr_creation_founding.yy +++ b/sprites/spr_creation_founding/spr_creation_founding.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.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":"469027c1-a05e-49c8-975f-f88b2b836a4c","path":"sprites/spr_creation_founding/spr_creation_founding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db39a3f1-b108-4f5d-888b-a2ffdeff59bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"469027c1-a05e-49c8-975f-f88b2b836a4c","path":"sprites/spr_creation_founding/spr_creation_founding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"db39a3f1-b108-4f5d-888b-a2ffdeff59bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_creation_other/71b3704f-7424-4cb3-852e-03a47b1f609c.png b/sprites/spr_creation_other/71b3704f-7424-4cb3-852e-03a47b1f609c.png new file mode 100644 index 0000000000000000000000000000000000000000..752ebfa9a2c0c9d6346f16521cc64fa782b5e23d GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV4-Vh7-DE*WngS& zYNl;qU}a$N>-60lC>nC}Q!>*kack(FmYM?8paHj`Br`X)xFj*R0Joky%`UrvdKf%i L{an^LB{Ts5ki}0} literal 0 HcmV?d00001 diff --git a/sprites/spr_creation_other/layers/71b3704f-7424-4cb3-852e-03a47b1f609c/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png b/sprites/spr_creation_other/layers/71b3704f-7424-4cb3-852e-03a47b1f609c/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png new file mode 100644 index 0000000000000000000000000000000000000000..752ebfa9a2c0c9d6346f16521cc64fa782b5e23d GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV4-Vh7-DE*WngS& zYNl;qU}a$N>-60lC>nC}Q!>*kack(FmYM?8paHj`Br`X)xFj*R0Joky%`UrvdKf%i L{an^LB{Ts5ki}0} literal 0 HcmV?d00001 diff --git a/sprites/spr_creation_other/spr_creation_other.yy b/sprites/spr_creation_other/spr_creation_other.yy index 209bbc7828..53671ca3d0 100644 --- a/sprites/spr_creation_other/spr_creation_other.yy +++ b/sprites/spr_creation_other/spr_creation_other.yy @@ -11,7 +11,9 @@ "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, - "frames":[], + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"71b3704f-7424-4cb3-852e-03a47b1f609c","name":"71b3704f-7424-4cb3-852e-03a47b1f609c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], "gridX":0, "gridY":0, "height":32, @@ -47,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":0.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -61,16 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71b3704f-7424-4cb3-852e-03a47b1f609c","path":"sprites/spr_creation_other/spr_creation_other.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f55dee80-ce42-4666-bb72-a96190d214ae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_creation_slate/5386c8da-edfc-46b5-84d6-8b7f0dc471d6.png b/sprites/spr_creation_slate/5386c8da-edfc-46b5-84d6-8b7f0dc471d6.png new file mode 100644 index 0000000000000000000000000000000000000000..752ebfa9a2c0c9d6346f16521cc64fa782b5e23d GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV4-Vh7-DE*WngS& zYNl;qU}a$N>-60lC>nC}Q!>*kack(FmYM?8paHj`Br`X)xFj*R0Joky%`UrvdKf%i L{an^LB{Ts5ki}0} literal 0 HcmV?d00001 diff --git a/sprites/spr_creation_slate/layers/5386c8da-edfc-46b5-84d6-8b7f0dc471d6/edca4948-39ec-4e5f-ab97-4d1d7c174675.png b/sprites/spr_creation_slate/layers/5386c8da-edfc-46b5-84d6-8b7f0dc471d6/edca4948-39ec-4e5f-ab97-4d1d7c174675.png new file mode 100644 index 0000000000000000000000000000000000000000..752ebfa9a2c0c9d6346f16521cc64fa782b5e23d GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV4-Vh7-DE*WngS& zYNl;qU}a$N>-60lC>nC}Q!>*kack(FmYM?8paHj`Br`X)xFj*R0Joky%`UrvdKf%i L{an^LB{Ts5ki}0} literal 0 HcmV?d00001 diff --git a/sprites/spr_creation_slate/spr_creation_slate.yy b/sprites/spr_creation_slate/spr_creation_slate.yy index 1de0a3fe68..2c9785a247 100644 --- a/sprites/spr_creation_slate/spr_creation_slate.yy +++ b/sprites/spr_creation_slate/spr_creation_slate.yy @@ -11,7 +11,9 @@ "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, - "frames":[], + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"5386c8da-edfc-46b5-84d6-8b7f0dc471d6","name":"5386c8da-edfc-46b5-84d6-8b7f0dc471d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], "gridX":0, "gridY":0, "height":32, @@ -47,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":0.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -61,16 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5386c8da-edfc-46b5-84d6-8b7f0dc471d6","path":"sprites/spr_creation_slate/spr_creation_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1783eebf-e207-4cdd-939a-c2b6ea1f2b06","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_planet_splash/spr_planet_splash.yy b/sprites/spr_planet_splash/spr_planet_splash.yy index be9af08d9d..4b73d5ec93 100644 --- a/sprites/spr_planet_splash/spr_planet_splash.yy +++ b/sprites/spr_planet_splash/spr_planet_splash.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":128.0, + "seqWidth":128.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":"2c9150bc-4398-4602-912c-ca4949edb320","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ee5d7ca-42fa-4a31-a7f1-15a186131545","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c9150bc-4398-4602-912c-ca4949edb320","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6ee5d7ca-42fa-4a31-a7f1-15a186131545","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_servo_harness/spr_servo_harness.yy b/sprites/spr_servo_harness/spr_servo_harness.yy index 719d822d87..9ffcd2346b 100644 --- a/sprites/spr_servo_harness/spr_servo_harness.yy +++ b/sprites/spr_servo_harness/spr_servo_harness.yy @@ -64,12 +64,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":282.0, + "seqWidth":281.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":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd3a1e77-d409-44b9-b38b-b4a745e9b089","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fd3a1e77-d409-44b9-b38b-b4a745e9b089","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_settings_bg/spr_settings_bg.yy b/sprites/spr_settings_bg/spr_settings_bg.yy index 48dca5d6f9..1c9163d938 100644 --- a/sprites/spr_settings_bg/spr_settings_bg.yy +++ b/sprites/spr_settings_bg/spr_settings_bg.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":900.0, + "seqWidth":1600.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":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcfb2445-3d42-4b16-8d19-767110267766","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fcfb2445-3d42-4b16-8d19-767110267766","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_laurel/spr_terminator_laurel.yy b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy index d6d59991e4..85710db900 100644 --- a/sprites/spr_terminator_laurel/spr_terminator_laurel.yy +++ b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.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":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_terminator_laurel/spr_terminator_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84173a53-3c37-4c03-b242-f4e857a650c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_terminator_laurel/spr_terminator_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"84173a53-3c37-4c03-b242-f4e857a650c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, From e6aa9b49815e7ac87c2f85edb695f3bd5a741390 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 12 Aug 2025 12:31:37 +0100 Subject: [PATCH 110/155] almost fix fleet spawning --- objects/obj_fleet/Alarm_4.gml | 2 +- objects/obj_fleet/Create_0.gml | 2 +- .../scr_automated_ship_combat_functions.gml | 4 ++-- .../scr_enemy_fleet_spawn_combat.gml | 13 +++++++------ .../scr_player_fleet_combat_functions.gml | 12 ++++++++---- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/objects/obj_fleet/Alarm_4.gml b/objects/obj_fleet/Alarm_4.gml index 0562dc0560..09cf3dcb76 100644 --- a/objects/obj_fleet/Alarm_4.gml +++ b/objects/obj_fleet/Alarm_4.gml @@ -31,7 +31,7 @@ if (player_started=1){ taxt=string(global.chapter_name)+" engage and destroy a"; if (enemy[target_enemy]=2) or (enemy[target_enemy]=4) or (enemy[target_enemy]=5) or (enemy[target_enemy]=6) then taxt+="n"; taxt+=" "+string(obj_controller.faction[enemy[target_enemy]]); - taxt+=" fleet at "+string(ene_fleet.name)+".";scr_event_log("",taxt); + taxt+=" fleet at "+string(battle_system.name)+".";scr_event_log("",taxt); if (instance_exists(obj_star_select)) then with(obj_star_select){ alarm[1]=1;player_fleet=0; diff --git a/objects/obj_fleet/Create_0.gml b/objects/obj_fleet/Create_0.gml index 1261ff691b..a92adcc2a0 100644 --- a/objects/obj_fleet/Create_0.gml +++ b/objects/obj_fleet/Create_0.gml @@ -49,7 +49,7 @@ player_lasers=0; player_lasers_cd=70; player_lasers_target=0; pla_fleet=0; -ene_fleet=0; +battle_system=0; victory=false; instance_deactivate_all(true); diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 6608362c11..9361391db0 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -373,7 +373,7 @@ function ship_combat_cleanup(){ if (player_started=1){ _player_battle_fleet=pla_fleet; - yeehaw2=ene_fleet; + yeehaw2=battle_system; } if (player_started=0) and (instance_exists(obj_turn_end)){ @@ -417,7 +417,7 @@ function ship_combat_cleanup(){ } } else { with(obj_star){ - if (id!=obj_fleet.ene_fleet){ + if (id!=obj_fleet.battle_system){ x-=10000;y-=10000; } } diff --git a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml index c8b37b7050..c466a516bc 100644 --- a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml +++ b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml @@ -1,5 +1,6 @@ function start_enemy_fleet_spawn(){ + show_debug_message("start spawning enemy fleet"); var total_enemies=0; var total_allies=1; @@ -9,10 +10,10 @@ function start_enemy_fleet_spawn(){ for (var t=0;t0){ - total_allies+=1; + total_allies++; } // show_message("Computer "+string(t)+":"+string(enemy[t])+", status:"+string(enemy_status[t])); @@ -116,9 +117,9 @@ function start_enemy_fleet_spawn(){ function setup_fleet_spawn_characteristics(){ + show_debug_message("enemy fleet characteristics"); - - if (number=1){ + if (owner=1){ // create blocks of infantry @@ -134,7 +135,7 @@ function setup_fleet_spawn_characteristics(){ } - if (number>0) and (owner!=1){ + if (owner!=1){ en_escort=obj_fleet.en_escort[number]; en_frigate=obj_fleet.en_frigate[number]; @@ -476,7 +477,7 @@ function setup_fleet_spawn_characteristics(){ function position_ships_and_assign_stats(){ - + show_debug_message("assign ship stats"); if (owner = eFACTION.Imperium) or (owner = eFACTION.Eldar){// This is an orderly Imperial ship formation var xx,yy,i, temp1, x2, man; diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml index 12072e2d7c..11b8c28a31 100644 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.gml @@ -36,10 +36,10 @@ function add_ai_fleet_to_combat(en_fleet, fleet_battle, status = -1){ array_push(fleet_battle.en_frigate, en_fleet.frigate_number); array_push(fleet_battle.en_escort, en_fleet.escort_number); - if (fleet_has_cargo("warband")){ + if (fleet_has_cargo("warband", en_fleet)){ fleet_battle.csm_exp+=2; } - if (fleet_has_cargo("csm")){ + if (fleet_has_cargo("csm", en_fleet)){ fleet_battle.csm_exp++; } } @@ -56,9 +56,10 @@ function setup_fleet_battle(combating, star){ show_debug_message($"create combat {combating}"); instance_create(0,0,obj_fleet); obj_fleet.target_enemy = combating; + instance_activate_object(obj_en_fleet); for (var e=2;e<12;e++){ var _fleets = get_orbiting_fleets(e, star); - show_debug_message(_fleets); + show_debug_message($"fleet : {_fleets}"); if (!array_length(_fleets)){ continue; } @@ -82,7 +83,7 @@ function setup_fleet_battle(combating, star){ } } - obj_fleet.ene_fleet=star; + obj_fleet.battle_system=star; } function start_fleet_battle(){ @@ -93,6 +94,9 @@ function start_fleet_battle(){ instance_activate_object(obj_ini); instance_activate_object(obj_fleet); instance_activate_object(obj_cursor); + instance_activate_object(obj_en_ship); + instance_activate_object(obj_p_ship); + instance_activate_object(obj_al_ship); instance_deactivate_object(obj_star); } From b006efd428b0160b3f1df03ff8738bc1d83ca1b4 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 12 Aug 2025 13:09:06 +0100 Subject: [PATCH 111/155] combat works sorta yay --- objects/obj_al_ship/Step_0.gml | 2 +- objects/obj_en_ship/Step_0.gml | 2 +- objects/obj_fleet/Create_0.gml | 1 + .../scr_enemy_fleet_spawn_combat.gml | 12 ------------ .../scr_player_fleet_combat_functions.gml | 5 +++++ .../scr_ship_combat_data/scr_ship_combat_data.gml | 1 - 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/objects/obj_al_ship/Step_0.gml b/objects/obj_al_ship/Step_0.gml index 7dab9a10d3..86a5d3ac85 100644 --- a/objects/obj_al_ship/Step_0.gml +++ b/objects/obj_al_ship/Step_0.gml @@ -29,7 +29,7 @@ if (!__b__){ // Check if ship is destroyed if (hp<=0){ gud=0; - for (var wh=0;wh Date: Mon, 18 Aug 2025 22:34:47 +0100 Subject: [PATCH 112/155] fix end turn combat start --- objects/obj_turn_end/Draw_64.gml | 55 ++++++++++++- .../scr_end_turn_combat_helpers.gml | 81 +++---------------- .../scr_player_fleet_combat_functions.gml | 1 + 3 files changed, 63 insertions(+), 74 deletions(-) diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index e72282d939..f0f78bc9f3 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -2,7 +2,7 @@ // You can write your code in this editor - +add_draw_return_values(); var i=0; @@ -33,7 +33,56 @@ if (alerts>0) and (popups_end=1){ } } - +draw_set_alpha(1); if (show>0 && current_battle<=battles && current_battle>-1){ - main_slate.draw_with_dimensions(535, 200, 530, 400); + main_slate.inside_method = function(){ + if (show>0 && current_battle<=battles && current_battle>-1){ + var xxx=main_slate.XX; + var yyy=main_slate.YY; + var i=current_battle; + + // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); + // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); + var _img = battle_world[i]==-50; + + scr_image("attacked",_img,xxx+12,yyy+54,254,174); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_set_color(c_gray); + draw_text(xxx+8,yyy+13,$"{i}/{battles}"); + + draw_set_halign(fa_center); + draw_set_font(fnt_40k_30b); + + if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({battle_location[i]} {scr_roman(battle_world[i])})",0.7,0.7,0); + if (battle_world[i]==-50){ + draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({battle_location[i]} System)",0.7,0.7,0); + } + + scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); + // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + if (battle_world[current_battle]<0){ + draw_player_fleet_combat_options(); + } else if (battle_world[i]>=1){ + draw_player_ground_combat_options(); + } + } + draw_set_alpha(1); + } + if (!instance_exists(obj_fleet) && !instance_exists(obj_ncombat)){ + main_slate.draw_with_dimensions(535, 200, 530, 400); + } else { + if (instance_exists(obj_fleet)){ + ready_set++; + if (ready_set >=20){ + start_fleet_battle(); + } + } + } } + +pop_draw_return_values(); diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 8267c0a8de..440ca69d4f 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -37,7 +37,7 @@ function draw_player_fleet_combat_options(){ var _ali_mod = 330; if (allied_fleet[i]!=0){ // draw_sprite(spr_force_icon,allied_fleet[1],xxx+374,yyy+269); - scr_image("ui/force",allied_fleet[i],xxx+44+_ali_mod-32,yyy+269-32,64,64); + scr_image("ui/force",allied_fleet[i],xxx + 44+ _ali_mod -32,yyy+269-32,64,64); var shw=""; shw += $"{acap[i]} : {string_plural( "Battleship",acap[i])} \n"; shw += $"{afri[i]} :{string_plural( "Frigate",afri[i])} \n"; @@ -66,75 +66,14 @@ function draw_player_fleet_combat_options(){ } var _fight_button = draw_unit_buttons([xxx+272,yyy+350],"Fight"); - if (point_and_click(_fight_button)){ + if (point_and_click(_fight_button) && enemy_fleet[1]!=0){ instance_activate_all(); - // Start battle here - - combating=1; - - instance_create(0,0,obj_fleet); - // - obj_fleet.enemy[1]=enemy_fleet[1]; - obj_fleet.enemy_status[1]=-1; - - obj_fleet.en_capital[1]=ecap[1]; - obj_fleet.en_frigate[1]=efri[1]; - obj_fleet.en_escort[1]=eesc[1]; - - // Plug in all of the enemies first - // And then plug in the allies after then with their status set to positive + var _star = star_by_name(battle_location[current_battle]); + setup_fleet_battle(enemy_fleet[1], _star); - var g=1, ee=1; - repeat(5){ - g+=1; - if (enemy_fleet[g]!=0){ee+=1; - obj_fleet.enemy[ee]=enemy_fleet[g]; - obj_fleet.enemy_status[ee]=-1; - - obj_fleet.en_capital[ee]=ecap[g]; - obj_fleet.en_frigate[ee]=efri[g]; - obj_fleet.en_escort[ee]=eesc[g]; - } - } - var g=0; - repeat(6){ - g+=1; - if (allied_fleet[g]!=0){ - ee+=1; - obj_fleet.enemy[ee]=allied_fleet[g]; - obj_fleet.enemy_status[ee]=1; - - obj_fleet.en_capital[ee]=acap[g]; - obj_fleet.en_frigate[ee]=afri[g]; - obj_fleet.en_escort[ee]=aesc[g]; - } - } - - if (battle_special[current_battle]="csm"){ - obj_fleet.csm_exp=1; - } - if (battle_special[current_battle]="BLOOD"){ - obj_fleet.csm_exp=2; - } - - instance_activate_all(); - var stahr=instance_nearest(_battle_sys.x,_battle_sys.y,obj_star); - obj_fleet.star_name=stahr.name; - - for (var p_num = 1; p_num Date: Tue, 19 Aug 2025 01:51:28 +0100 Subject: [PATCH 113/155] behaviour edit --- objects/obj_en_ship/Step_0.gml | 23 ++++++------ .../scr_automated_ship_combat_functions.gml | 36 +++++++++++++++---- .../scr_enemy_fleet_spawn_combat.gml | 10 +++--- 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/objects/obj_en_ship/Step_0.gml b/objects/obj_en_ship/Step_0.gml index bd3a1b4b78..c729307da5 100644 --- a/objects/obj_en_ship/Step_0.gml +++ b/objects/obj_en_ship/Step_0.gml @@ -15,14 +15,9 @@ target_distance = 9999 // with obj_en_ship if not big then disable, check nearest, and activate once more -if (instance_exists(obj_p_ship)) and (!instance_exists(obj_al_ship)) then target=instance_nearest(x,y,obj_p_ship); -if (!instance_exists(obj_p_ship)) and (instance_exists(obj_al_ship)) then target=instance_nearest(x,y,obj_al_ship); -if (instance_exists(obj_p_ship)) and (instance_exists(obj_al_ship)){ - var tp1=instance_nearest(x,y,obj_p_ship); - var tp2=instance_nearest(x,y,obj_al_ship); - if (point_distance(x,y,tp1.x,tp1.y)<=point_distance(x,y,tp2.x,tp2.y)) then target=tp1; - if (point_distance(x,y,tp1.x,tp1.y)>point_distance(x,y,tp2.x,tp2.y)) then target=tp2; -} +find_ship_combat_target(obj_p_ship, obj_al_ship); + + if (!instance_exists(target)) then exit; if (hp<=0){ @@ -109,7 +104,9 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (turrets>0) and (instance_exists(obj_p_small)) and (turret_cool=0){ targe=instance_nearest(x,y,obj_p_small); - if (instance_exists(targe)) then target_distance=point_distance(x,y,targe.x,targe.y); + if (instance_exists(targe)){ + target_distance=point_distance(x,y,targe.x,targe.y); + } if (target_distance>64) and (target_distance<300){ bull=instance_create(x,y,obj_en_round); @@ -170,7 +167,7 @@ if (hp<=0){ husk.sprite_index=sprite_index;husk.direction=direction; husk.image_angle=image_angle;husk.depth=depth;husk.image_speed=0; repeat(choose(4,5,6)){ - var explo;explo=instance_create(x,y,obj_explosion); + var explo=instance_create(x,y,obj_explosion); explo.image_xscale=0.5;explo.image_yscale=0.5; explo.x+=random_range(sprite_width*0.25,sprite_width*-0.25); explo.y+=random_range(sprite_width*0.25,sprite_width*-0.25); @@ -186,7 +183,11 @@ if (hp>0) and (instance_exists(obj_p_ship)){ if (class="Shadow Class"){ closing_distance=200; action="swoop";spid=80;} - if (class="Hellebore") or (class="Aconite"){closing_distance=200;action="swoop";spid=100;} + if (class="Hellebore") or (class="Aconite"){ + closing_distance=200; + action="swoop"; + spid=100; + } target_distance=point_distance(x,y,target.x,target.y)-(max(sprite_get_width(target.sprite_index),sprite_get_height(sprite_index))); diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 9361391db0..e7bceb4df1 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -5,6 +5,25 @@ function point_on_circle(start_x, start_y, radius, angle){ return [_final_x, _final_y]; } +function find_ship_combat_target(primary_target_type = obj_en_ship, secondary_target_type = -1){ + if (instance_exists(primary_target_type) && !instance_exists(secondary_target_type)){ + target=instance_nearest(x,y,obj_p_ship); + } + if (!instance_exists(primary_target_type) && instance_exists(secondary_target_type)){ + target=instance_nearest(x,y,secondary_target_type); + } + if (instance_exists(primary_target_type)) and (instance_exists(secondary_target_type)){ + var _tp1=instance_nearest(x,y,primary_target_type); + var _tp2=instance_nearest(x,y,secondary_target_type); + if (point_distance(x,y,_tp1.x,_tp1.y)<=point_distance(x,y,_tp2.x,_tp2.y)){ + target=_tp1; + } + if (point_distance(x,y,_tp1.x,_tp1.y)>point_distance(x,y,_tp2.x,_tp2.y)){ + target=_tp2; + } + } +} + function combat_acceleration_control(){ var travel_distance = draw_targets == false ? target_distance : point_distance(x, y, draw_targets[0], draw_targets[1]); var _start_slowing = start_slowing_telemetry(travel_distance, speed_down); @@ -199,10 +218,17 @@ function flank_behaviour(){ } function defualt_target_movement(){ - if (y>=target.y) then target_distance=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); - if (ytarget.y) and (target_distance>closing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); - if (yclosing_distance) then direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); + if (y>=target.y){ + target_distance=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction-90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); + } else if (ytarget.y && target_distance>closing_distance) ){ + direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); + } else if (yclosing_distance){ + direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); + } } function start_slowing_telemetry(distance_to_target, deceleration){ @@ -215,9 +241,7 @@ function start_slowing_telemetry(distance_to_target, deceleration){ _start_slowing = true; } } - return _start_slowing; - } diff --git a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml index be142bee0e..8d47d67537 100644 --- a/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml +++ b/scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.gml @@ -653,7 +653,7 @@ function position_ships_and_assign_stats(){ - if (owner = eFACTION.Ork) or (owner = eFACTION.Chaos){// This is spew out random ships without regard for formations + if (owner = eFACTION.Ork || owner = eFACTION.Chaos){// This is spew out random ships without regard for formations var xx = 0,yy = 0,target_distance = 0,targ = 0,numb = 0,man = 0; var i; @@ -664,14 +664,16 @@ function position_ships_and_assign_stats(){ i+=1; if (en_column[i]!="") then for(s = 0; s < en_num[i]; s += 1){ + var _x = room_width-irandom_range(700, 950); + var _y = irandom_range(y,y+height)+50; if (en_size[i]>1){ - man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_capital); + man=instance_create(_x ,_y ,obj_en_capital); } else if (en_size[i]==2){ - man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_cruiser); + man=instance_create(_x, _y, obj_en_cruiser); } else if (en_size[i]=1){ - man=instance_create(random_range(1200,1400),round(random_range(y,y+height)+50),obj_en_cruiser); + man=instance_create(_x ,_y ,obj_en_cruiser); } man.class=en_column[i]; man.owner=owner; From 83dc2737bdff2b03ca220bd94a1c260ab4f9a06b Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Wed, 24 Sep 2025 22:29:58 +0200 Subject: [PATCH 114/155] fix: uncommented code that previously crashed the game --- scripts/scr_ComplexSet/scr_ComplexSet.gml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index ec83dfa0ce..5e77f35eea 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -601,10 +601,7 @@ function ComplexSet(_unit) constructor { if (valid_sprite_transform_data(_shadow_transform_data)){ shader_set_uniform_f_array(shadow_transform_uniform, _shadow_transform_data); - // Commented code, was causing a crash. - // TODO find why upon chapter creation. - // somewhere here an array goes out of bounds. Occurs upon creation and keeps happening in game, see bugs. To check on future - // shader_set_uniform_f_array(texture_shadow_transform_uniform, _shadow_transform_data); + shader_set_uniform_f_array(texture_shadow_transform_uniform, _shadow_transform_data); } // Bind shadow texture From 7bf95f3a1881cee604085d56025ff11ed6760c09 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Wed, 24 Sep 2025 22:38:13 +0200 Subject: [PATCH 115/155] fix: __cam variable declared and initiated multiple times --- .../__view_set_internal.gml | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/__view_set_internal/__view_set_internal.gml b/scripts/__view_set_internal/__view_set_internal.gml index 9df86e7e04..b8211faabc 100644 --- a/scripts/__view_set_internal/__view_set_internal.gml +++ b/scripts/__view_set_internal/__view_set_internal.gml @@ -2,19 +2,20 @@ function __view_set_internal(argument0, argument1, argument2) { var __prop = argument0; var __index = argument1; var __val = argument2; + var __cam = view_get_camera(__index) switch(__prop) { - case e__VW.XView: var __cam = view_get_camera(__index); camera_set_view_pos(__cam, __val, camera_get_view_y(__cam)); break; - case e__VW.YView: var __cam = view_get_camera(__index); camera_set_view_pos(__cam, camera_get_view_x(__cam), __val); break; - case e__VW.WView: var __cam = view_get_camera(__index); camera_set_view_size(__cam, __val, camera_get_view_height(__cam)); break; - case e__VW.HView: var __cam = view_get_camera(__index); camera_set_view_size(__cam, camera_get_view_width(__cam), __val); break; - case e__VW.Angle: var __cam = view_get_camera(__index); camera_set_view_angle(__cam, __val); break; - case e__VW.HBorder: var __cam = view_get_camera(__index); camera_set_view_border(__cam, __val, camera_get_view_border_y(__cam)); break; - case e__VW.VBorder: var __cam = view_get_camera(__index); camera_set_view_border(__cam, camera_get_view_border_x(__cam), __val); break; - case e__VW.HSpeed: var __cam = view_get_camera(__index); camera_set_view_speed(__cam, __val, camera_get_view_speed_y(__cam)); break; - case e__VW.VSpeed: var __cam = view_get_camera(__index); camera_set_view_speed(__cam, camera_get_view_speed_x(__cam), __val); break; - case e__VW.Object: var __cam = view_get_camera(__index); camera_set_view_target(__cam, __val); break; + case e__VW.XView: camera_set_view_pos(__cam, __val, camera_get_view_y(__cam)); break; + case e__VW.YView: camera_set_view_pos(__cam, camera_get_view_x(__cam), __val); break; + case e__VW.WView: camera_set_view_size(__cam, __val, camera_get_view_height(__cam)); break; + case e__VW.HView: camera_set_view_size(__cam, camera_get_view_width(__cam), __val); break; + case e__VW.Angle: camera_set_view_angle(__cam, __val); break; + case e__VW.HBorder: camera_set_view_border(__cam, __val, camera_get_view_border_y(__cam)); break; + case e__VW.VBorder: camera_set_view_border(__cam, camera_get_view_border_x(__cam), __val); break; + case e__VW.HSpeed: camera_set_view_speed(__cam, __val, camera_get_view_speed_y(__cam)); break; + case e__VW.VSpeed: camera_set_view_speed(__cam, camera_get_view_speed_x(__cam), __val); break; + case e__VW.Object: camera_set_view_target(__cam, __val); break; case e__VW.Visible: __res = view_set_visible(__index, __val); break; case e__VW.XPort: __res = view_set_xport(__index, __val); break; case e__VW.YPort: __res = view_set_yport(__index, __val); break; From b1d7c4bc2e8545af956c85ba8932afce8abf934d Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Wed, 24 Sep 2025 22:58:20 +0200 Subject: [PATCH 116/155] fix: obj_creation_popup switch case, var names and var declaration --- objects/obj_creation_popup/Draw_0.gml | 87 +++++++++++++-------------- 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/objects/obj_creation_popup/Draw_0.gml b/objects/obj_creation_popup/Draw_0.gml index 19c80ebdb0..496069a24a 100644 --- a/objects/obj_creation_popup/Draw_0.gml +++ b/objects/obj_creation_popup/Draw_0.gml @@ -1,9 +1,12 @@ var equip = false; -tooltip="";tooltip2=""; +var co; +var ide; +tooltip=""; +tooltip2=""; col_shift = (is_string(type)); if (!col_shift){ col_shift=type>0; - var equip = type>20; + equip = type>20; } if (col_shift){ if (!equip){ @@ -19,7 +22,6 @@ if (col_shift){ case 7: _colour_type = "Weapon Color Color";break; case "sgt_helm_primary": _colour_type = "Sgt Helm Primary";break; case "sgt_helm_secondary": _colour_type = "Sgt Helm Secondary";break; - } picker.title = _colour_type; @@ -32,16 +34,20 @@ if (col_shift){ } else { var _col = picker.chosen if (start_colour == -1){ - if (type = 1){start_colour = obj_creation.main_color} - if (type = 2){start_colour = obj_creation.secondary_color} - if (type = 3){start_colour = obj_creation.left_pauldron} - if (type = 4){start_colour = obj_creation.right_pauldron} - if (type = 5){start_colour = obj_creation.main_trim} - if (type = 6){start_colour = obj_creation.lens_color} - if (type = 7){start_colour = obj_creation.weapon_color} - if (is_string(type)){ - start_colour = obj_creation.complex_livery_data[$ role][$ type]; - } + switch(type){ + case 1: start_colour = obj_creation.main_color; break; + case 2: start_colour = obj_creation.secondary_color; break; + case 3: start_colour = obj_creation.left_pauldron; break; + case 4: start_colour = obj_creation.right_pauldron; break; + case 5: start_colour = obj_creation.main_trim; break; + case 6: start_colour = obj_creation.lens_color; break; + case 7: + start_colour = obj_creation.weapon_color; + if (is_string(type)){ + start_colour = obj_creation.complex_livery_data[$ role][$ type]; + } + break; + } } if (_col == -1){ _col = start_colour; @@ -65,18 +71,18 @@ if (col_shift){ } } - - if (equip) { - var co=100,ide=type-100; + co=100; + ide=type-100; draw_set_font(fnt_40k_30b); - if (obj_creation.role[co,ide]="") or (badname=1) then draw_set_color(c_red); - if (obj_creation.text_selected!="unit_name"+string(ide)) then draw_text_transformed(444,550,string_hash_to_newline(obj_creation.role[co,ide]),0.6,0.6,0); - if (obj_creation.text_selected="unit_name"+string(ide)) and (obj_creation.text_bar>30) then draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])),0.6,0.6,0); - if (obj_creation.text_selected="unit_name"+string(ide)) and (obj_creation.text_bar<=30) then draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])+"|"),0.6,0.6,0); + if (obj_creation.role[co,ide]="") or (badname=1){draw_set_color(c_red);} + if (obj_creation.text_selected!="unit_name"+string(ide)) {draw_text_transformed(444,550,string_hash_to_newline(obj_creation.role[co,ide]),0.6,0.6,0);} + if (obj_creation.text_selected="unit_name"+string(ide)) and (obj_creation.text_bar>30) {draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])),0.6,0.6,0);} + if (obj_creation.text_selected="unit_name"+string(ide)) and (obj_creation.text_bar<=30) {draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])+"|"),0.6,0.6,0);} var hei=string_height_ext(string_hash_to_newline(string(obj_creation.role[co,ide])+"Q"),-1,580)*0.6; - if (scr_hit(444,550,820,550+hei)){obj_cursor.image_index=2; + if (scr_hit(444,550,820,550+hei)){ + obj_cursor.image_index=2; tooltip="Astartes Role Name"; tooltip2=$"The name of this Astartes Role. The plural form will be ''{obj_creation.role[co,ide]}s''."; if (scr_click_left()){ @@ -84,7 +90,7 @@ if (col_shift){ keyboard_string=obj_creation.role[co,ide]; } } - if (obj_creation.text_selected="unit_name"+string(ide)) then obj_creation.role[co,ide]=keyboard_string; + if (obj_creation.text_selected="unit_name"+string(ide)) {obj_creation.role[co,ide]=keyboard_string;} draw_rectangle(444-1,550-1,822,550+hei,1); draw_set_color(CM_GREEN_COLOR); @@ -95,17 +101,17 @@ if (col_shift){ var x5 = 594; var y5 = 597 - spacing; - for (var gg = 0; gg <= 4; gg++) { + for (var slot_count = 0; slot_count <= 4; slot_count++) { y5 += spacing; - var title = $"{get_slot_name(type - 100, gg)}: "; - var geh; - switch (gg) { + var title = $"{get_slot_name(type - 100, slot_count)}: "; + var equipement_slot; + switch (slot_count) { // slots - case EquipmentSlot.WEAPON_ONE: geh = obj_creation.wep1[co, ide]; break; - case EquipmentSlot.WEAPON_TWO: geh = obj_creation.wep2[co, ide]; break; - case EquipmentSlot.ARMOUR: geh = obj_creation.armour[co, ide]; break; - case EquipmentSlot.GEAR: geh = obj_creation.gear[co, ide]; break; - case EquipmentSlot.MOBILITY: geh = obj_creation.mobi[co, ide]; break; + case EquipmentSlot.WEAPON_ONE: equipement_slot = obj_creation.wep1[co, ide]; break; + case EquipmentSlot.WEAPON_TWO: equipement_slot = obj_creation.wep2[co, ide]; break; + case EquipmentSlot.ARMOUR: equipement_slot = obj_creation.armour[co, ide]; break; + case EquipmentSlot.GEAR: equipement_slot = obj_creation.gear[co, ide]; break; + case EquipmentSlot.MOBILITY: equipement_slot = obj_creation.mobi[co, ide]; break; } draw_set_halign(fa_right); @@ -121,17 +127,17 @@ if (col_shift){ if (scr_click_left()) { var unit_type = type - 100; var is_invalid = ( - unit_type == eROLE.Dreadnought && gg > EquipmentSlot.WEAPON_TWO + unit_type == eROLE.Dreadnought && slot_count > EquipmentSlot.WEAPON_TWO ); if (!is_invalid) { tab=1; - target_gear=gg; + target_gear=slot_count; item_name = []; scr_get_item_names( item_name, unit_type, // eROLE - gg, // slot + slot_count, // slot eENGAGEMENT.Ranged, false, // no company standard false // don't limit to available items @@ -142,7 +148,7 @@ if (col_shift){ draw_set_alpha(1); draw_set_color(CM_GREEN_COLOR); draw_set_halign(fa_left); - draw_text(600, y5, string_hash_to_newline(string(geh))); + draw_text(600, y5, string_hash_to_newline(string(equipement_slot))); } var confirm_gear_button = { @@ -203,8 +209,6 @@ if (col_shift){ } - - if (target_gear > -1) { draw_set_valign(fa_top); tab = 1; @@ -298,18 +302,12 @@ if (target_gear > -1) { tab = 1; } - if (point_and_click(draw_unit_buttons([980,716], "CANCEL",[1,1], CM_GREEN_COLOR,, fnt_40k_14b, 1))){ target_gear=-1; } } - - - - - if (tooltip!="") and (obj_creation.change_slide<=0){ draw_set_alpha(1); draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(0); @@ -319,6 +317,3 @@ if (tooltip!="") and (obj_creation.change_slide<=0){ draw_set_font(fnt_40k_14b);draw_text(mouse_x+22,mouse_y+22,string_hash_to_newline(string(tooltip))); draw_set_font(fnt_40k_14);draw_text_ext(mouse_x+22,mouse_y+42,string_hash_to_newline(string(tooltip2)),-1,500); } - -/* */ -/* */ From dca59171f9399d4f80aaecf6b9f637acf94dbf91 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Wed, 24 Sep 2025 23:31:02 +0200 Subject: [PATCH 117/155] fix: small refactor of scr_ui_popup, switch cases, improved logic, commented unused code --- scripts/scr_ui_popup/scr_ui_popup.gml | 190 +++++++++++++------------- 1 file changed, 97 insertions(+), 93 deletions(-) diff --git a/scripts/scr_ui_popup/scr_ui_popup.gml b/scripts/scr_ui_popup/scr_ui_popup.gml index 41203ecbbd..f874e43623 100644 --- a/scripts/scr_ui_popup/scr_ui_popup.gml +++ b/scripts/scr_ui_popup/scr_ui_popup.gml @@ -2,8 +2,8 @@ function scr_ui_popup() { // 48,48 over like 256, down to 480-128 if (obj_controller.menu=60){ - var xx,yy; - xx=__view_get( e__VW.XView, 0 )+25;yy=__view_get( e__VW.YView, 0 )+165; + var xx=__view_get( e__VW.XView, 0 )+25; + var yy=__view_get( e__VW.YView, 0 )+165; draw_sprite(spr_popup_large,1,xx,yy); // draw_set_color(0);draw_rectangle(xx+31,yy+29,xx+593,yy+402,0); @@ -13,7 +13,12 @@ function scr_ui_popup() { draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); var planet_upgrades = obj_temp_build.target.p_upgrades[obj_controller.selecting_planet]; - var un_upgraded = 0,arsenal = 0, gene_vault=0,s_base=0,ttitle="",i=0; + var un_upgraded = 0; + var arsenal = 0; + var gene_vault=0; + var s_base=0; + var ttitle=""; + var woob=""; if (planet_feature_bool(planet_upgrades, P_features.Secret_Base)==1){s_base=1} if (planet_feature_bool(planet_upgrades, P_features.Arsenal)==1){arsenal=1} @@ -91,8 +96,9 @@ function scr_ui_popup() { if (s_base>0){ var search_list =search_planet_features(planet_upgrades, P_features.Secret_Base); if (array_length(search_list) > 0){ - var woob="",secret=true; - var s_base = planet_upgrades[search_list[0]]; + woob=""; + var secret=true; + s_base = planet_upgrades[search_list[0]]; if (s_base.built>obj_controller.turn){ draw_set_font(fnt_40k_14b); draw_text(xx+21,yy+65,string_hash_to_newline($"This feature will be constructed in {s_base.built-obj_controller.turn} months.")); @@ -103,18 +109,20 @@ function scr_ui_popup() { for (r=1;r<13;r++){ alp=1; cost=0; - if (r==1){if (s_base.forge>0) then alp=0.33;cost=1000;butt="Forge";tooltip2="A modest, less elaborate forge able to employ a handful of Astartes or Techpriest.";} - else if (r==2){if (s_base.hippo>0) then alp=0.33;cost=1000;butt="Hippodrome";tooltip2="A moderate sized garage fit to hold, service, and display vehicles.";} - else if (r==3){if (s_base.beastarium>0) then alp=0.33;cost=1000;butt="Beastarium";tooltip2="An enclosure with simulated greenery and foilage meant to hold beasts.";} - else if (r==4){if (s_base.torture>0) then alp=0.33;cost=500;butt="Torture Chamber";tooltip2="Only the best for the best. A room full of torture tools and devices.";} - else if (r==5){if (s_base.narcotics>0) then alp=0.33;cost=500;butt="Narcotics";tooltip2="Several boxes worth of Obscura, Black Lethe, Kyxa... line it up.";} - else if (r==6){if (s_base.relic>0) then alp=10+fuck.relic;cost=500;butt="Relic Room";tooltip2="A room meant for displaying trophies. May be purchased successive times.";} - else if (r==7){if (s_base.cookery>0) then alp=0.33;cost=250;butt="Cookery";tooltip2="A larger, well-stocked cookery, complete with a number of Imperial Chef servants.";} - else if (r==8){if (s_base.vox>0) then alp=0.33;cost=250;butt="Vox Casters";tooltip2="All the bass one could ever imaginably need.";} - else if (r==9){if (s_base.librarium>0) then alp=0.33;cost=250;butt="Librarium";tooltip2="A study fit to hold a staggering amount of tomes and scrolls.";} - else if (r==10){if (s_base.throne>0) then alp=0.33;cost=250;butt="Throne";tooltip2="A massive, ego boosting throne.";} - else if (r==11){if (s_base.stasis>0) then alp=0.33;cost=200;butt="Stasis Pods";tooltip2="Though they start empty, you may capture and display your foes in these.";} - else if (r==12){if (s_base.swimming>0) then alp=0.33;cost=100;butt="Swimming Pool";tooltip2="A large body of water meant for excersize or relaxation.";} + switch(r){ + case 1: if (s_base.forge>0) then alp=0.33;cost=1000;butt="Forge";tooltip2="A modest, less elaborate forge able to employ a handful of Astartes or Techpriest."; break; + case 2: if (s_base.hippo>0) then alp=0.33;cost=1000;butt="Hippodrome";tooltip2="A moderate sized garage fit to hold, service, and display vehicles."; break; + case 3: if (s_base.beastarium>0) then alp=0.33;cost=1000;butt="Beastarium";tooltip2="An enclosure with simulated greenery and foilage meant to hold beasts."; break; + case 4: if (s_base.torture>0) then alp=0.33;cost=500;butt="Torture Chamber";tooltip2="Only the best for the best. A room full of torture tools and devices."; break; + case 5: if (s_base.narcotics>0) then alp=0.33;cost=500;butt="Narcotics";tooltip2="Several boxes worth of Obscura, Black Lethe, Kyxa... line it up."; break; + case 6: if (s_base.relic>0) then alp=10+fuck.relic;cost=500;butt="Relic Room";tooltip2="A room meant for displaying trophies. May be purchased successive times."; break; + case 7: if (s_base.cookery>0) then alp=0.33;cost=250;butt="Cookery";tooltip2="A larger, well-stocked cookery, complete with a number of Imperial Chef servants."; break; + case 8: if (s_base.vox>0) then alp=0.33;cost=250;butt="Vox Casters";tooltip2="All the bass one could ever imaginably need."; break; + case 9: if (s_base.librarium>0) then alp=0.33;cost=250;butt="Librarium";tooltip2="A study fit to hold a staggering amount of tomes and scrolls."; break; + case 10: if (s_base.throne>0) then alp=0.33;cost=250;butt="Throne";tooltip2="A massive, ego boosting throne."; break; + case 11: if (s_base.stasis>0) then alp=0.33;cost=200;butt="Stasis Pods";tooltip2="Though they start empty, you may capture and display your foes in these."; break; + case 12: if (s_base.swimming>0) then alp=0.33;cost=100;butt="Swimming Pool";tooltip2="A large body of water meant for excersize or relaxation."; break; + } tooltip=butt; draw_set_font(fnt_40k_14);draw_set_alpha(alp);draw_set_color(c_gray); @@ -133,21 +141,23 @@ function scr_ui_popup() { tcost=cost; if (scr_click_left()) and (obj_controller.requisition>=tcost) and (alp!=0.33){ obj_controller.requisition-=tcost; - if (r=1){ - s_base.forge=1; - s_base.forge_data = new PlayerForge(); - } - else if (r==2){s_base.hippo=1;} - else if (r==3){s_base.beastarium=1} - else if (r==4){s_base.torture=1} - else if (r==5){s_base.narcotics=1} - else if (r==6){s_base.relic=1} - else if (r==7){s_base.cookery=1} - else if (r==8){s_base.vox=1} - else if (r==9){s_base.librarium=1} - else if (r==10){s_base.throne=1} - else if (r==11){s_base.stasis=1} - else if (r==12){s_base.swimming=1}; + switch(r){ + case 1: + s_base.forge=1; + s_base.forge_data = new PlayerForge(); + break; + case 2: s_base.hippo=1; break; + case 3: s_base.beastarium=1; break; + case 4: s_base.torture=1; break; + case 5: s_base.narcotics=1; break; + case 6: s_base.relic=1; break; + case 7: s_base.cookery=1; break; + case 8: s_base.vox=1; break; + case 9: s_base.librarium=1; break; + case 10: s_base.throne=1; break; + case 11: s_base.stasis=1; break; + case 12: s_base.swimming=1; break; + } } } } @@ -201,31 +211,35 @@ function scr_ui_popup() { if (fuck.target.p_player[obj_controller.selecting_planet]>0) then woob+="Imperial Chefs are currently bustling to and from the kitchen, cooking savory treats and food for those present. "; if (fuck.target.p_player[obj_controller.selecting_planet]=0) then woob+="The Imperial Chefs are mostly idle, making use of the other rooms and facilities. "; } - - if (s_base.stock==1) {woob+=" One of the chambers is hollowed out to display war trophies and gear. ";} - else if (s_base.stock==2){woob+=" One of the chambers holds war trophies from recent conquests. ";} - else if (s_base.stock==3){woob+=" War trophies taken from several Xeno races are displayed in the Relic Room. ";} - else if (s_base.stock==4){woob+=" Your Relic Room contains trophies and skulls, taken from every Xeno race. ";} - else if (s_base.stock==5){woob+=" Your Relic Room contains trophies, skulls, and suits of armour taken from Xenos races. ";} - else if (s_base.stock==6) {woob+=" Your Relic Room contains wargear and suits of armour from all races, several Adeptus Astartes suits included. ";} - else if (s_base.stock==7) {woob+=" One of the chambers holds wargear and suits of armour from all races. A suit of Terminator armour is included, half of the armour taken off to reveal the inner workings.";} - else if (s_base.stock==8) {woob+=" Your Relic Room's trophies, skulls, and armours now spill out into the hallways, such is their number. ";} - else if (s_base.stock==9) { woob+=" Many of the xenos war trophies and suits of armour are placed around the Lair, filling out spare surfaces. ";} - else if (s_base.stock==10) { woob+=" In addition to the many war trophies your Relic Room also has small amounts of gold coins. ";} - else if (s_base.stock==11) { woob+=" In addition to the many war trophies your Relic Room also has small piles of gold coins and clutter. ";} - else if (s_base.stock==12) { woob+=" In addition to the many war trophies your Relic Room also has sizeable piles of gold. ";} - else if (s_base.stock==13) {woob+=" In addition to the many war trophies your Relic Room also has chests and cabinets full of gold. ";} - else if (s_base.stock==14) {woob+=" In addition to the many war trophies your Relic Room also has chests full to the brim of gold and many precious gems. ";} - else if (s_base.stock==15) { woob+=" War trophies, chests of gold, precious gems, your lair has it all. ";} - else if (s_base.stock==16) {woob+=" War trophies, chests of gold, precious gems, your lair has it all, and in abundance. ";} - else if (s_base.stock==17) {woob+=" The abundant gold and gem piles have begun to spill out into the hallway. ";} - else if (s_base.stock==18) { woob+=" The abundant gold and gems spill out into the hallway, your forces idly stepping across it. ";} - else if (s_base.stock==19) { woob+=" A sizeable portion of your lair is carelessly covered in gold coins, objects, and gems. ";} - else if (s_base.stock==20) {woob+=" Much of your lair is carelessly covered in gold coins, objects, and gems. ";} - else if (s_base.stock>=21) and (s_base.stock<25) {woob+=" Your abundant wealth is evident in your lair- every surface and much of the floor smothered by gold or gems. ";} - else if (s_base.stock>=25) and (s_base.stock<30) {woob+=" Gold and gems are everywhere, occasionally attached to the walls and ceiling where able. ";} - else if (s_base.stock>=30) {woob+=" Gold and gems are EVERYWHERE. The main chamber in particular is a sea of gold and gems, especially deep at the corners. In all it is nearly three feet deep. Coins clink and settle as your forces walk through the room. ";} - + switch(s_base.stock){ + case 1: woob+=" One of the chambers is hollowed out to display war trophies and gear. "; break; + case 2: woob+=" One of the chambers holds war trophies from recent conquests. "; break; + case 3: woob+=" War trophies taken from several Xeno races are displayed in the Relic Room. "; break; + case 4: woob+=" Your Relic Room contains trophies and skulls, taken from every Xeno race. "; break; + case 5: woob+=" Your Relic Room contains trophies, skulls, and suits of armour taken from Xenos races. "; break; + case 6: woob+=" Your Relic Room contains wargear and suits of armour from all races, several Adeptus Astartes suits included. "; break; + case 7: woob+=" One of the chambers holds wargear and suits of armour from all races. A suit of Terminator armour is included, half of the armour taken off to reveal the inner workings."; break; + case 8: woob+=" Your Relic Room's trophies, skulls, and armours now spill out into the hallways, such is their number. "; break; + case 9: woob+=" Many of the xenos war trophies and suits of armour are placed around the Lair, filling out spare surfaces. "; break; + case 10: woob+=" In addition to the many war trophies your Relic Room also has small amounts of gold coins. "; break; + case 11: woob+=" In addition to the many war trophies your Relic Room also has small piles of gold coins and clutter. "; break; + case 12: woob+=" In addition to the many war trophies your Relic Room also has sizeable piles of gold. "; break; + case 13: woob+=" In addition to the many war trophies your Relic Room also has chests and cabinets full of gold. "; break; + case 14: woob+=" In addition to the many war trophies your Relic Room also has chests full to the brim of gold and many precious gems. "; break; + case 15: woob+=" War trophies, chests of gold, precious gems, your lair has it all. "; break; + case 16: woob+=" War trophies, chests of gold, precious gems, your lair has it all, and in abundance. "; break; + case 17: woob+=" The abundant gold and gem piles have begun to spill out into the hallway. "; break; + case 18: woob+=" The abundant gold and gems spill out into the hallway, your forces idly stepping across it. "; break; + case 19: woob+=" A sizeable portion of your lair is carelessly covered in gold coins, objects, and gems. "; break; + case 20: woob+=" Much of your lair is carelessly covered in gold coins, objects, and gems. "; break; + case 21: case 22: case 23: case 24: woob+=" Your abundant wealth is evident in your lair- every surface and much of the floor smothered by gold or gems. "; break; + case 25: case 26: case 27: case 28: case 29: woob+=" Gold and gems are everywhere, occasionally attached to the walls and ceiling where able. "; break; + default: + if (s_base.stock >= 30) { + woob+=" Gold and gems are EVERYWHERE. The main chamber in particular is a sea of gold and gems, especially deep at the corners. In all it is nearly three feet deep. Coins clink and settle as your forces walk through the room. "; + } + break; + } if (s_base.forge>0) then woob+=" Your lair has a forge, fit to be used by several astartes at once. "; if (s_base.hippo>0) then woob+=" Your lair has a hippodrome, or garage, that holds luxury vehicles. "; if (s_base.torture>0) then woob+=" One of the rooms is a well-stocked torture chamber. "; @@ -275,8 +289,8 @@ function scr_ui_popup() { } if (planet_feature_bool(planet_upgrades, P_features.Gene_Vault)==1){ var gene_vault = planet_upgrades[search_planet_features(planet_upgrades, P_features.Gene_Vault)[0]]; - if (gene_vault.inquis_hidden == 1) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Due to its secret nature you may amass Gene-Seed and Test-Slave Incubators without fear of Inquisition reprisal or taking offense."; - if (gene_vault.inquis_hidden == 0) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Since being discovered all the contents are known to the Inquisition. Your Gene-Seed remains protected but you may wish to build a new, secret one."; + if (gene_vault.inquis_hidden == 1) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Due to its secret nature you may amass Gene-Seed and Test-Slave Incubators without fear of Inquisition reprisal or taking offense."; + if (gene_vault.inquis_hidden == 0) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Since being discovered all the contents are known to the Inquisition. Your Gene-Seed remains protected but you may wish to build a new, secret one."; } if (arsenal!=0) or (gene_vault!=0){ draw_text_ext(xx+21,yy+65,string_hash_to_newline(string(woob)),-1,595); @@ -338,11 +352,8 @@ function scr_ui_popup() { obj_controller.requisition-=4000; } }draw_set_halign(fa_left); - } - - draw_set_font(fnt_40k_30b); draw_set_color(c_gray); draw_rectangle(xx+312-60,yy+388,xx+312+60,yy+420,0); @@ -360,14 +371,8 @@ function scr_ui_popup() { }draw_set_halign(fa_left); } - - - - - if (selected!=0) and (!instance_exists(selected)) then selected=0; - var xx=__view_get( e__VW.XView, 0 )+0; var yy=__view_get( e__VW.YView, 0 )+0; if (zoomed == 0){ @@ -512,34 +517,33 @@ function scr_ui_popup() { tooltip_draw(tool1) } } - } - exit; - - - if (mouse_x>=__view_get( e__VW.XView, 0 )+113) and (mouse_y>=__view_get( e__VW.YView, 0 )+4) and (mouse_x<__view_get( e__VW.XView, 0 )+185) and (mouse_y<__view_get( e__VW.YView, 0 )+19) and (zoomed=0){ - var blurp,blurp2,lines,i;blurp="";blurp2="";lines=0;i=0;draw_set_halign(fa_left); +exit; +// TODO: This code is to be deleted as has not been in use for a while. +// if (mouse_x>=__view_get( e__VW.XView, 0 )+113) and (mouse_y>=__view_get( e__VW.YView, 0 )+4) and (mouse_x<__view_get( e__VW.XView, 0 )+185) and (mouse_y<__view_get( e__VW.YView, 0 )+19) and (zoomed=0){ +// var blurp,blurp2,lines,i;blurp="";blurp2="";lines=0;i=0;draw_set_halign(fa_left); - repeat(20){ - i++;if (loyal_num[i]>1){ - blurp+=string(loyal[i])+": -"+string(loyal_num[i])+"#"; - blurp2+=string(loyal[i])+": #"; - lines++; - } - } +// repeat(20){ +// i++;if (loyal_num[i]>1){ +// blurp+=string(loyal[i])+": -"+string(loyal_num[i])+"#"; +// blurp2+=string(loyal[i])+": #"; +// lines++; +// } +// } - if (lines>0){ - var wi=183+93; - if (string_count("Irreverance",blurp)>0) then wi+=51; +// if (lines>0){ +// var wi=183+93; +// if (string_count("Irreverance",blurp)>0) then wi+=51; - draw_set_color(c_black); - draw_rectangle(__view_get( e__VW.XView, 0 )+113,__view_get( e__VW.YView, 0 )+24,__view_get( e__VW.XView, 0 )+wi,__view_get( e__VW.YView, 0 )+30+(lines*10),0); - draw_set_color(CM_GREEN_COLOR); - draw_rectangle(__view_get( e__VW.XView, 0 )+113,__view_get( e__VW.YView, 0 )+24,__view_get( e__VW.XView, 0 )+wi,__view_get( e__VW.YView, 0 )+30+(lines*10),1); +// draw_set_color(c_black); +// draw_rectangle(__view_get( e__VW.XView, 0 )+113,__view_get( e__VW.YView, 0 )+24,__view_get( e__VW.XView, 0 )+wi,__view_get( e__VW.YView, 0 )+30+(lines*10),0); +// draw_set_color(CM_GREEN_COLOR); +// draw_rectangle(__view_get( e__VW.XView, 0 )+113,__view_get( e__VW.YView, 0 )+24,__view_get( e__VW.XView, 0 )+wi,__view_get( e__VW.YView, 0 )+30+(lines*10),1); - draw_set_font(fnt_info); - draw_text_transformed(__view_get( e__VW.XView, 0 )+24+93,__view_get( e__VW.YView, 0 )+26,string_hash_to_newline(string(blurp)),0.7,0.7,0); - draw_text_transformed(__view_get( e__VW.XView, 0 )+24.5+93,__view_get( e__VW.YView, 0 )+26,string_hash_to_newline(string(blurp2)),0.7,0.7,0); - } - } +// draw_set_font(fnt_info); +// draw_text_transformed(__view_get( e__VW.XView, 0 )+24+93,__view_get( e__VW.YView, 0 )+26,string_hash_to_newline(string(blurp)),0.7,0.7,0); +// draw_text_transformed(__view_get( e__VW.XView, 0 )+24.5+93,__view_get( e__VW.YView, 0 )+26,string_hash_to_newline(string(blurp2)),0.7,0.7,0); +// } +// } +// END OF CODE TO DELETE } From fa509b6c150bd7f864d156cc36e4b8aef2a38371 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Wed, 24 Sep 2025 23:33:53 +0200 Subject: [PATCH 118/155] fix: commented out some unused code in scr_zoom --- scripts/scr_zoom/scr_zoom.gml | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/scr_zoom/scr_zoom.gml b/scripts/scr_zoom/scr_zoom.gml index ca256f2850..c4a05c8ee9 100644 --- a/scripts/scr_zoom/scr_zoom.gml +++ b/scripts/scr_zoom/scr_zoom.gml @@ -2,7 +2,6 @@ global.default_view_width = 1600; global.default_view_height = 900; function scr_zoom() { - // Zooms the view in or out when executed set_zoom_to_default(); if (obj_controller.zoomed) { @@ -70,29 +69,30 @@ function scr_zoom_keys() { } exit; + // TODO Delete code bellow + //global.zoom_level = clamp(global.zoom_level + (((mouse_wheel_down() - mouse_wheel_up())) * 0.1), 0.5, 2); - global.zoom_level = clamp(global.zoom_level + (((mouse_wheel_down() - mouse_wheel_up())) * 0.1), 0.5, 2); - - //Get current size - var view_w = camera_get_view_width(view_camera[0]); - var view_h = camera_get_view_height(view_camera[0]); + ////Get current size + //var view_w = camera_get_view_width(view_camera[0]); + //var view_h = camera_get_view_height(view_camera[0]); - //Set the rate of interpolation - var rate = 0.2; + ////Set the rate of interpolation + //var rate = 0.2; - //Get new sizes by interpolating current and target zoomed size - var new_w = lerp(view_w, global.zoom_level * global.default_zoom_width, rate); - var new_h = lerp(view_h, global.zoom_level * global.default_zoom_height, rate); + ////Get new sizes by interpolating current and target zoomed size + //var new_w = lerp(view_w, global.zoom_level * global.default_zoom_width, rate); + //var new_h = lerp(view_h, global.zoom_level * global.default_zoom_height, rate); - //Apply the new size - camera_set_view_size(view_camera[0], new_w, new_h); + ////Apply the new size + //camera_set_view_size(view_camera[0], new_w, new_h); - var vpos_x = camera_get_view_x(view_camera[0]); - var vpos_y = camera_get_view_y(view_camera[0]); + //var vpos_x = camera_get_view_x(view_camera[0]); + //var vpos_y = camera_get_view_y(view_camera[0]); - //change coordinates of camera so zoom is centered - var new_x = lerp(vpos_x,vpos_x+(view_w - global.zoom_level * global.default_zoom_width)/2, rate); - var new_y = lerp(vpos_y,vpos_y+(view_h - global.zoom_level * global.default_zoom_height)/2, rate); + ////change coordinates of camera so zoom is centered + //var new_x = lerp(vpos_x,vpos_x+(view_w - global.zoom_level * global.default_zoom_width)/2, rate); + //var new_y = lerp(vpos_y,vpos_y+(view_h - global.zoom_level * global.default_zoom_height)/2, rate); + // END OF CODE TO DELETE } global.zoom_level = 1; From fa7ad87533b644dcdde5f317708425a6b12b4f03 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Wed, 24 Sep 2025 23:42:16 +0200 Subject: [PATCH 119/155] fix: deleted unused code --- scripts/scr_ui_popup/scr_ui_popup.gml | 29 +-------------------------- scripts/scr_zoom/scr_zoom.gml | 25 ----------------------- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/scripts/scr_ui_popup/scr_ui_popup.gml b/scripts/scr_ui_popup/scr_ui_popup.gml index f874e43623..e83fda09b2 100644 --- a/scripts/scr_ui_popup/scr_ui_popup.gml +++ b/scripts/scr_ui_popup/scr_ui_popup.gml @@ -518,32 +518,5 @@ function scr_ui_popup() { } } } -exit; -// TODO: This code is to be deleted as has not been in use for a while. -// if (mouse_x>=__view_get( e__VW.XView, 0 )+113) and (mouse_y>=__view_get( e__VW.YView, 0 )+4) and (mouse_x<__view_get( e__VW.XView, 0 )+185) and (mouse_y<__view_get( e__VW.YView, 0 )+19) and (zoomed=0){ -// var blurp,blurp2,lines,i;blurp="";blurp2="";lines=0;i=0;draw_set_halign(fa_left); - -// repeat(20){ -// i++;if (loyal_num[i]>1){ -// blurp+=string(loyal[i])+": -"+string(loyal_num[i])+"#"; -// blurp2+=string(loyal[i])+": #"; -// lines++; -// } -// } - -// if (lines>0){ -// var wi=183+93; -// if (string_count("Irreverance",blurp)>0) then wi+=51; - -// draw_set_color(c_black); -// draw_rectangle(__view_get( e__VW.XView, 0 )+113,__view_get( e__VW.YView, 0 )+24,__view_get( e__VW.XView, 0 )+wi,__view_get( e__VW.YView, 0 )+30+(lines*10),0); -// draw_set_color(CM_GREEN_COLOR); -// draw_rectangle(__view_get( e__VW.XView, 0 )+113,__view_get( e__VW.YView, 0 )+24,__view_get( e__VW.XView, 0 )+wi,__view_get( e__VW.YView, 0 )+30+(lines*10),1); - -// draw_set_font(fnt_info); -// draw_text_transformed(__view_get( e__VW.XView, 0 )+24+93,__view_get( e__VW.YView, 0 )+26,string_hash_to_newline(string(blurp)),0.7,0.7,0); -// draw_text_transformed(__view_get( e__VW.XView, 0 )+24.5+93,__view_get( e__VW.YView, 0 )+26,string_hash_to_newline(string(blurp2)),0.7,0.7,0); -// } -// } -// END OF CODE TO DELETE + exit; } diff --git a/scripts/scr_zoom/scr_zoom.gml b/scripts/scr_zoom/scr_zoom.gml index c4a05c8ee9..79632dc69a 100644 --- a/scripts/scr_zoom/scr_zoom.gml +++ b/scripts/scr_zoom/scr_zoom.gml @@ -69,31 +69,6 @@ function scr_zoom_keys() { } exit; - // TODO Delete code bellow - //global.zoom_level = clamp(global.zoom_level + (((mouse_wheel_down() - mouse_wheel_up())) * 0.1), 0.5, 2); - - ////Get current size - //var view_w = camera_get_view_width(view_camera[0]); - //var view_h = camera_get_view_height(view_camera[0]); - - ////Set the rate of interpolation - //var rate = 0.2; - - ////Get new sizes by interpolating current and target zoomed size - //var new_w = lerp(view_w, global.zoom_level * global.default_zoom_width, rate); - //var new_h = lerp(view_h, global.zoom_level * global.default_zoom_height, rate); - - ////Apply the new size - //camera_set_view_size(view_camera[0], new_w, new_h); - - //var vpos_x = camera_get_view_x(view_camera[0]); - //var vpos_y = camera_get_view_y(view_camera[0]); - - ////change coordinates of camera so zoom is centered - //var new_x = lerp(vpos_x,vpos_x+(view_w - global.zoom_level * global.default_zoom_width)/2, rate); - //var new_y = lerp(vpos_y,vpos_y+(view_h - global.zoom_level * global.default_zoom_height)/2, rate); - // END OF CODE TO DELETE - } global.zoom_level = 1; From 283be3175216a3c91e4dcd1a7b9ab38671c8f343 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Wed, 24 Sep 2025 23:48:07 +0200 Subject: [PATCH 120/155] fix: for loop instead of while loop --- .../scr_system_search_helpers.gml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml index 1567f2c29f..6394f65345 100644 --- a/scripts/scr_system_search_helpers/scr_system_search_helpers.gml +++ b/scripts/scr_system_search_helpers/scr_system_search_helpers.gml @@ -54,7 +54,6 @@ function scr_planet_owned_by_group(planet_id, group, star = "none"){ } return is_in_group; } - return false; } function scr_is_planet_owned_by_allies(star, planet_id) { @@ -235,10 +234,8 @@ function distance_removed_star(origional_x,origional_y, star_offset = choose(2,3 function nearest_star_proper(xx,yy) { - var i=0; var cur_star; - while(i<100){ - i++; + for(var i=0; i<100; i++){ cur_star = instance_nearest(xx,yy, obj_star); if (!cur_star.craftworld && !cur_star.space_hulk){ instance_activate_object(obj_star); @@ -278,7 +275,7 @@ function nearest_star_with_ownership(xx,yy, ownership, start_star="none", ignore instance_deactivate_object(cur_star.id); } } - for (var i=0;i Date: Wed, 24 Sep 2025 23:57:15 +0200 Subject: [PATCH 121/155] fix: small improvements to scr_master_log --- scripts/scr_master_loc/scr_master_loc.gml | 32 +++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/scr_master_loc/scr_master_loc.gml b/scripts/scr_master_loc/scr_master_loc.gml index 802a23c3b8..9526133b6d 100644 --- a/scripts/scr_master_loc/scr_master_loc.gml +++ b/scripts/scr_master_loc/scr_master_loc.gml @@ -1,30 +1,30 @@ function scr_master_loc() { - var lick,good;lick="";good=true; + var lick=""; + var good=true; + var co=0; + var v=0; + var unit; - var co, v, unit; - co=0;v=0; - - repeat(3600){ + for(var i=0; i<3600; i++){ if (good=true){ - if (co<11){v+=1; + if (co<11){ + v+=1; if (v>300){co+=1;v=1;/*show_message("mahreens at the start of company "+string(co)+" is equal to "+string(info_mahreens));*/} if (co>10) then good=false; if (good=true){ if (obj_ini.name[co][v] == "") then continue; unit = fetch_unit([co, v]); if (unit.role()==obj_ini.role[100][eROLE.ChapterMaster]){ - if (unit.planet_location>0) and (unit.ship_location<0) then lick=$"{unit.location_string}."+string(unit.planet_location); - if (unit.planet_location<=0) and (unit.ship_location>-1) then lick=string(obj_ini.ship[unit.ship_location]); - if (lick!=""){return(lick);good=false;} - } - } + if (unit.planet_location>0) and (unit.ship_location<0) then lick=$"{unit.location_string}."+string(unit.planet_location); + if (unit.planet_location<=0) and (unit.ship_location>-1) then lick=string(obj_ini.ship[unit.ship_location]); + if (lick!=""){ + good=false; + return(lick); + } + } + } } } } - - - - - } From f162d3a6a6a5b653f38a2647e85090003d56decc Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 00:01:00 +0200 Subject: [PATCH 122/155] fix: removed multiple exit statements during a switch case, remoder double var declaration of same var --- .../scr_manage_task_selector.gml | 38 +++++++------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml index cc3454b731..a11c277759 100644 --- a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml +++ b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml @@ -37,6 +37,7 @@ function scr_manage_task_selector(){ } } } + function task_selector_squad_manage(){ for (var i=0; i Date: Thu, 25 Sep 2025 00:17:33 +0200 Subject: [PATCH 123/155] fix: switch case for scr_loyalty and removed multiple exit statements to use a break --- scripts/scr_loyalty/scr_loyalty.gml | 181 +++++++++++++--------------- 1 file changed, 86 insertions(+), 95 deletions(-) diff --git a/scripts/scr_loyalty/scr_loyalty.gml b/scripts/scr_loyalty/scr_loyalty.gml index c16c6d34b6..c28ea655af 100644 --- a/scripts/scr_loyalty/scr_loyalty.gml +++ b/scripts/scr_loyalty/scr_loyalty.gml @@ -5,107 +5,98 @@ function scr_loyalty(argument0, argument1) { // This adds the crime to the chapter history if (argument1="+"){ - var i, noplus;i=0;noplus=0; - - repeat(30){ - i+=1;noplus=0; + var noplus=0; + for(var i=0; i<30; i++){ + noplus=0; + var amount=0; if (obj_controller.loyal[i]=argument0){// Increases detection chance by a variable amount - var amount;amount=0; + if (obj_controller.loyal_num[i]<1) then amount=0.03; - - if (argument0="Xeno Associate"){ - if (obj_controller.loyal_num[i]=0) then amount=0.09; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Lack of Apothecary") or (argument0="Upset Machine Spirits") or (argument0="Undevout"){ - if (obj_controller.loyal_num[i]=0) then amount=0.075; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Xeno Trade") then amount=0.05; - if (argument0="Irreverance for His Servants") then amount=0.005; - - - // if (argument0="Heretic Contact") then amount=0.01; - if (argument0="Heretic Contact") then amount=0.099; - - if (argument0="Non-Codex Size"){ - if (obj_controller.loyal_num[i]=0) then amount=0.06; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Mutant Gene-Seed"){ - if (obj_controller.loyal_num[i]=0) then amount=0.01; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Heretical Homeworld"){ - if (obj_controller.loyal_num[i]=0) then amount=0.07; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Inquisitor Killer"){ - if (obj_controller.loyal_num[i]=0) then amount=0.005; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Avoiding Inspections"){ - obj_controller.loyalty-=5; - obj_controller.loyalty_hidden-=5; - obj_controller.loyal_num[i]+=5; - obj_controller.loyal_time[i]=120; - amount=0;noplus=1;exit; - } - - if (argument0="Lost Standard"){ - obj_controller.loyalty-=2; - obj_controller.loyalty_hidden-=2; - obj_controller.loyal_num[i]+=5; - obj_controller.loyal_time[i]=9999; - amount=0; - noplus=1; - exit; - } - - if (argument0="Refusing to Crusade"){ - obj_controller.loyalty-=20; - obj_controller.loyalty_hidden-=20; - obj_controller.loyal_num[i]+=20; - obj_controller.loyal_time[i]=9999; - amount=0;noplus=1;exit; - } - - if (argument0="Crossing the Inquisition"){ - obj_controller.loyalty-=40; - obj_controller.loyalty_hidden-=40; - obj_controller.loyal_num[i]+=40; - obj_controller.loyal_time[i]=9999; - amount=0;noplus=1;exit; - } - - if (argument0="Use of Sorcery"){ - if (string_count("|SC|",obj_controller.useful_info)=0){ - obj_controller.loyalty-=30; - obj_controller.loyalty_hidden-=30; - obj_controller.loyal_num[i]+=30; - obj_controller.loyal_time[i]=9999; - } - amount=0;noplus=1;var one;one=0; - obj_controller.useful_info+="|SC|"; + + switch(argument0){ + case "Xeno Associate": + if (obj_controller.loyal_num[i]=0) then amount=0.09; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Lack of Apothecary": case "Upset Machine Spirits": case "Undevout": + if (obj_controller.loyal_num[i]=0) then amount=0.075; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Xeno Trade": amount=0.05; break; + case "Irreverance for His Servants": amount=0.005; break; + case "Heretic Contact": amount=0.099; // amount=0.01; + case "Non-Codex Size": + if (obj_controller.loyal_num[i]=0) then amount=0.06; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Mutant Gene-Seed": + if (obj_controller.loyal_num[i]=0) then amount=0.01; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Heretical Homeworld": + if (obj_controller.loyal_num[i]=0) then amount=0.07; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Inquisitor Killer": + if (obj_controller.loyal_num[i]=0) then amount=0.005; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Avoiding Inspections": + obj_controller.loyalty-=5; + obj_controller.loyalty_hidden-=5; + obj_controller.loyal_num[i]+=5; + obj_controller.loyal_time[i]=120; + amount=0; + noplus=1; + break; + case "Lost Standard": + obj_controller.loyalty-=2; + obj_controller.loyalty_hidden-=2; + obj_controller.loyal_num[i]+=5; + obj_controller.loyal_time[i]=9999; + amount=0; + noplus=1; + break; + case "Refusing to Crusade": + obj_controller.loyalty-=20; + obj_controller.loyalty_hidden-=20; + obj_controller.loyal_num[i]+=20; + obj_controller.loyal_time[i]=9999; + amount=0; + noplus=1; + break; + case "Crossing the Inquisition": + obj_controller.loyalty-=40; + obj_controller.loyalty_hidden-=40; + obj_controller.loyal_num[i]+=40; + obj_controller.loyal_time[i]=9999; + amount=0; + noplus=1; + break; + case "Use of Sorcery": + if (string_count("|SC|",obj_controller.useful_info)=0){ + obj_controller.loyalty-=30; + obj_controller.loyalty_hidden-=30; + obj_controller.loyal_num[i]+=30; + obj_controller.loyal_time[i]=9999; + } + amount=0;noplus=1;var one;one=0; + obj_controller.useful_info+="|SC|"; + - if (obj_controller.disposition[4]>=50) and (one=0) and (string_count("|SC|",obj_controller.useful_info)=1){obj_controller.disposition[4]=20;one=1;} - if (obj_controller.disposition[4]<50) and (string_count("|SC|",obj_controller.useful_info)=1) and (obj_controller.disposition[4]>10) and (one=0){obj_controller.disposition[4]=0;one=2;} - if (string_count("|SC|",obj_controller.useful_info)>1){obj_controller.disposition[4]=0;one=2;} + if (obj_controller.disposition[4]>=50) and (one=0) and (string_count("|SC|",obj_controller.useful_info)=1){obj_controller.disposition[4]=20;one=1;} + if (obj_controller.disposition[4]<50) and (string_count("|SC|",obj_controller.useful_info)=1) and (obj_controller.disposition[4]>10) and (one=0){obj_controller.disposition[4]=0;one=2;} + if (string_count("|SC|",obj_controller.useful_info)>1){obj_controller.disposition[4]=0;one=2;} - if (obj_controller.loyalty<=0) and (one<2) then one=2; - if (one=1) then with(obj_controller){scr_audience(4,"sorcery1",0,"",0,0);} - if (one>=2) and (obj_controller.penitent=0){repeat(2){obj_controller.useful_info+="|SC|";}scr_audience(4,"loyalty_zero",0,"",0,0);} - if (one>=2) and (obj_controller.penitent=1){repeat(2){obj_controller.useful_info+="|SC|";}obj_controller.alarm[8]=1;} + if (obj_controller.loyalty<=0) and (one<2) then one=2; + if (one=1) then with(obj_controller){scr_audience(4,"sorcery1",0,"",0,0);} + if (one>=2) and (obj_controller.penitent=0){repeat(2){obj_controller.useful_info+="|SC|";}scr_audience(4,"loyalty_zero",0,"",0,0);} + if (one>=2) and (obj_controller.penitent=1){repeat(2){obj_controller.useful_info+="|SC|";}obj_controller.alarm[8]=1;} - exit;exit; - } + break; + } + if (noplus=0) then obj_controller.loyal_num[i]+=amount; } From ef0d47880d33589526e4d888194c72b2b6bc9056 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 00:18:19 +0200 Subject: [PATCH 124/155] fix: removed unused code (exit statement) and made vars reachable --- scripts/scr_hit/scr_hit.gml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/scr_hit/scr_hit.gml b/scripts/scr_hit/scr_hit.gml index ae3fea5849..8eec9d609f 100644 --- a/scripts/scr_hit/scr_hit.gml +++ b/scripts/scr_hit/scr_hit.gml @@ -8,8 +8,6 @@ function scr_hit(x1=0, y1=0, x2=0, y2=0) { } else { return point_in_rectangle(mouse_consts[0],mouse_consts[1],x1, y1, x2, y2); } - return false; - } function scr_hit_relative(x1, relative = [0,0]){ @@ -185,9 +183,11 @@ function mouse_button_held(_button = mb_left) { } function return_mouse_consts(){ + var mouse_const_x; + var mouse_const_y; if (event_number==ev_gui){ - var mouse_const_x = device_mouse_x_to_gui(0); - var mouse_const_y = device_mouse_y_to_gui(0); + mouse_const_x = device_mouse_x_to_gui(0); + mouse_const_y = device_mouse_y_to_gui(0); } else { mouse_const_x = mouse_x; mouse_const_y = mouse_y; From 0aeffd26c65216c28afc29fc2d9ae51b63559e06 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 00:19:41 +0200 Subject: [PATCH 125/155] fix: removed break after a return in scr_equipement_struct --- scripts/scr_equipment_struct/scr_equipment_struct.gml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/scr_equipment_struct/scr_equipment_struct.gml b/scripts/scr_equipment_struct/scr_equipment_struct.gml index 5661d85909..6925dcd35e 100644 --- a/scripts/scr_equipment_struct/scr_equipment_struct.gml +++ b/scripts/scr_equipment_struct/scr_equipment_struct.gml @@ -427,19 +427,14 @@ function quality_color(_item_quality) { switch (_item_quality) { case "standard": return draw_get_color(); - break; case "master_crafted": return #bf9340; - break; case "artificer": return #bf4040; - break; case "artifact": return #40bfbf; - break; case "exemplary": return #80bf40; - break; } } From 7338c4eb93092216f27ed8b469ec24a68b40b86a Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 00:20:56 +0200 Subject: [PATCH 126/155] fix: commented out code in obj_main_menu Step0 to check if they can be deleted --- objects/obj_main_menu/Step_0.gml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/objects/obj_main_menu/Step_0.gml b/objects/obj_main_menu/Step_0.gml index 7bc1274a77..4f66513dfe 100644 --- a/objects/obj_main_menu/Step_0.gml +++ b/objects/obj_main_menu/Step_0.gml @@ -59,23 +59,19 @@ hi=0; exit; // ??? +//if (fade<=20){ - - - -if (fade<=20){ - - if (mouse_x>=369) and (mouse_x<619){ - if (mouse_y>=183) and (mouse_y<200) then hi=1; - if (mouse_y>=213) and (mouse_y<230) then hi=2; - if (mouse_y>=243) and (mouse_y<260) then hi=3; - } +// if (mouse_x>=369) and (mouse_x<619){ +// if (mouse_y>=183) and (mouse_y<200) then hi=1; +// if (mouse_y>=213) and (mouse_y<230) then hi=2; +// if (mouse_y>=243) and (mouse_y<260) then hi=3; +// } - if (mouse_x>=414) and (mouse_y>=273) and (mouse_x<578) and (mouse_y<290) then hi=4; +// if (mouse_x>=414) and (mouse_y>=273) and (mouse_x<578) and (mouse_y<290) then hi=4; - if (instance_exists(obj_saveload)){ - // if (scr_hit(sdfgsdgsdg)=true) then hi=6; - } -} +// if (instance_exists(obj_saveload)){ +// // if (scr_hit(sdfgsdgsdg)=true) then hi=6; +// } +//} -if (mouse_x<552) or (mouse_y<441) or (mouse_x>608) or (mouse_y>457) and (browser=1) then browser=0; +//if (mouse_x<552) or (mouse_y<441) or (mouse_x>608) or (mouse_y>457) and (browser=1) then browser=0; From 91612ebc19cdfbc8f1f0c8aa128640888639a4b7 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 00:22:38 +0200 Subject: [PATCH 127/155] fix: commented out unused code in obj_drop_select Mouse_56 --- objects/obj_drop_select/Mouse_56.gml | 310 +++++++++++++-------------- 1 file changed, 155 insertions(+), 155 deletions(-) diff --git a/objects/obj_drop_select/Mouse_56.gml b/objects/obj_drop_select/Mouse_56.gml index 2df23b6ffd..767d605be9 100644 --- a/objects/obj_drop_select/Mouse_56.gml +++ b/objects/obj_drop_select/Mouse_56.gml @@ -4,160 +4,160 @@ if __b__ { exit; - -var xx, yy; -xx=__view_get( e__VW.XView, 0 ); -yy=__view_get( e__VW.YView, 0 ); - - - -var i;i=-1;ships_selected=0; -repeat(31){ - i+=1; - if (ship_all[i]!=0) and (ship[i]!=""){ - ships_selected+=1; - } -} -if (ship_all[500]!=0) then ships_selected+=1; - - - - -var i, fy, why, onceh, loca, add_ground;i=0;why=0;onceh=0;loca=0;add_ground=0; - -if (l_size>0) then loca=1; - -if (obj_controller.cooldown<=0){fy=1; - if (fy=1) and (scr_hit(xx+47,yy+107+why,xx+161,yy+122+why)=true){// Leftest - if (loca=1) and (l_size>0){onceh=0;// Case 1: it is first slot, local - if (onceh=0) and (ship_all[500]=0){onceh=1;obj_controller.cooldown=8000;ship_all[500]=1;add_ground=1;} - if (onceh=0) and (ship_all[500]=1){onceh=1;obj_controller.cooldown=8000;ship_all[500]=0;add_ground=-1;} - } - } -} - -if (loca=1){fy+=1;if (fy=5) then fy=1;}i=0; - -if (obj_controller.cooldown<=0){ - repeat(24-loca){i+=1; - if (fy=1) and (scr_hit(xx+47,yy+107+why,xx+161,yy+122+why)=true){// Leftest - if (ship[i]!=""){// Case 3: it is a later slot, ship - if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} - if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} - } - } - if (fy=2) and (scr_hit(xx+164,yy+107+why,xx+278,yy+122+why)=true){// 2nd - if (ship[i]!=""){ - if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} - if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} - } - } - if (fy=3) and (scr_hit(xx+281,yy+107+why,xx+395,yy+122+why)=true){// 3rd - if (ship[i]!=""){ - if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} - if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} - } - } - if (fy=4) and (scr_hit(xx+398,yy+107+why,xx+512,yy+122+why)=true){// 4th - if (ship[i]!=""){ - if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} - if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} - } - } - fy+=1;if (fy=5){fy=1;why+=18;} - } -} - - - - -if (obj_controller.cooldown <= 0) { - if (mouse_x >= xx + 456) && (mouse_y >= yy + 378) && (mouse_x < xx + 519) && (mouse_y < yy + 403) { - instance_destroy(); - obj_controller.cooldown = 8000; - } - - if (mouse_x >= xx + 76) && (mouse_y >= yy + 82) && (mouse_x < xx + 102) && (mouse_y < yy + 95) { - var onceh; - once = 0; - i = 0; - if (all_sel = 0) && (onceh = 0) { - var ships_len = array_length(ship); - for (var i = 0; i < ships_len; i++) { - if (ship[i] != "") && (ship_all[i] = 0) { - ship_all[i] = 1; - scr_drop_fiddle(ship_ide[i], true, i, attack); - } - } - if (ship_all[500] = 0) && (l_size > 0) { - ship_all[500] = 1; - add_ground = 1; - } - onceh = 1; - all_sel = 1; - } - if (all_sel = 1) && (onceh = 0) { - var ships_len = array_length(ship); - for (var i = 0; i < ships_len; i++) { - if (ship[i] != "") && (ship_all[i] = 1) { - ship_all[i] = 0; - scr_drop_fiddle(ship_ide[i], false, i, attack); - } - } - if (ship_all[500] = 1) && (l_size > 0) { - ship_all[500] = 0; - add_ground = -1; - } - onceh = 1; - all_sel = 0; - } - } -} - -if (add_ground = 1) { - ships_selected += 1; - master += local_forces.master; - honor += local_forces.honor; - capts += local_forces.captains; - mahreens += l_mahreens; - veterans += l_veterans; - terminators += l_terminators; - dreads += l_dreads; - chaplains += l_chaplains; - psykers += l_psykers; - apothecaries += l_apothecaries; - techmarines += l_techmarines; - champions += l_champions; - - bikes += l_bikes; - rhinos += l_rhinos; - whirls += l_whirls; - predators += l_predators; - raiders += l_raiders; - speeders += l_speeders; -} -if (add_ground = -1) { - ships_selected -= 1; - master -= local_forces.master; - honor -= local_forces.honor; - capts -= local_forces.captains; - mahreens -= l_mahreens; - veterans -= l_veterans; - terminators -= l_terminators; - dreads -= l_dreads; - chaplains -= l_chaplains; - psykers -= l_psykers; - apothecaries -= l_apothecaries; - techmarines -= l_techmarines; - champions -= l_champions; - - bikes -= l_bikes; - rhinos -= l_rhinos; - whirls -= l_whirls; - predators -= l_predators; - raiders -= l_raiders; - speeders -= l_speeders; -} - +// TODO Check if code is still used or not +//var xx, yy; +//xx=__view_get( e__VW.XView, 0 ); +//yy=__view_get( e__VW.YView, 0 ); + + + +//var i;i=-1;ships_selected=0; +//repeat(31){ +// i+=1; +// if (ship_all[i]!=0) and (ship[i]!=""){ +// ships_selected+=1; +// } +//} +//if (ship_all[500]!=0) then ships_selected+=1; + + + + +//var i, fy, why, onceh, loca, add_ground;i=0;why=0;onceh=0;loca=0;add_ground=0; + +//if (l_size>0) then loca=1; + +//if (obj_controller.cooldown<=0){fy=1; +// if (fy=1) and (scr_hit(xx+47,yy+107+why,xx+161,yy+122+why)=true){// Leftest +// if (loca=1) and (l_size>0){onceh=0;// Case 1: it is first slot, local +// if (onceh=0) and (ship_all[500]=0){onceh=1;obj_controller.cooldown=8000;ship_all[500]=1;add_ground=1;} +// if (onceh=0) and (ship_all[500]=1){onceh=1;obj_controller.cooldown=8000;ship_all[500]=0;add_ground=-1;} +// } +// } +//} + +//if (loca=1){fy+=1;if (fy=5) then fy=1;}i=0; + +//if (obj_controller.cooldown<=0){ +// repeat(24-loca){i+=1; +// if (fy=1) and (scr_hit(xx+47,yy+107+why,xx+161,yy+122+why)=true){// Leftest +// if (ship[i]!=""){// Case 3: it is a later slot, ship +// if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} +// if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} +// } +// } +// if (fy=2) and (scr_hit(xx+164,yy+107+why,xx+278,yy+122+why)=true){// 2nd +// if (ship[i]!=""){ +// if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} +// if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} +// } +// } +// if (fy=3) and (scr_hit(xx+281,yy+107+why,xx+395,yy+122+why)=true){// 3rd +// if (ship[i]!=""){ +// if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} +// if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} +// } +// } +// if (fy=4) and (scr_hit(xx+398,yy+107+why,xx+512,yy+122+why)=true){// 4th +// if (ship[i]!=""){ +// if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} +// if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} +// } +// } +// fy+=1;if (fy=5){fy=1;why+=18;} +// } +//} + + + + +//if (obj_controller.cooldown <= 0) { +// if (mouse_x >= xx + 456) && (mouse_y >= yy + 378) && (mouse_x < xx + 519) && (mouse_y < yy + 403) { +// instance_destroy(); +// obj_controller.cooldown = 8000; +// } + +// if (mouse_x >= xx + 76) && (mouse_y >= yy + 82) && (mouse_x < xx + 102) && (mouse_y < yy + 95) { +// var onceh; +// once = 0; +// i = 0; +// if (all_sel = 0) && (onceh = 0) { +// var ships_len = array_length(ship); +// for (var i = 0; i < ships_len; i++) { +// if (ship[i] != "") && (ship_all[i] = 0) { +// ship_all[i] = 1; +// scr_drop_fiddle(ship_ide[i], true, i, attack); +// } +// } +// if (ship_all[500] = 0) && (l_size > 0) { +// ship_all[500] = 1; +// add_ground = 1; +// } +// onceh = 1; +// all_sel = 1; +// } +// if (all_sel = 1) && (onceh = 0) { +// var ships_len = array_length(ship); +// for (var i = 0; i < ships_len; i++) { +// if (ship[i] != "") && (ship_all[i] = 1) { +// ship_all[i] = 0; +// scr_drop_fiddle(ship_ide[i], false, i, attack); +// } +// } +// if (ship_all[500] = 1) && (l_size > 0) { +// ship_all[500] = 0; +// add_ground = -1; +// } +// onceh = 1; +// all_sel = 0; +// } +// } +//} + +//if (add_ground = 1) { +// ships_selected += 1; +// master += local_forces.master; +// honor += local_forces.honor; +// capts += local_forces.captains; +// mahreens += l_mahreens; +// veterans += l_veterans; +// terminators += l_terminators; +// dreads += l_dreads; +// chaplains += l_chaplains; +// psykers += l_psykers; +// apothecaries += l_apothecaries; +// techmarines += l_techmarines; +// champions += l_champions; + +// bikes += l_bikes; +// rhinos += l_rhinos; +// whirls += l_whirls; +// predators += l_predators; +// raiders += l_raiders; +// speeders += l_speeders; +//} +//if (add_ground = -1) { +// ships_selected -= 1; +// master -= local_forces.master; +// honor -= local_forces.honor; +// capts -= local_forces.captains; +// mahreens -= l_mahreens; +// veterans -= l_veterans; +// terminators -= l_terminators; +// dreads -= l_dreads; +// chaplains -= l_chaplains; +// psykers -= l_psykers; +// apothecaries -= l_apothecaries; +// techmarines -= l_techmarines; +// champions -= l_champions; + +// bikes -= l_bikes; +// rhinos -= l_rhinos; +// whirls -= l_whirls; +// predators -= l_predators; +// raiders -= l_raiders; +// speeders -= l_speeders; +//} +// END OF CODE REVIEWING } From a203126e31f67dd872061bed1417df6d7c4e5d6e Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 00:23:38 +0200 Subject: [PATCH 128/155] fix: commented out unused code in obj_fleet_controller Draw_0 script --- objects/obj_fleet_controller/Draw_0.gml | 35 +++++++++++-------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/objects/obj_fleet_controller/Draw_0.gml b/objects/obj_fleet_controller/Draw_0.gml index 78f3a4dd43..b8410aa1df 100644 --- a/objects/obj_fleet_controller/Draw_0.gml +++ b/objects/obj_fleet_controller/Draw_0.gml @@ -7,27 +7,24 @@ exit; draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_menu); - -if (zoomed=0){ - draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+0,string_hash_to_newline("Morale: High")); - draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+0,string_hash_to_newline("Morale:")); +//if (zoomed=0){ +// draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+0,string_hash_to_newline("Morale: High")); +// draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+0,string_hash_to_newline("Morale:")); - draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+16,string_hash_to_newline("Ships Remaining: "+string(instance_number(obj_p_ship)))); - draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+16,string_hash_to_newline("Ships Remaining:")); +// draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+16,string_hash_to_newline("Ships Remaining: "+string(instance_number(obj_p_ship)))); +// draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+16,string_hash_to_newline("Ships Remaining:")); - draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+32,string_hash_to_newline("Thunderhawks: "+string(instance_number(obj_p_th)))); - draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+32,string_hash_to_newline("Thunderhawks:")); -} +// draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+32,string_hash_to_newline("Thunderhawks: "+string(instance_number(obj_p_th)))); +// draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+32,string_hash_to_newline("Thunderhawks:")); +//} -if (zoomed=1){ - draw_text_transformed(0,0,string_hash_to_newline("Morale: High"),2,2,0); - draw_text_transformed(2,0,string_hash_to_newline("Morale:"),2,2,0); +//if (zoomed=1){ +// draw_text_transformed(0,0,string_hash_to_newline("Morale: High"),2,2,0); +// draw_text_transformed(2,0,string_hash_to_newline("Morale:"),2,2,0); - draw_text_transformed(0,32,string_hash_to_newline("Ships Remaining: "+string(instance_number(obj_p_ship))),2,2,0); - draw_text_transformed(2,32,string_hash_to_newline("Ships Remaining:"),2,2,0); +// draw_text_transformed(0,32,string_hash_to_newline("Ships Remaining: "+string(instance_number(obj_p_ship))),2,2,0); +// draw_text_transformed(2,32,string_hash_to_newline("Ships Remaining:"),2,2,0); - draw_text_transformed(0,64,string_hash_to_newline("Thunderhawk: "+string(instance_number(obj_p_th))),2,2,0); - draw_text_transformed(2,64,string_hash_to_newline("Thunderhawk:"),2,2,0); -} - - +// draw_text_transformed(0,64,string_hash_to_newline("Thunderhawk: "+string(instance_number(obj_p_th))),2,2,0); +// draw_text_transformed(2,64,string_hash_to_newline("Thunderhawk:"),2,2,0); +//} From 3d65b9358426c9975ab115e20c9ed23ce6202bd5 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 00:25:27 +0200 Subject: [PATCH 129/155] fix: commented out unused code --- objects/obj_en_fleet/Collision_obj_pnunit.gml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/objects/obj_en_fleet/Collision_obj_pnunit.gml b/objects/obj_en_fleet/Collision_obj_pnunit.gml index 9e8ab742ae..8abfbfce8a 100644 --- a/objects/obj_en_fleet/Collision_obj_pnunit.gml +++ b/objects/obj_en_fleet/Collision_obj_pnunit.gml @@ -3,15 +3,15 @@ exit; if (other.sprite_index!=self.sprite_index) then exit;// No colonists and fleets bashing together -if (other.action="") and (action="") and (other.owner=owner) and (string_count("her",trade_goods)=0) and (string_count("her",string(other.trade_goods))=0){ - if (obj_controller.faction_status[eFACTION.Imperium]="War") and (instance_nearest(x,y,obj_star).owner = eFACTION.Player) and (owner = eFACTION.Imperium) and (other.owner = eFACTION.Imperium){ - if (id>other.id){ - guardsmen+=other.guardsmen; - capital_number+=other.capital_number; - frigate_number+=other.frigate_number; - escort_number+=other.escort_number; - with(other){instance_destroy();} - } - } -} +//if (other.action="") and (action="") and (other.owner=owner) and (string_count("her",trade_goods)=0) and (string_count("her",string(other.trade_goods))=0){ +// if (obj_controller.faction_status[eFACTION.Imperium]="War") and (instance_nearest(x,y,obj_star).owner = eFACTION.Player) and (owner = eFACTION.Imperium) and (other.owner = eFACTION.Imperium){ +// if (id>other.id){ +// guardsmen+=other.guardsmen; +// capital_number+=other.capital_number; +// frigate_number+=other.frigate_number; +// escort_number+=other.escort_number; +// with(other){instance_destroy();} +// } +// } +//} From 4019f751929987a4e704e95a4e0afc2138b1c352 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 00:34:40 +0200 Subject: [PATCH 130/155] fix: reinstated exit to ensure early exit of code --- .../scr_manage_task_selector.gml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml index a11c277759..d2fc2a5291 100644 --- a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml +++ b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml @@ -82,7 +82,7 @@ function task_selector_man_manage(){ } managing = _end_company; update_general_manage_view(); - break; + exit; case "champion_promote": _unit.update_role(obj_ini.role[100][eROLE.Champion]); _unit.squad="none"; @@ -93,7 +93,7 @@ function task_selector_man_manage(){ managing = selection_data.target_company; update_general_manage_view(); - break; + exit; case "ancient_promote": _unit.update_role(obj_ini.role[100][eROLE.Ancient]); _unit.squad="none"; @@ -103,7 +103,7 @@ function task_selector_man_manage(){ } managing = selection_data.target_company; update_general_manage_view(); - break; + exit; case "chaplain_promote": _unit.squad="none"; _start_company = _unit.company; @@ -116,7 +116,7 @@ function task_selector_man_manage(){ } managing = _end_company; update_general_manage_view(); - break; + exit; case "apothecary_promote": _unit.squad="none"; _start_company = _unit.company; @@ -129,7 +129,7 @@ function task_selector_man_manage(){ } managing = _end_company; update_general_manage_view(); - break; + exit; case "tech_marine_promote": _unit.squad="none"; _start_company = _unit.company; @@ -142,7 +142,7 @@ function task_selector_man_manage(){ } managing = _end_company; update_general_manage_view(); - break; + exit; case "librarian_promote": _unit.squad="none"; _start_company = _unit.company; @@ -155,7 +155,7 @@ function task_selector_man_manage(){ } managing = _end_company; update_general_manage_view(); - break; + exit; case "hunt_beast": _unit.job = { type:selection_data.purpose_code, @@ -174,7 +174,7 @@ function task_selector_man_manage(){ init_train_forces_mission(selection_data.planet, selection_data.system,selection_data.array_slot, _unit); obj_controller.close_popups = false; exit_adhoc_manage(); - break; + exit; case "artifact_equip": scr_toggle_lib(); var _arti = fetch_artifact(selection_data.artifact); From d93d75244907802b18c561604fddb020263ca870 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 01:00:08 +0200 Subject: [PATCH 131/155] fix: 2 minor errors, missing a break and rename of equipment slot --- objects/obj_creation_popup/Draw_0.gml | 14 +++++++------- scripts/scr_loyalty/scr_loyalty.gml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/objects/obj_creation_popup/Draw_0.gml b/objects/obj_creation_popup/Draw_0.gml index 496069a24a..b78533e24a 100644 --- a/objects/obj_creation_popup/Draw_0.gml +++ b/objects/obj_creation_popup/Draw_0.gml @@ -104,14 +104,14 @@ if (col_shift){ for (var slot_count = 0; slot_count <= 4; slot_count++) { y5 += spacing; var title = $"{get_slot_name(type - 100, slot_count)}: "; - var equipement_slot; + var equipment_slot; switch (slot_count) { // slots - case EquipmentSlot.WEAPON_ONE: equipement_slot = obj_creation.wep1[co, ide]; break; - case EquipmentSlot.WEAPON_TWO: equipement_slot = obj_creation.wep2[co, ide]; break; - case EquipmentSlot.ARMOUR: equipement_slot = obj_creation.armour[co, ide]; break; - case EquipmentSlot.GEAR: equipement_slot = obj_creation.gear[co, ide]; break; - case EquipmentSlot.MOBILITY: equipement_slot = obj_creation.mobi[co, ide]; break; + case EquipmentSlot.WEAPON_ONE: equipment_slot = obj_creation.wep1[co, ide]; break; + case EquipmentSlot.WEAPON_TWO: equipment_slot = obj_creation.wep2[co, ide]; break; + case EquipmentSlot.ARMOUR: equipment_slot = obj_creation.armour[co, ide]; break; + case EquipmentSlot.GEAR: equipment_slot = obj_creation.gear[co, ide]; break; + case EquipmentSlot.MOBILITY: equipment_slot = obj_creation.mobi[co, ide]; break; } draw_set_halign(fa_right); @@ -148,7 +148,7 @@ if (col_shift){ draw_set_alpha(1); draw_set_color(CM_GREEN_COLOR); draw_set_halign(fa_left); - draw_text(600, y5, string_hash_to_newline(string(equipement_slot))); + draw_text(600, y5, string_hash_to_newline(string(equipment_slot))); } var confirm_gear_button = { diff --git a/scripts/scr_loyalty/scr_loyalty.gml b/scripts/scr_loyalty/scr_loyalty.gml index c28ea655af..ea708e2240 100644 --- a/scripts/scr_loyalty/scr_loyalty.gml +++ b/scripts/scr_loyalty/scr_loyalty.gml @@ -25,7 +25,7 @@ function scr_loyalty(argument0, argument1) { break; case "Xeno Trade": amount=0.05; break; case "Irreverance for His Servants": amount=0.005; break; - case "Heretic Contact": amount=0.099; // amount=0.01; + case "Heretic Contact": amount=0.099; break; // amount=0.01; case "Non-Codex Size": if (obj_controller.loyal_num[i]=0) then amount=0.06; if (obj_controller.loyal_num[i]!=0) then amount=0; From 78544adadd3f4adc289fa5e5bb93e912194f8214 Mon Sep 17 00:00:00 2001 From: felipeStouvenel Date: Thu, 25 Sep 2025 01:01:24 +0200 Subject: [PATCH 132/155] fix: correct comparison statements on if statements --- objects/obj_creation_popup/Draw_0.gml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/objects/obj_creation_popup/Draw_0.gml b/objects/obj_creation_popup/Draw_0.gml index b78533e24a..4631f9f670 100644 --- a/objects/obj_creation_popup/Draw_0.gml +++ b/objects/obj_creation_popup/Draw_0.gml @@ -76,10 +76,10 @@ if (col_shift){ ide=type-100; draw_set_font(fnt_40k_30b); - if (obj_creation.role[co,ide]="") or (badname=1){draw_set_color(c_red);} + if (obj_creation.role[co,ide]=="") or (badname==1){draw_set_color(c_red);} if (obj_creation.text_selected!="unit_name"+string(ide)) {draw_text_transformed(444,550,string_hash_to_newline(obj_creation.role[co,ide]),0.6,0.6,0);} - if (obj_creation.text_selected="unit_name"+string(ide)) and (obj_creation.text_bar>30) {draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])),0.6,0.6,0);} - if (obj_creation.text_selected="unit_name"+string(ide)) and (obj_creation.text_bar<=30) {draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])+"|"),0.6,0.6,0);} + if (obj_creation.text_selected=="unit_name"+string(ide)) and (obj_creation.text_bar>30) {draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])),0.6,0.6,0);} + if (obj_creation.text_selected=="unit_name"+string(ide)) and (obj_creation.text_bar<=30) {draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])+"|"),0.6,0.6,0);} var hei=string_height_ext(string_hash_to_newline(string(obj_creation.role[co,ide])+"Q"),-1,580)*0.6; if (scr_hit(444,550,820,550+hei)){ obj_cursor.image_index=2; From 5a0edb8128506acfd5ec5bcf9fdbc181c1bfe39a Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 6 Nov 2025 02:00:48 +0000 Subject: [PATCH 133/155] compile errors --- .../scr_automated_ship_combat_functions.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index e7bceb4df1..18d3010b5f 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -224,7 +224,7 @@ function defualt_target_movement(){ target_distance=point_distance(x,y,target.x+lengthdir_x(64,target.direction-180),target.y+lengthdir_y(128,target.direction+90))-(max(sprite_get_width(sprite_index),sprite_get_height(sprite_index))); } - if (y>target.y && target_distance>closing_distance) ){ + if ((y>target.y && target_distance>closing_distance) ){ direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); } else if (yclosing_distance){ direction=turn_towards_point(direction,x,y,target.x,target.y,turning_speed); From ca936843ff93afbfd98606679aa2a694277cd5ca Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 6 Nov 2025 02:10:23 +0000 Subject: [PATCH 134/155] ships kinda functioning again --- objects/obj_ground_mission/Alarm_0.gml | 2 +- scripts/scr_ancient_ruins/scr_ancient_ruins.gml | 2 +- scripts/scr_fleet_advisor/scr_fleet_advisor.gml | 2 +- .../scr_inquisition_inspection.gml | 4 ++-- .../scr_inquisition_mission.gml | 12 ++++++------ .../scr_mechanicus_missions.gml | 13 +++++++------ .../scr_planetary_feature/scr_planetary_feature.gml | 8 ++++---- .../scr_unit_quick_find_pane.gml | 6 ++++-- 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/objects/obj_ground_mission/Alarm_0.gml b/objects/obj_ground_mission/Alarm_0.gml index 8a5cc06fed..efa7a41d83 100644 --- a/objects/obj_ground_mission/Alarm_0.gml +++ b/objects/obj_ground_mission/Alarm_0.gml @@ -4,7 +4,7 @@ if (num > 0) { stah = instance_nearest(x, y, obj_star); obj_controller.menu = 0; - if (planet_feature_bool(stah.p_feature[num], P_features.STC_Fragment) == 1) { // STC is present + if (planet_feature_bool(stah.p_feature[num], P_features.STCFragment) == 1) { // STC is present } if (planet_feature_bool(stah.p_feature[num], P_features.Artifact) == 1) { // Artifact is present diff --git a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml index 63ab840987..aa958fccd6 100644 --- a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml +++ b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml @@ -225,7 +225,7 @@ function scr_explore_ruins() { /// @mixin PlanetData function scr_check_for_ruins_exploration(){ - var _ruins_list = get_features(P_features.Ancient_Ruins); + var _ruins_list = get_features(P_features.AncientRuins); var _explore_ruins=0; if (array_length(_ruins_list) > 0){ for (var _ruin = 0; _ruin < array_length(_ruins_list); _ruin++){ diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index c30618a86b..7db6df54a9 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -401,7 +401,7 @@ function scr_fleet_advisor(){ } draw_text_ext(xx + 200, yy + 450, $"Tech Fulfillment\n{_ship.tech_fulfilment}/{_ship.minimum_tech_requirements}",-1, 130); if (scr_hit(xx + 200, yy + 440, xx + 330, yy + 490)){ - tooltip_draw("Ships without a minimum amount of technical capabilities onboard suffer greatly in combat situations and are prone to malfunctions, weapons jams, slower reload times and a range of other issues. Make sure ships have a contingent of techmarines or marines with high enough technical knowledge to fulfil a ships needs"); + tooltip_draw("Ships without a minimum amount of technical capabilities onboard suffer greatly in combat situations and are prone to malfunctions, weapons jams, slower reload times and a range of other issues. Make sure ships have a contingent of techmarines or marines with high enough technical knowledge to fulfil a ships needs and calm their machine spirits"); } var _view_button = fleet_temps.tech_fulfilment_view; _view_button.x1 = 335; diff --git a/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml b/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml index 89a698c12a..6fb06951dd 100644 --- a/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml +++ b/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml @@ -141,7 +141,7 @@ function inquisitor_inspection_structure() constructor { if (pidx >= star.planets) { continue; } if (!is_array(star.p_upgrades[pidx]) || array_length(star.p_upgrades[pidx]) == 0) { continue; } - var base_search = search_planet_features(star.p_upgrades[pidx], P_features.Secret_Base); + var base_search = search_planet_features(star.p_upgrades[pidx], P_features.SecretBase); if (array_length(base_search) > 0) { any_found = true; var player_base = star.p_upgrades[pidx][base_search[0]]; @@ -239,7 +239,7 @@ function inquisitor_inspection_structure() constructor { if (pidx >= star.planets) { continue; } if (!is_array(star.p_upgrades[pidx]) || array_length(star.p_upgrades[pidx]) == 0) { continue; } - var vault_search = search_planet_features(star.p_upgrades[pidx], P_features.Gene_Vault); + var vault_search = search_planet_features(star.p_upgrades[pidx], P_features.GeneVault); if (array_length(vault_search) > 0) { var gene_vault = star.p_upgrades[pidx][vault_search[0]]; gene_vault.inquis_hidden = 0; diff --git a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml index 7ca8f282fb..5231810ea4 100644 --- a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml +++ b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml @@ -52,7 +52,7 @@ function scr_inquisition_mission(event, forced_mission = -1){ for(var s = 0, _len = array_length(all_stars); s <_len; s++){ var _star = all_stars[s]; - if (scr_star_has_planet_with_feature(_star, P_features.Necron_Tomb) && !awake_necron_star(_star.id)){ + if (scr_star_has_planet_with_feature(_star, P_features.NecronTomb) && !awake_necron_star(_star.id)){ array_push(necron_tomb_worlds, _star); found_sleeping_necrons = true; } @@ -198,11 +198,11 @@ function mission_inquisition_tomb_world(tomb_worlds){ _star = tomb_worlds; } - var planet = scr_get_planet_with_feature(_star, P_features.Necron_Tomb); + var planet = scr_get_planet_with_feature(_star, P_features.NecronTomb); if (planet == -1){ planet = irandom_range(1,_star.planets); - array_push(_star.p_feature[planet],new NewPlanetFeature(P_features.Necron_Tomb)); + array_push(_star.p_feature[planet],new NewPlanetFeature(P_features.NecronTomb)); } var eta = scr_mission_eta(_star.x, _star.y,1) @@ -696,7 +696,7 @@ function mission_investigate_planet(){ var stars = scr_get_stars(); var _valid_stars = array_filter_ext(stars, function(_star,index){ - if (scr_star_has_planet_with_feature(_star, P_features.Ancient_Ruins)){ + if (scr_star_has_planet_with_feature(_star, P_features.AncientRuins)){ var fleet = instance_nearest(_star.x,_star.y,obj_p_fleet); if (fleet == undefined || point_distance(_star.x,_star.y,fleet.x,fleet.y)>=160){ return true; @@ -712,7 +712,7 @@ function mission_investigate_planet(){ } var _star = array_random_element(_valid_stars); - var planet = scr_get_planet_with_feature(_star, P_features.Ancient_Ruins); + var planet = scr_get_planet_with_feature(_star, P_features.AncientRuins); if (planet == -1){ log_error("RE: Investigate Planet, couldn't pick a planet"); exit; @@ -844,7 +844,7 @@ function necron_tomb_mission_sequence(){ mission_star = star_by_name(pop_data.loc); remove_planet_problem(planet, "necron", mission_star); seal_tomb_world(mission_star.p_feature[planet]); - // mission_star.p_feature[planet][search_planet_features(mission_star.p_feature[planet], P_features.Necron_Tomb)[0]].sealed = 1; + // mission_star.p_feature[planet][search_planet_features(mission_star.p_feature[planet], P_features.NecronTomb)[0]].sealed = 1; scr_event_log("", $"Inquisition Mission Completed: Your Astartes have sealed the Necron Tomb on {mission_star.name} {scr_roman(planet)}.", mission_star.name); scr_gov_disp(mission_star.name, planet, irandom_range(3, 7)); diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 2a64bd09f7..634fed476c 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -149,8 +149,8 @@ function spawn_mechanicus_mission(chosen_mission = "random"){ with(obj_star){ - if(scr_star_has_planet_with_feature(id,P_features.Necron_Tomb)) and (awake_necron_star(id)!= 0){ - var planet = scr_get_planet_with_feature(id, P_features.Necron_Tomb); + if(scr_star_has_planet_with_feature(id,P_features.NecronTomb)) and (awake_necron_star(id)!= 0){ + var planet = scr_get_planet_with_feature(id, P_features.NecronTomb); if(scr_is_planet_owned_by_allies(self, planet)){ array_push(mechanicus_missions, "mech_tomb"); break; @@ -238,8 +238,8 @@ function spawn_mechanicus_mission(chosen_mission = "random"){ stars = scr_get_stars(); var valid_stars = array_filter_ext(stars, function(star,index) { - if(scr_star_has_planet_with_feature(star,P_features.Necron_Tomb)) and (awake_necron_star(star)!= 0){ - var planet = scr_get_planet_with_feature(star, P_features.Necron_Tomb); + if(scr_star_has_planet_with_feature(star,P_features.NecronTomb)) and (awake_necron_star(star)!= 0){ + var planet = scr_get_planet_with_feature(star, P_features.NecronTomb); if(scr_is_planet_owned_by_allies(star, planet)) { return true; } @@ -409,9 +409,10 @@ function mechanicus_mars_mission_target_time_elapsed(planet){ techs_taken+=1; } if (_unit.ship_location>-1){ - ship_planet=obj_ini.ship_location[_unit.ship_location]; + var _ship = fetch_ship(_unit.ship_location) + ship_planet = _ship.location; if (ship_planet=name){ - obj_ini.ship_carrying[_unit.ship_location]-=_unit.get_unit_size(); + _ship.carrying -= _unit.get_unit_size(); _unit.location_string="Mechanicus Vessel"; _unit.planet_location=0; _unit.ship_location=-1; diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 8a21612f30..52e43cbd76 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -71,7 +71,7 @@ function PlanetFeature(feature_type, other_data={}) constructor{ planet_display = "Dormant Necron Tomb"; break; - case P_features.Secret_Base: + case P_features.SecretBase: base_type = base_types.Lair; inquis_hidden =1; planet_display = "Hidden Secret Base"; @@ -618,7 +618,7 @@ function planet_selection_action(){ /// @mixin PlanetData function check_for_stc_grab_mission(){ // STC Grab - if (has_feature(P_features.STC_Fragment)){ + if (has_feature(P_features.STCFragment)){ var _techs=0,_mech_techs = 0; var _units = obj_controller.display_unit; for (var frag=0; frag < array_length(_units); frag++){ @@ -1000,7 +1000,7 @@ function remove_stc_from_planet(){ with(obj_star_select){instance_destroy();} with(obj_fleet_select){instance_destroy();} - pdata.delete_feature(P_features.STC_Fragment); + pdata.delete_feature(P_features.STCFragment); scr_add_stc_fragment();// STC here @@ -1048,7 +1048,7 @@ function send_stc_to_adeptus_mech(){ with (obj_ground_mission){ var _target_planet; _target_planet = instance_nearest(x, y, obj_star); - pdata.delete_feature(P_features.STC_Fragment); + pdata.delete_feature(P_features.STCFragment); scr_return_ship(pdata.system.name, self, pdata.planet); diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index 75b6760eb5..d810b31230 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -63,7 +63,8 @@ function UnitQuickFindPanel() constructor{ } } else if (unit_location[0]==location_types.ship){ if (unit.ship_location-1){ - obj_ini.ship_carrying[unit.ship_location]+=unit.get_unit_size(); + var _ship = fetch_ship(unit.ship_location); + _ship.carrying += unit.get_unit_size(); } } } @@ -90,7 +91,8 @@ function UnitQuickFindPanel() constructor{ garrison_log[$ unit_location].vehicles++; } } else if (obj_ini.veh_lid[co][u]>-1){ - obj_ini.ship_carrying[obj_ini.veh_lid[co][u]]+=scr_unit_size("",obj_ini.veh_role[co][u],true); + var _ship = fetch_ship(obj_ini.veh_lid[co][u]); + _ship.carrying += scr_unit_size("",obj_ini.veh_role[co][u],true); } } From e49fadac7d5e2e0dcc9a1602966ed8032779af57 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Fri, 14 Nov 2025 02:16:47 +0000 Subject: [PATCH 135/155] mostly sort fleet sidebar --- ChapterMaster.yyp | 2 - objects/obj_fleet_select/Create_0.gml | 73 +++++++++++++++++---------- 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 5dfc9f8cf2..9ff3ec62b2 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -576,9 +576,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.904", - }, "name":"ChapterMaster", "resources":[ diff --git a/objects/obj_fleet_select/Create_0.gml b/objects/obj_fleet_select/Create_0.gml index 4039a4286e..d2881df732 100644 --- a/objects/obj_fleet_select/Create_0.gml +++ b/objects/obj_fleet_select/Create_0.gml @@ -18,8 +18,12 @@ void_wid=0; void_hei=0; player_fleet=false; +select_all_button = new UnitButtonObject(); + +manage_units_button = new UnitButtonObject({style : "pixel"}); + selection_window.inside_method = function(){ - var mnz=0; + var _minimised=0; var xx = selection_window.XX; var yy = selection_window.YY; draw_set_font(fnt_40k_14); @@ -30,30 +34,38 @@ selection_window.inside_method = function(){ // draw_text(view_xview[0]+46,view_yview[0]+117,"Title"); // draw_text(view_xview[0]+46,view_yview[0]+142,"1#2#3#4#5#6#7#8#9#10#11#1#13#14#15#16#17#18#19#20#21#22#23#24#25"); - var type="capital",lines=0,posi=-1,colu=1,x3=48,y3=60,escorts,frigates,capitals,ty=0,current_ship=0,current_fleet=0,name="",sal=0,selection_box,scale=1,void_h=122,shew,ship_health=0; - escorts=escort; - frigates=frigate; - capitals=capital; + var type="capital",lines=0,posi=-1,colu=1,x3=48,y3=60,ty=0,current_ship=0,current_fleet=0,name="",sal=0,selection_box,scale=1,void_h=122,_show,ship_health=0; + var escorts=escort; + var frigates=frigate; + var capitals=capital; current_fleet=instance_nearest(x,y,obj_p_fleet); - if (escorts>0) then ty++; - if (frigates>0) then ty++; - if (capitals>0) then ty++; + ty = capitals>0 + frigates>0 +escorts>0; + draw_set_halign(fa_center); var set = "capitol"; - var fleet_sel = "[X]"; - if (!fleet_all) then fleet_sel = "[ ]"; - var fleet_all_click = false; + var _fleet_all_click = false; if (!fleet_minimized){ - if (point_and_click(draw_unit_buttons([xx+width-60, yy+40], fleet_sel,[1,1],c_red))){ - fleet_all = fleet_all==1?0:1; - fleet_all_click=true; + select_all_button.update({ + x1 : xx+width-60, + y1 : yy+40, + label : fleet_all ? "[X]" : "[ ]", + color : c_red, + }) + if (select_all_button.draw()){ + fleet_all = fleet_all == 1 ? 0 : 1; + _fleet_all_click=true; } var math_string = (string_width("Manage Units")/2)+6 - if (point_and_click(draw_unit_buttons([center_draw-math_string, yy+height-50], "Manage Units",[1,1],c_blue))){ + manage_units_button.update({ + x1 : center_draw - math_string, + y1 : yy+height-50, + label : "Manage Units" + }); + if (manage_units_button.draw()){ var _fleet_array = fleet_full_ship_array(current_fleet); var _fleet_marines = collect_role_group("all", ["", 0, _fleet_array]); @@ -74,6 +86,7 @@ selection_window.inside_method = function(){ draw_set_halign(fa_center); var ship_type,current_ship, sel_set, full_id; if (screen_expansion>0){ + //An astonishing bit of duke era code that has been botched into the modern era. Why does it work? honestly who can be fucked to read and find out for(var j=0; j<(escorts+frigates+capitals); j++){ draw_set_color(c_gray); y3+=20; @@ -81,12 +94,12 @@ selection_window.inside_method = function(){ lines++; posi++; scale=1; - shew=1; + _show=1; ship_health=100; if (colu==1) then void_h=min(void_h+20,560); if (posi==0){ - if (mnz=0) then draw_text(center_draw,yy+y3,string_hash_to_newline("=Capital Ships=")); + if (!_minimised) then draw_text(center_draw,yy+y3,"=Capital Ships="); y3+=20; if (y3>height-50) then break; set = "capitol"; @@ -95,7 +108,7 @@ selection_window.inside_method = function(){ if (posi==capitals) and (frigates>0){ y3+=20; if (y3>height-50) then break; - if (mnz=0) then draw_text(center_draw,yy+y3,string_hash_to_newline("=Frigates=")); + if (!_minimised) then draw_text(center_draw,yy+y3,"=Frigates="); y3+=20; if (y3>height-50) then break; @@ -104,7 +117,7 @@ selection_window.inside_method = function(){ if (posi==capitals+frigates) and (escorts>0){ y3+=20; if (y3>height-50) then break; - if (mnz=0) then draw_text(center_draw,yy+y3,string_hash_to_newline("=Escorts=")); + if (!_minimised) then draw_text(center_draw,yy+y3,"=Escorts="); y3+=20; if (y3>height-50) then break; set = "escort"; @@ -135,7 +148,9 @@ selection_window.inside_method = function(){ } break; } - if (fleet_all_click) then ship_select=fleet_all; + if (_fleet_all_click){ + ship_select=fleet_all; + } /*if (y3>670) and (posi<=escorts+frigates+capitals){ lines=1; @@ -159,7 +174,7 @@ selection_window.inside_method = function(){ if (string_width(name)*scale>135) then scale-=0.05; } } - shew=2; + _show=2; } if (point_and_click([xx+10,yy+y3,xx+width-10,yy+y3+18])){ if (!(obj_controller.fest_scheduled>0 && obj_controller.fest_sid==full_id)){ @@ -171,21 +186,23 @@ selection_window.inside_method = function(){ } } - ship_health=round(_ship.ship_hp_percentage); + ship_health=round(_ship.ship_hp_percentage()); if (ship_select==0){ selection_box="[ ]"; }else if (ship_select==1){ selection_box="[x] "; } - if (mnz==0){ + if (!_minimised){ draw_text(xx+width-25,yy+y3,selection_box); - if (shew==2) then draw_text(xx+width-60,yy+y3,$"{ship_health}%"); + if (_show==2) then draw_text(xx+width-60,yy+y3,$"{ship_health}%"); + + if (ship_health<=60) and (ship_health>40) then draw_set_color(c_yellow); + if (ship_health<=40) and (ship_health>20) then draw_set_color(c_orange); + if (ship_health<=20) then draw_set_color(c_red); + + draw_text_transformed(center_draw,yy+y3,name,scale,1,0); } - if (ship_health<=60) and (ship_health>40) then draw_set_color(c_yellow); - if (ship_health<=40) and (ship_health>20) then draw_set_color(c_orange); - if (ship_health<=20) then draw_set_color(c_red); - if (mnz=0) then draw_text_transformed(center_draw,yy+y3,name,scale,1,0); draw_set_color(c_gray); } switch(set){ From fd705951eebeac2617048a9764dfd177eb8de1b0 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Fri, 14 Nov 2025 02:20:59 +0000 Subject: [PATCH 136/155] remove merge error ship_locations --- scripts/scr_add_artifact/scr_add_artifact.gml | 4 ++-- scripts/scr_add_vehicle/scr_add_vehicle.gml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/scr_add_artifact/scr_add_artifact.gml b/scripts/scr_add_artifact/scr_add_artifact.gml index 1814f85104..06f9dca6ea 100644 --- a/scripts/scr_add_artifact/scr_add_artifact.gml +++ b/scripts/scr_add_artifact/scr_add_artifact.gml @@ -313,8 +313,8 @@ function ArtifactStruct(Index) constructor { static ship_id = function() { var _index = obj_ini.artifact_sid[index] - 500; - if (_index >= array_length(obj_ini.ship_location)){ - obj_ini.artifact_sid[index] = 500 + array_length(obj_ini.ship_location) -1; + if (_index >= array_length(obj_ini.ship_data)){ + obj_ini.artifact_sid[index] = 500 + array_length(obj_ini.ship_data) -1; } return obj_ini.artifact_sid[index] - 500; }; diff --git a/scripts/scr_add_vehicle/scr_add_vehicle.gml b/scripts/scr_add_vehicle/scr_add_vehicle.gml index f71bc7d09f..7fdc9e65e6 100644 --- a/scripts/scr_add_vehicle/scr_add_vehicle.gml +++ b/scripts/scr_add_vehicle/scr_add_vehicle.gml @@ -47,13 +47,13 @@ function scr_add_vehicle(vehicle_type, target_company,otherdata={} ,weapon1 = "s if (first != -1) { var _ship = obj_ini.ship_data[first]; obj_ini.veh_lid[target_company][good] = first; - obj_ini.veh_loc[target_company][good] = obj_ini.ship_location[first]; + obj_ini.veh_loc[target_company][good] = obj_ini.ship_data[first].location; obj_ini.veh_wid[target_company][good] = 0; _ship.carrying += 1; } else if ((first == -1) && (backup != -1)) { var _ship = obj_ini.ship_data[backup]; obj_ini.veh_lid[target_company][good] = backup; - obj_ini.veh_loc[target_company][good] = obj_ini.ship_location[backup]; + obj_ini.veh_loc[target_company][good] = obj_ini.ship_data[backup.location]; obj_ini.veh_wid[target_company][good] = 0; _ship.carrying += 1; } else if ((first == -1) && (backup == -1)) { From 7b99fc63ce486b20a533d7f033757d5c431b1efe Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Fri, 14 Nov 2025 02:27:02 +0000 Subject: [PATCH 137/155] remove legacy end battle popup --- objects/obj_turn_end/Draw_0.gml | 177 +----------------- .../scr_automated_ship_combat_functions.gml | 1 + 2 files changed, 3 insertions(+), 175 deletions(-) diff --git a/objects/obj_turn_end/Draw_0.gml b/objects/obj_turn_end/Draw_0.gml index fe52d5d5c0..ec434e32fb 100644 --- a/objects/obj_turn_end/Draw_0.gml +++ b/objects/obj_turn_end/Draw_0.gml @@ -14,181 +14,8 @@ if (show=0) and (obj_controller.zoomed=0) and (current_popup=0) then draw_sprite if (show=0) and (obj_controller.zoomed=1) and (current_popup=0) then draw_sprite_ext(spr_loading,image_index,40,40,2,2,0,c_white,1); -if (show>0) and (current_battle<=battles){ - var xxx,yyy,i; - xxx=__view_get( e__VW.XView, 0 )+535; - yyy=__view_get( e__VW.YView, 0 )+200; - i=current_battle; - - draw_sprite(spr_purge_panel,0,xxx,yyy); - // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); - // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); - if (battle_world[i]=-50) then scr_image("attacked",1,xxx+12,yyy+54,254,174); - if (battle_world[i]>0) then scr_image("attacked",0,xxx+12,yyy+54,254,174); - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(c_gray); - draw_text(xxx+8,yyy+13,string_hash_to_newline(string(i)+"/"+string(battles))); - - draw_set_halign(fa_center); - draw_set_font(fnt_40k_30b); - - if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Forces Attacked! ("+string(battle_location[i])+" "+scr_roman(battle_world[i])+")"),0.7,0.7,0); - if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Fleet Attacked! ("+string(battle_location[i])+" System)"),0.7,0.7,0); - - scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); - // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left); - - - - if (battle_world[i]<0){ - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_left); - - draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Fleets:")); - draw_text(xxx+332,yyy+237,string_hash_to_newline("Allied Fleets:")); - - if (string(strin[1])="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleship ("+string(strin[4])+"% HP)")); - if (string(strin[2])="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigate ("+string(strin[5])+"% HP)")); - if (string(strin[3])="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escort ("+string(strin[6])+"% HP)")); - if (string(strin[1])!="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleships ("+string(strin[4])+"% HP)")); - if (string(strin[2])!="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigates ("+string(strin[5])+"% HP)")); - if (string(strin[3])!="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escorts ("+string(strin[6])+"% HP)")); - - - draw_set_halign(fa_center); - - if (enemy_fleet[1]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[1],xxx+44,yyy+269); - scr_image("ui/force",enemy_fleet[1],xxx+44-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[1]=1) then shw+=string(ecap[1])+" Battleship#"; - if (ecap[1]!=1) then shw+=string(ecap[1])+" Battleships#"; - if (efri[1]=1) then shw+=string(efri[1])+" Frigate#"; - if (efri[1]!=1) then shw+=string(efri[1])+" Frigates#"; - if (eesc[1]=1) then shw+=string(eesc[1])+" Escort#"; - if (eesc[1]!=1) then shw+=string(eesc[1])+" Escorts#"; - - draw_text_transformed(xxx+44,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (enemy_fleet[2]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[2],xxx+154,yyy+269); - scr_image("ui/force",enemy_fleet[2],xxx+154-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[2]=1) then shw+=string(ecap[2])+" Battleship#"; - if (ecap[2]!=1) then shw+=string(ecap[2])+" Battleships#"; - if (efri[2]=1) then shw+=string(efri[2])+" Frigate#"; - if (efri[2]!=1) then shw+=string(efri[2])+" Frigates#"; - if (eesc[2]=1) then shw+=string(eesc[2])+" Escort#"; - if (eesc[2]!=1) then shw+=string(eesc[2])+" Escorts#"; - - draw_text_transformed(xxx+154,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (enemy_fleet[3]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[3],xxx+264,yyy+269); - scr_image("ui/force",enemy_fleet[3],xxx+264-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[3]=1) then shw+=string(ecap[3])+" Battleship#"; - if (ecap[3]!=1) then shw+=string(ecap[3])+" Battleships#"; - if (efri[3]=1) then shw+=string(efri[3])+" Frigate#"; - if (efri[3]!=1) then shw+=string(efri[3])+" Frigates#"; - if (eesc[3]=1) then shw+=string(eesc[3])+" Escort#"; - if (eesc[3]!=1) then shw+=string(eesc[3])+" Escorts#"; - - draw_text_transformed(xxx+264,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - - if (allied_fleet[1]!=0){ - // draw_sprite(spr_force_icon,allied_fleet[1],xxx+374,yyy+269); - scr_image("ui/force",allied_fleet[1],xxx+374-32,yyy+269-32,64,64); - var shw;shw=""; - if (acap[1]=1) then shw+=string(acap[1])+" Battleship#"; - if (acap[1]!=1) then shw+=string(acap[1])+" Battleships#"; - if (afri[1]=1) then shw+=string(afri[1])+" Frigate#"; - if (afri[1]!=1) then shw+=string(afri[1])+" Frigates#"; - if (aesc[1]=1) then shw+=string(aesc[1])+" Escort#"; - if (aesc[1]!=1) then shw+=string(aesc[1])+" Escorts#"; - - draw_text_transformed(xxx+374,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (allied_fleet[2]!=0){ - // draw_sprite(spr_force_icon,allied_fleet[1],xxx+484,yyy+269); - scr_image("ui/force",allied_fleet[1],xxx+484-32,yyy+269-32,64,64); - var shw;shw=""; - if (acap[2]=1) then shw+=string(acap[2])+" Battleship#"; - if (acap[2]!=1) then shw+=string(acap[2])+" Battleships#"; - if (afri[2]=1) then shw+=string(afri[2])+" Frigate#"; - if (afri[2]!=1) then shw+=string(afri[2])+" Frigates#"; - if (aesc[2]=1) then shw+=string(aesc[2])+" Escort#"; - if (aesc[2]!=1) then shw+=string(aesc[2])+" Escorts#"; - - draw_text_transformed(xxx+484,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - - - - - - draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Retreat"),1.1,1.1,0); - if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); - } - - draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Fight"),1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); - } - - } - - - if (battle_world[i]>=1){ - if (battle_opponent[i]<=20){ - draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Marines")); - draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Vehicles")); - if (strin[3]!="") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Fortified"));// Not / Barely / Lightly / Moderately / Highly / Maximally - } - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_left); - - draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Factions:")); - draw_text(xxx+332,yyy+237,string_hash_to_newline("Allies:")); - - - - draw_set_halign(fa_center); - // draw_sprite(spr_force_icon,battle_opponent[i],xxx+44,yyy+289); - scr_image("ui/force",battle_opponent[i],xxx+44-32,yyy+289-32,64,64); - draw_text_transformed(xxx+44,yyy+316,string_hash_to_newline(string(strin[4])),0.75,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - - - draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Offensive"),1.1,1.1,0); - if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); - } - - draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Defensive"),1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); - } - - - - - - } +if (show>0 && current_battle<=battles){ + } diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 18d3010b5f..92584e792c 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -5,6 +5,7 @@ function point_on_circle(start_x, start_y, radius, angle){ return [_final_x, _final_y]; } + function find_ship_combat_target(primary_target_type = obj_en_ship, secondary_target_type = -1){ if (instance_exists(primary_target_type) && !instance_exists(secondary_target_type)){ target=instance_nearest(x,y,obj_p_ship); From f36aa32a399a4f3e3b07f8d49d9ba7deec60c33a Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Fri, 14 Nov 2025 02:35:33 +0000 Subject: [PATCH 138/155] make more sense of end turn battle procedure --- objects/obj_turn_end/Alarm_0.gml | 108 +---------------- objects/obj_turn_end/Draw_64.gml | 7 -- .../scr_end_turn_combat_helpers.gml | 114 +++++++++++++++++- 3 files changed, 114 insertions(+), 115 deletions(-) diff --git a/objects/obj_turn_end/Alarm_0.gml b/objects/obj_turn_end/Alarm_0.gml index bbf79e371e..4b3bdd76b5 100644 --- a/objects/obj_turn_end/Alarm_0.gml +++ b/objects/obj_turn_end/Alarm_0.gml @@ -50,113 +50,7 @@ repeat(50){ -if (battles>0) and (current_battle<=battles){ - var ii, xx, yy, good; - ii=0; - good=0; - - var battle_star = star_by_name(battle_location[current_battle]); - - if (battle_star!="none"){// trying to find the star - obj_controller.x=battle_star.x; - obj_controller.y=battle_star.y; - show=current_battle; - - if (battle_world[current_battle]=-50){ - strin[1]=string(round(battle_pobject[current_battle].capital_number)); - strin[2]=string(round(battle_pobject[current_battle].frigate_number)); - strin[3]=string(round(battle_pobject[current_battle].escort_number)); - // pull health values here - strin[4]=string(round(battle_pobject[current_battle].capital_health)); - strin[5]=string(round(battle_pobject[current_battle].frigate_health)); - strin[6]=string(round(battle_pobject[current_battle].escort_health)); - - // pull enemy ships here - - var e=1; - repeat(10){ - e+=1; - if (e=11) then e=13; - if (battle_star.present_fleet[e]>0){ - obj_controller.temp[1070]=battle_star.id; - obj_controller.temp[1071]=e; - obj_controller.temp[1072]=0; - obj_controller.temp[1073]=0; - obj_controller.temp[1074]=0; - - with(obj_en_fleet){ - if (orbiting=obj_controller.temp[1070]) and (owner=obj_controller.temp[1071]){ - obj_controller.temp[1072]+=round(capital_number); - obj_controller.temp[1073]+=round(frigate_number); - obj_controller.temp[1074]+=round(escort_number); - } - } - - var l1,l2;l1=0;l2=0; - if (obj_controller.faction_status[e]!="War"){ - repeat(10){l1+=1;if (allied_fleet[l1]=0) and (l2=0) then l2=l1;} - allied_fleet[l2]=e; - acap[l2]=obj_controller.temp[1072]; - afri[l2]=obj_controller.temp[1073]; - aesc[l2]=obj_controller.temp[1074]; - } - if (obj_controller.faction_status[e]="War") or (e=9) or (e=13){ - repeat(10){l1+=1;if (enemy_fleet[l1]=0) and (l2=0) then l2=l1;} - enemy_fleet[l2]=e; - ecap[l2]=obj_controller.temp[1072]; - efri[l2]=obj_controller.temp[1073]; - eesc[l2]=obj_controller.temp[1074]; - } - } - } - - } - - if (battle_world[current_battle]>=1){ - scr_count_forces(string(battle_location[current_battle]),battle_world[current_battle],true); - - strin[1]=info_mahreens; - strin[2]=info_vehicles; - - if (info_mahreens+info_vehicles=0){ - if (battles>current_battle) then alarm[4]=1; - if (battles=current_battle) then alarm[1]=1; - } - - strin[3]=""; - - var tempy=0; - tempy=battle_object[current_battle].p_owner[battle_world[current_battle]]; - - if (tempy=1) or (tempy=2) or (tempy=3){ - var array_string = ["","Minimally","Lightly","Moderately","Highly","Extremely","Maximally"]; - var battle_fortification = battle_object[current_battle].p_fortified[battle_world[current_battle]]; - strin[3] = array_string[clamp(battle_fortification, 1, 6)]; - } - - tempy=0; - if (battle_opponent[current_battle]=7) then tempy=battle_object[current_battle].p_orks[battle_world[current_battle]]; - if (battle_opponent[current_battle]=8) then tempy=battle_object[current_battle].p_tau[battle_world[current_battle]]; - if (battle_opponent[current_battle]=9) then tempy=battle_object[current_battle].p_tyranids[battle_world[current_battle]]; - if (battle_opponent[current_battle]=10) then tempy=battle_object[current_battle].p_traitors[battle_world[current_battle]]; - if (battle_opponent[current_battle]=13) then tempy=battle_object[current_battle].p_necrons[battle_world[current_battle]]; - - if (tempy=1) then strin[4]="Minimal Forces"; - if (tempy=2) then strin[4]="Sparse Forces"; - if (tempy=3) then strin[4]="Moderate Forces"; - if (tempy=4) then strin[4]="Numerous Forces"; - if (tempy=5) then strin[4]="Very Numerous"; - if (tempy=6) then strin[4]="Overwhelming"; - - // if (battle_opponent[current_battle]=2) then obj_controller.alarm[7]=1; - obj_controller.cooldown=9999; - } - - if (obj_controller.zoomed=1) then with(obj_controller){scr_zoom();} - } - instance_activate_object(obj_star); - -} +collect_next_end_turn_fleet_battle(); instance_activate_object(obj_star); diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 6a3fd83b01..96ca8c071f 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -75,13 +75,6 @@ if (show>0 && current_battle<=battles && current_battle>-1){ } if (!instance_exists(obj_fleet) && !instance_exists(obj_ncombat)){ main_slate.draw_with_dimensions(535, 200, 530, 400); - } else { - if (instance_exists(obj_fleet)){ - ready_set++; - if (ready_set >=20){ - start_fleet_battle(); - } - } } } diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 440ca69d4f..093d892970 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -1,5 +1,115 @@ +function collect_next_end_turn_battle(){ + if (battles<=0) || (current_battle>battles){ + exit; + } + var ii, xx, yy, good; + ii=0; + good=0; + + var battle_star = star_by_name(battle_location[current_battle]); + + if (battle_star!="none"){// trying to find the star + obj_controller.x=battle_star.x; + obj_controller.y=battle_star.y; + + show=current_battle; + + if (battle_world[current_battle] == -50){ + strin[1]=string(round(battle_pobject[current_battle].capital_number)); + strin[2]=string(round(battle_pobject[current_battle].frigate_number)); + strin[3]=string(round(battle_pobject[current_battle].escort_number)); + // pull health values here + strin[4]=string(round(battle_pobject[current_battle].capital_health)); + strin[5]=string(round(battle_pobject[current_battle].frigate_health)); + strin[6]=string(round(battle_pobject[current_battle].escort_health)); + + // pull enemy ships here + + var e=1; + repeat(10){ + e+=1; + if (e=11) then e=13; + if (battle_star.present_fleet[e]>0){ + obj_controller.temp[1070]=battle_star.id; + obj_controller.temp[1071]=e; + obj_controller.temp[1072]=0; + obj_controller.temp[1073]=0; + obj_controller.temp[1074]=0; + + with(obj_en_fleet){ + if (orbiting=obj_controller.temp[1070]) and (owner=obj_controller.temp[1071]){ + obj_controller.temp[1072]+=round(capital_number); + obj_controller.temp[1073]+=round(frigate_number); + obj_controller.temp[1074]+=round(escort_number); + } + } + + var l1,l2;l1=0;l2=0; + if (obj_controller.faction_status[e]!="War"){ + repeat(10){l1+=1;if (allied_fleet[l1]=0) and (l2=0) then l2=l1;} + allied_fleet[l2]=e; + acap[l2]=obj_controller.temp[1072]; + afri[l2]=obj_controller.temp[1073]; + aesc[l2]=obj_controller.temp[1074]; + } + if (obj_controller.faction_status[e]="War") or (e=9) or (e=13){ + repeat(10){l1+=1;if (enemy_fleet[l1]=0) and (l2=0) then l2=l1;} + enemy_fleet[l2]=e; + ecap[l2]=obj_controller.temp[1072]; + efri[l2]=obj_controller.temp[1073]; + eesc[l2]=obj_controller.temp[1074]; + } + } + } + + } + + if (battle_world[current_battle]>=1){ + scr_count_forces(string(battle_location[current_battle]),battle_world[current_battle],true); + + strin[1]=info_mahreens; + strin[2]=info_vehicles; + + if (info_mahreens+info_vehicles=0){ + if (battles>current_battle) then alarm[4]=1; + if (battles=current_battle) then alarm[1]=1; + } + + strin[3]=""; + + var tempy=0; + tempy=battle_object[current_battle].p_owner[battle_world[current_battle]]; + + if (tempy=1) or (tempy=2) or (tempy=3){ + var array_string = ["","Minimally","Lightly","Moderately","Highly","Extremely","Maximally"]; + var battle_fortification = battle_object[current_battle].p_fortified[battle_world[current_battle]]; + strin[3] = array_string[clamp(battle_fortification, 1, 6)]; + } + + tempy=0; + if (battle_opponent[current_battle]=7) then tempy=battle_object[current_battle].p_orks[battle_world[current_battle]]; + if (battle_opponent[current_battle]=8) then tempy=battle_object[current_battle].p_tau[battle_world[current_battle]]; + if (battle_opponent[current_battle]=9) then tempy=battle_object[current_battle].p_tyranids[battle_world[current_battle]]; + if (battle_opponent[current_battle]=10) then tempy=battle_object[current_battle].p_traitors[battle_world[current_battle]]; + if (battle_opponent[current_battle]=13) then tempy=battle_object[current_battle].p_necrons[battle_world[current_battle]]; + + if (tempy=1) then strin[4]="Minimal Forces"; + if (tempy=2) then strin[4]="Sparse Forces"; + if (tempy=3) then strin[4]="Moderate Forces"; + if (tempy=4) then strin[4]="Numerous Forces"; + if (tempy=5) then strin[4]="Very Numerous"; + if (tempy=6) then strin[4]="Overwhelming"; + + // if (battle_opponent[current_battle]=2) then obj_controller.alarm[7]=1; + obj_controller.cooldown=9999; + } + + if (obj_controller.zoomed=1) then with(obj_controller){scr_zoom();} + } + instance_activate_object(obj_star); +} function draw_player_fleet_combat_options(){ var xxx=main_slate.XX; @@ -72,7 +182,9 @@ function draw_player_fleet_combat_options(){ var _star = star_by_name(battle_location[current_battle]); setup_fleet_battle(enemy_fleet[1], _star); - ready_set = 0; + if (instance_exists(obj_fleet)){ + wait_and_execute(20, start_fleet_battle,[] , obj_turn_end); + } // Start battle here } From b4e681ab6fc573e48e8d2a20ec3ddf3f114d4101 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 15 Nov 2025 04:14:04 +0000 Subject: [PATCH 139/155] refaactor battle sort --- ChapterMaster.yyp | 1 - objects/obj_controller/Alarm_5.gml | 9 ++- objects/obj_popup/Keyboard_13.gml | 5 +- objects/obj_turn_end/Alarm_0.gml | 69 ----------------- scripts/scr_battle_sort/scr_battle_sort.gml | 47 ------------ scripts/scr_battle_sort/scr_battle_sort.yy | 13 ---- .../scr_end_turn_combat_helpers.gml | 74 ++++++++++++++++++- .../scr_popup_functions.gml | 3 +- 8 files changed, 82 insertions(+), 139 deletions(-) delete mode 100644 scripts/scr_battle_sort/scr_battle_sort.gml delete mode 100644 scripts/scr_battle_sort/scr_battle_sort.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 9ff3ec62b2..51940b14df 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -752,7 +752,6 @@ {"id":{"name":"scr_audience","path":"scripts/scr_audience/scr_audience.yy",},}, {"id":{"name":"scr_automated_ship_combat_functions","path":"scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.yy",},}, {"id":{"name":"scr_battle_allies","path":"scripts/scr_battle_allies/scr_battle_allies.yy",},}, - {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},}, {"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},}, {"id":{"name":"scr_boarding_actions","path":"scripts/scr_boarding_actions/scr_boarding_actions.yy",},}, {"id":{"name":"scr_bolt","path":"scripts/scr_bolt/scr_bolt.yy",},}, diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 6de9855809..e62e418442 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -455,10 +455,15 @@ try{ handle_exception(_exception); } // Right here need to sort the battles within the obj_turn_end -with(obj_turn_end){scr_battle_sort();} +with(obj_turn_end){ + order_end_turn_battles(); + end_turn_battle_next_sequence(false, 20); +} for(var i=1; i<=10; i++){ - if (turns_ignored[i]>0) and (turns_ignored[i]<500) then turns_ignored[i]-=1; + if (turns_ignored[i]<500){ + turns_ignored[i] = clamp(turns_ignored[i]-1, 0, 500); + } } if (known[eFACTION.Eldar]>=2) and (faction_gender[6]==2) and (turn%10==0) then turns_ignored[6]+=floor(random_range(0,6)); diff --git a/objects/obj_popup/Keyboard_13.gml b/objects/obj_popup/Keyboard_13.gml index f8c09b1a10..6b93008cc4 100644 --- a/objects/obj_popup/Keyboard_13.gml +++ b/objects/obj_popup/Keyboard_13.gml @@ -24,10 +24,7 @@ if (array_length(options == 0) && type<5){ } if (type=POPUP_TYPE.BATTLE_OPTIONS){ - obj_controller.cooldown=10; - obj_turn_end.current_battle+=1; - obj_turn_end.alarm[0]=1; - obj_controller.force_scroll=0; + end_turn_battle_next_sequence(); instance_destroy(); } diff --git a/objects/obj_turn_end/Alarm_0.gml b/objects/obj_turn_end/Alarm_0.gml index 4b3bdd76b5..8b13789179 100644 --- a/objects/obj_turn_end/Alarm_0.gml +++ b/objects/obj_turn_end/Alarm_0.gml @@ -1,70 +1 @@ -// show_message("biiiiiIIIng"); -try_and_report_loop("battle alarm 0 loop", function(){ -instance_activate_object(obj_star); -combating=0; - -var i; - - -i=50; -repeat(50){ - i-=1; - - if (battles<=i) and (i>=2){ - if (battle[i]!=0) and (battle[i-1]!=0) and (battle_world[i]=-50) and (battle_world[i-1]>0){ - var tem1, tem2, tem3, tem4, tem5, tem6, tem7; - tem1=battle[i-1]; - tem2=battle_location[i-1]; - tem3=battle_world[i-1]; - tem4=battle_opponent[i-1]; - tem5=battle_object[i-1]; - tem6=battle_pobject[i-1]; - tem7=battle_special[i-1]; - - battle[i-1]=battle[i]; - battle_location[i-1]=battle_location[i]; - battle_world[i-1]=battle_world[i]; - battle_opponent[i-1]=battle_opponent[i]; - // battle_object[i-1]=battle_object[i]; - battle_pobject[i-1]=battle_pobject[i]; - battle_special[i-1]=battle_special[i]; - - battle[i]=tem1; - battle_location[i]=tem2; - battle_world[i]=tem3; - battle_opponent[i]=tem4; - battle_object[i]=tem5; - battle_pobject[i]=tem6; - battle_special[i]=tem7; - } - } -} - - - -// Probably want something right here to organize the battle just in case -// Space battles first -// Ground battles after - - - - -collect_next_end_turn_fleet_battle(); - -instance_activate_object(obj_star); - - - - -if (battle[1]=0) or (current_battle>battles){// This is temporary for the sake of testing - if (battle[1]=0){ - obj_controller.x=first_x; - obj_controller.y=first_y; - } - alarm[1]=1; -} - -/* */ -/* */ -}); diff --git a/scripts/scr_battle_sort/scr_battle_sort.gml b/scripts/scr_battle_sort/scr_battle_sort.gml deleted file mode 100644 index bd51d5d290..0000000000 --- a/scripts/scr_battle_sort/scr_battle_sort.gml +++ /dev/null @@ -1,47 +0,0 @@ -function scr_battle_sort() { - - var i; - i=50; - - - // This is ran in order to sort the battles that have been quened up - // Space battles are placed in front whenever possible - - repeat(50){ - i-=1; - - if (battles<=i) and (i>=2) and (battles>0){ - if (battle[i]!=0) and (battle[i-1]!=0) and (battle_world[i]=-50) and (battle_world[i-1]>0){ - var tem1, tem2, tem3, tem4, tem5, tem6, tem7; - tem1=battle[i-1]; - tem2=battle_location[i-1]; - tem3=battle_world[i-1]; - tem4=battle_opponent[i-1]; - tem5=battle_object[i-1]; - tem6=battle_pobject[i-1]; - tem7=battle_special[i-1]; - - battle[i-1]=battle[i]; - battle_location[i-1]=battle_location[i]; - battle_world[i-1]=battle_world[i]; - battle_opponent[i-1]=battle_opponent[i]; - battle_object[i-1]=battle_object[i]; - battle_pobject[i-1]=battle_pobject[i]; - battle_special[i-1]=battle_special[i]; - - battle[i]=tem1; - battle_location[i]=tem2; - battle_world[i]=tem3; - battle_opponent[i]=tem4; - battle_object[i]=tem5; - battle_pobject[i]=tem6; - battle_special[i]=tem7; - } - } - } - - - alarm[0]=15; - - -} diff --git a/scripts/scr_battle_sort/scr_battle_sort.yy b/scripts/scr_battle_sort/scr_battle_sort.yy deleted file mode 100644 index ab4ca19ee8..0000000000 --- a/scripts/scr_battle_sort/scr_battle_sort.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$GMScript":"v1", - "%Name":"scr_battle_sort", - "isCompatibility":false, - "isDnD":false, - "name":"scr_battle_sort", - "parent":{ - "name":"Combat", - "path":"folders/Scripts/Combat.yy", - }, - "resourceType":"GMScript", - "resourceVersion":"2.0", -} \ No newline at end of file diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 093d892970..1dfce3e8f5 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -1,4 +1,76 @@ +function add_new_end_turn_battle(){ +} + +function end_turn_battle_next_sequence(next_battle = true, wait_time = 1){ + if (next_battle){ + obj_turn_end.current_battle++; + } + obj_controller.force_scroll=0; + static _main_func = function(){ + instance_activate_object(obj_star); + combating=0; + + + order_end_turn_battles(); + collect_next_end_turn_fleet_battle(); + + instance_activate_object(obj_star); + + + + + if (battle[1]=0) or (current_battle>battles){// This is temporary for the sake of testing + if (battle[1]=0){ + obj_controller.x=first_x; + obj_controller.y=first_y; + } + alarm[1]=1; + } + } + + wait_and_execute(wait_time,_main_func,[],obj_turn_end) + + /* */ +} +// Space battles first +// Ground battles after +function order_end_turn_battles(){ + var i; + i=50; + repeat(50){ + i-=1; + + if (battles<=i) and (i>=2){ + if (battle[i]!=0) and (battle[i-1]!=0) and (battle_world[i]=-50) and (battle_world[i-1]>0){ + var tem1, tem2, tem3, tem4, tem5, tem6, tem7; + tem1=battle[i-1]; + tem2=battle_location[i-1]; + tem3=battle_world[i-1]; + tem4=battle_opponent[i-1]; + tem5=battle_object[i-1]; + tem6=battle_pobject[i-1]; + tem7=battle_special[i-1]; + + battle[i-1]=battle[i]; + battle_location[i-1]=battle_location[i]; + battle_world[i-1]=battle_world[i]; + battle_opponent[i-1]=battle_opponent[i]; + // battle_object[i-1]=battle_object[i]; + battle_pobject[i-1]=battle_pobject[i]; + battle_special[i-1]=battle_special[i]; + + battle[i]=tem1; + battle_location[i]=tem2; + battle_world[i]=tem3; + battle_opponent[i]=tem4; + battle_object[i]=tem5; + battle_pobject[i]=tem6; + battle_special[i]=tem7; + } + } + } +} function collect_next_end_turn_battle(){ if (battles<=0) || (current_battle>battles){ @@ -10,7 +82,7 @@ function collect_next_end_turn_battle(){ var battle_star = star_by_name(battle_location[current_battle]); - if (battle_star!="none"){// trying to find the star + if (battle_star != "none"){// trying to find the star obj_controller.x=battle_star.x; obj_controller.y=battle_star.y; diff --git a/scripts/scr_popup_functions/scr_popup_functions.gml b/scripts/scr_popup_functions/scr_popup_functions.gml index 0778eb0b5b..b705acbe1a 100644 --- a/scripts/scr_popup_functions/scr_popup_functions.gml +++ b/scripts/scr_popup_functions/scr_popup_functions.gml @@ -42,8 +42,7 @@ function popup_defualt_click_action(){ if (type=POPUP_TYPE.BATTLE_OPTIONS){ obj_controller.cooldown=10; if (instance_exists(obj_turn_end)){ - obj_turn_end.current_battle+=1; - obj_turn_end.alarm[0]=1; + end_turn_battle_next_sequence(); } obj_controller.force_scroll=0; instance_destroy(); From 5742ad084b0d6dcf5e55b4a166f1e8c36ff5b178 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 17 Nov 2025 02:08:25 +0000 Subject: [PATCH 140/155] further grinding --- objects/obj_img/Create_0.gml | 6 +- objects/obj_popup/Draw_64.gml | 9 +-- objects/obj_turn_end/Alarm_1.gml | 23 ++----- objects/obj_turn_end/Alarm_4.gml | 29 ++++---- objects/obj_turn_end/Create_0.gml | 69 ++++++++++--------- scripts/macros/macros.gml | 7 ++ scripts/scr_PlanetData/scr_PlanetData.gml | 2 +- .../scr_end_turn_combat_helpers.gml | 15 ++-- scripts/scr_popup/scr_popup.gml | 12 ++-- 9 files changed, 84 insertions(+), 88 deletions(-) diff --git a/objects/obj_img/Create_0.gml b/objects/obj_img/Create_0.gml index f54fbb9b62..1785370ae6 100644 --- a/objects/obj_img/Create_0.gml +++ b/objects/obj_img/Create_0.gml @@ -26,8 +26,10 @@ repeat(301){i+=1; postbattle[i]=0;postbattle_exists[i]=-1; postspace[i]=0;postspace_exists[i]=-1; formation[i]=0;formation_exists[i]=-1; - popup[i]=0;popup_exists[i]=-1; - commander[i]=0;commander_exists[i]=-1; + popup[i]=0; + popup_exists[i]=-1; + commander[i]=0; + commander_exists[i]=-1; planet_good[i]=0;planet_exists[i]=-1; attacked[i]=0;attacked_exists[i]=-1; force[i]=0;force_exists[i]=-1; diff --git a/objects/obj_popup/Draw_64.gml b/objects/obj_popup/Draw_64.gml index 80eb9d4667..1bbd3cc8aa 100644 --- a/objects/obj_popup/Draw_64.gml +++ b/objects/obj_popup/Draw_64.gml @@ -72,7 +72,7 @@ try{ draw_set_color(255); } } - draw_text_transformed(x1 + (sprite_width / 2), y1 + (sprite_height * 0.07), string_hash_to_newline(string(title)), 1.1, 1.1, 0); + draw_text_transformed(x1 + (sprite_width / 2), y1 + (sprite_height * 0.07), title, 1.1, 1.1, 0); // draw_text(xx+320.5,yy+123.5,string(title)); draw_set_font(fnt_40k_14); @@ -80,12 +80,13 @@ try{ draw_set_color(CM_GREEN_COLOR); if (instance_exists(obj_turn_end)) { - if (obj_turn_end.popups > 0) { - draw_text(x1 + 20, y1 + (sprite_height * 0.07), $"{obj_turn_end.current_popup}/{obj_turn_end.popups}" ) + var _pop_count = array_length(obj_turn_end.popup); + if (_pop_count) { + draw_text(x1 + 20, y1 + (sprite_height * 0.07), $"{obj_turn_end.current_popup}/{_pop_count}"); } } if (image == "debug") { - draw_text_ext(x1 + 20, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, sprite_width - 40); + draw_text_ext(x1 + 20, y1 + (sprite_height * 0.18), string_hash_to_newline(text), -1, sprite_width - 40); } else if (image == "") { if (size == 1) { draw_text_ext(x1 + 5, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, width); diff --git a/objects/obj_turn_end/Alarm_1.gml b/objects/obj_turn_end/Alarm_1.gml index e8d9b3a34e..d596f2f7ee 100644 --- a/objects/obj_turn_end/Alarm_1.gml +++ b/objects/obj_turn_end/Alarm_1.gml @@ -62,9 +62,8 @@ if (!_is_audience){ current_popup+=1; - if (popup[current_popup]!=0){ - var pip; - pip=instance_create(0,0,obj_popup); + if (current_popup>=0 && current_popuppopups) or (popup[1]=0){ - if (popups_end=0) then popups_end=1; - // obj_controller.x=first_x; - // obj_controller.y=first_y; - // instance_destroy(); - } - - - + popups_end = current_popup>=array_length(popup); // obj_controller.x=first_x; // obj_controller.y=first_y; // instance_destroy(); } - -// if (current_popup>popups) or (popup[1]=0) then popups_end=1; - -if (popups_end=1){ +if (popups_end){ /*if (popups=0){ @@ -144,7 +132,8 @@ if (popups_end=1){ with(obj_controller){ year_fraction+=84; if (year_fraction>999){ - year+=1;year_fraction=0; + year+=1; + year_fraction=0; } if (year>=1000){ millenium+=1;year-=1000; diff --git a/objects/obj_turn_end/Alarm_4.gml b/objects/obj_turn_end/Alarm_4.gml index 939fd4a72e..c8be577dd8 100644 --- a/objects/obj_turn_end/Alarm_4.gml +++ b/objects/obj_turn_end/Alarm_4.gml @@ -38,6 +38,7 @@ if (battles>0) and (current_battle<=battles){ if (battle_world[current_battle]>=1){ + var _p_data = new PlanetData(battle_world[current_battle], battle_object[current_battle]); scr_count_forces(string(battle_location[current_battle]),battle_world[current_battle],true); @@ -51,16 +52,11 @@ if (battles>0) and (current_battle<=battles){ strin[3]=""; - var tempy;tempy=0; + var tempy=0; tempy=battle_object[current_battle].p_owner[battle_world[current_battle]]; - if (tempy=1) or (tempy=2) or (tempy=3){ - if (battle_object[current_battle].p_fortified[battle_world[current_battle]]=1) then strin[3]="Minimally"; - if (battle_object[current_battle].p_fortified[battle_world[current_battle]]=2) then strin[3]="Lightly"; - if (battle_object[current_battle].p_fortified[battle_world[current_battle]]=3) then strin[3]="Moderately"; - if (battle_object[current_battle].p_fortified[battle_world[current_battle]]=4) then strin[3]="Highly"; - if (battle_object[current_battle].p_fortified[battle_world[current_battle]]=5) then strin[3]="Extremely"; - if (battle_object[current_battle].p_fortified[battle_world[current_battle]]=6) then strin[3]="Maximally"; + if ((tempy>=1) || (tempy=2) || (tempy=3)){ + strin[3] = FORTIFICATION_GRADES_DESCRIPTIONS[clamp(_p_data.fortification_level, 0, 6)]; } tempy=0; @@ -68,19 +64,20 @@ if (battles>0) and (current_battle<=battles){ if (battle_opponent[current_battle]=8) then tempy=battle_object[current_battle].p_tau[battle_world[current_battle]]; if (battle_opponent[current_battle]=9) then tempy=battle_object[current_battle].p_tyranids[battle_world[current_battle]]; if (battle_opponent[current_battle]=10) then tempy=battle_object[current_battle].p_traitors[battle_world[current_battle]]; - if (battle_opponent[current_battle]=30){tempy=1;strin[4]="Master Spyrer";} + if (battle_opponent[current_battle]=30){ + tempy=1; + strin[4]="Master Spyrer"; + } if (battle_opponent[current_battle]<=20){ - if (tempy=1) then strin[4]="Minimal Forces"; - if (tempy=2) then strin[4]="Sparse Forces"; - if (tempy=3) then strin[4]="Moderate Forces"; - if (tempy=4) then strin[4]="Numerous Forces"; - if (tempy=5) then strin[4]="Very Numerous"; - if (tempy=6) then strin[4]="Overwhelming"; + tempy = clamp(tempy, 0, 6); + strin[4] = AUTO_BATTLE_FORCES_GRADE[tempy]; } } - if (obj_controller.zoomed=1) then with(obj_controller){scr_zoom();} + if (obj_controller.zoomed=1){ + scr_zoom() + }; } instance_activate_object(obj_star); diff --git a/objects/obj_turn_end/Create_0.gml b/objects/obj_turn_end/Create_0.gml index 2512a27f1c..ba9c6be999 100644 --- a/objects/obj_turn_end/Create_0.gml +++ b/objects/obj_turn_end/Create_0.gml @@ -14,8 +14,8 @@ alerts=0; fadeout=0; popups_end=0; -current_battle=1; -current_popup=0; +current_battle=-1; +current_popup=-1; fast=0;// This is increased, once the alert[i]=1 and >=fast then it begins to fade in and get letters info_mahreens=0; @@ -29,38 +29,39 @@ cooldown=10; main_slate = new DataSlate(); obj_controller.menu=999;// show nothing, click nothing -i=-1;repeat(11){i+=1;enemy_fleet[i]=0;allied_fleet[i]=0;ecap[i]=0;efri[i]=0;eesc[i]=0;acap[i]=0;afri[i]=0;aesc[i]=0;} - -i=-1; -repeat(91){ - i+=1; - - popup[i]=0; - popup_type[i]=""; - popup_text[i]=""; - popup_image[i]=""; - popup_special[i]=""; - - alert[i]=0; - alert_type[i]=""; - alert_text[i]=""; - - alert_char[i]=0; - alert_alpha[i]=0; - alert_txt[i]=""; - alert_color[i]=""; +enemy_fleet = array_create(11, 0); +allied_fleet = array_create(11, 0); +ecap = array_create(11, 0); +efri = array_create(11, 0); +eesc = array_create(11, 0); +acap = array_create(11, 0); +afri = array_create(11, 0); +aesc = array_create(11, 0); + + +popup = []; +popup_type = []; +popup_text = []; +popup_image = []; +popup_special = []; + +alert = []; +alert_type = []; +alert_text = []; + +alert_char = []; +alert_alpha = []; +alert_txt = []; +alert_color = []; + +battle = [];// Set to 0 for none, 1 for battle to do, and 2 for resolved +battle_location = []; +battle_world = [];// Be like -50 for space battle +battle_opponent = [];// faction ID +battle_object = [];// faction object for the fleets +battle_pobject = [];// player object for the fleets +battle_special = []; - battle[i]=0;// Set to 0 for none, 1 for battle to do, and 2 for resolved - battle_location[i]=""; - battle_world[i]=0;// Be like -50 for space battle - battle_opponent[i]=0;// faction ID - battle_object[i]=0;// faction object for the fleets - battle_pobject[i]=0;// player object for the fleets - battle_special[i]=""; - - - if (i<16) then strin[i]=""; -} audiences = 0; audience = 0; @@ -78,7 +79,7 @@ if (audiences>0){// This is a one-off change all messages to declare war var war; repeat(15){ i+=1; - war[i]=0; + war = []; } for (var i=0;i=2){ if (battle[i]!=0) and (battle[i-1]!=0) and (battle_world[i]=-50) and (battle_world[i-1]>0){ - var tem1, tem2, tem3, tem4, tem5, tem6, tem7; - tem1=battle[i-1]; - tem2=battle_location[i-1]; - tem3=battle_world[i-1]; - tem4=battle_opponent[i-1]; - tem5=battle_object[i-1]; - tem6=battle_pobject[i-1]; - tem7=battle_special[i-1]; + var tem1=battle[i-1]; + var tem2=battle_location[i-1]; + var tem3=battle_world[i-1]; + var tem4=battle_opponent[i-1]; + var tem5=battle_object[i-1]; + var tem6=battle_pobject[i-1]; + var tem7=battle_special[i-1]; battle[i-1]=battle[i]; battle_location[i-1]=battle_location[i]; diff --git a/scripts/scr_popup/scr_popup.gml b/scripts/scr_popup/scr_popup.gml index 4a9c38ae9e..a54f4576c2 100644 --- a/scripts/scr_popup/scr_popup.gml +++ b/scripts/scr_popup/scr_popup.gml @@ -8,13 +8,13 @@ function scr_popup(type, text, image, popup_special="") { if (instance_exists(obj_turn_end)){ obj_turn_end.popups++; - obj_turn_end.popup[obj_turn_end.popups]=1; - obj_turn_end.popup_type[obj_turn_end.popups]=type; - obj_turn_end.popup_text[obj_turn_end.popups]=text; - obj_turn_end.popup_image[obj_turn_end.popups]=image; - obj_turn_end.popup_special[obj_turn_end.popups]=popup_special; + array_push(obj_turn_end.popup, 1); + array_push(obj_turn_end.popup_type,type); + array_push(obj_turn_end.popup_text, text); + array_push(obj_turn_end.popup_image, image); + array_push(obj_turn_end.popup_special, popup_special); } else { - var pip=instance_create(0,0,obj_popup); + var pip = instance_create(0,0,obj_popup); pip.title=type; pip.text=text; From b2e2d0dda639340dced9cfaa21cf9b63acb3e429 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 17 Nov 2025 02:16:36 +0000 Subject: [PATCH 141/155] delete tunr end alrm 4 --- objects/obj_turn_end/Alarm_4.gml | 97 ---------------- .../scr_end_turn_combat_helpers.gml | 109 +++++++++++++++++- 2 files changed, 106 insertions(+), 100 deletions(-) delete mode 100644 objects/obj_turn_end/Alarm_4.gml diff --git a/objects/obj_turn_end/Alarm_4.gml b/objects/obj_turn_end/Alarm_4.gml deleted file mode 100644 index c8be577dd8..0000000000 --- a/objects/obj_turn_end/Alarm_4.gml +++ /dev/null @@ -1,97 +0,0 @@ - -var battle_o;battle_o=0; -current_battle+=1; -combating=0; - -instance_activate_object(obj_star); - -if (battles>0) and (current_battle<=battles){ - - var ii=0,good=0; - var battle_star = star_by_name(battle_location[current_battle]); - obj_controller.temp[1060]=battle_location[current_battle]; - - if (battle_star!="none"){ - obj_controller.x=battle_star.x; - obj_controller.y=battle_star.y; - show=current_battle; - - if (battle_world[current_battle]=-50){ - strin[1]=string(battle_pobject[current_battle].capital_number); - strin[2]=string(battle_pobject[current_battle].frigate_number); - strin[3]=string(battle_pobject[current_battle].escort_number); - // pull health values here - strin[4]=string(battle_pobject[current_battle].capital_health); - strin[5]=string(battle_pobject[current_battle].frigate_health); - strin[6]=string(battle_pobject[current_battle].escort_health); - - // Here - strin[7]=string(battle_object[current_battle].capital_number); - strin[8]=string(battle_object[current_battle].frigate_number); - strin[9]=string(battle_object[current_battle].escort_number); - // pull health values here - strin[10]="100"; - strin[11]="100"; - strin[12]="100"; - } - - - - if (battle_world[current_battle]>=1){ - var _p_data = new PlanetData(battle_world[current_battle], battle_object[current_battle]); - - scr_count_forces(string(battle_location[current_battle]),battle_world[current_battle],true); - - strin[1]=info_mahreens; - strin[2]=info_vehicles; - - if (info_mahreens+info_vehicles=0){ - if (battles>current_battle) then alarm[4]=1; - if (battles=current_battle) then alarm[1]=1; - } - - strin[3]=""; - - var tempy=0; - tempy=battle_object[current_battle].p_owner[battle_world[current_battle]]; - - if ((tempy>=1) || (tempy=2) || (tempy=3)){ - strin[3] = FORTIFICATION_GRADES_DESCRIPTIONS[clamp(_p_data.fortification_level, 0, 6)]; - } - - tempy=0; - if (battle_opponent[current_battle]=7) then tempy=battle_object[current_battle].p_orks[battle_world[current_battle]]; - if (battle_opponent[current_battle]=8) then tempy=battle_object[current_battle].p_tau[battle_world[current_battle]]; - if (battle_opponent[current_battle]=9) then tempy=battle_object[current_battle].p_tyranids[battle_world[current_battle]]; - if (battle_opponent[current_battle]=10) then tempy=battle_object[current_battle].p_traitors[battle_world[current_battle]]; - if (battle_opponent[current_battle]=30){ - tempy=1; - strin[4]="Master Spyrer"; - } - - if (battle_opponent[current_battle]<=20){ - tempy = clamp(tempy, 0, 6); - strin[4] = AUTO_BATTLE_FORCES_GRADE[tempy]; - } - } - - if (obj_controller.zoomed=1){ - scr_zoom() - }; - } - instance_activate_object(obj_star); - -} - -instance_activate_object(obj_star); - - - - - - -if (battle[1]=0) or (current_battle>battles){// This is temporary for the sake of testing - if (battle[1]=0){obj_controller.x=first_x;obj_controller.y=first_y;} - alarm[1]=1; -} - diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 574c37791e..ecbb8ea937 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -71,6 +71,105 @@ function order_end_turn_battles(){ } } +function next_end_turn_battle_variables(){ + var battle_o=0; + current_battle+=1; + combating=0; + + instance_activate_object(obj_star); + + if (battles>0) and (current_battle<=battles){ + + var ii=0,good=0; + var battle_star = star_by_name(battle_location[current_battle]); + obj_controller.temp[1060]=battle_location[current_battle]; + + if (battle_star!="none"){ + obj_controller.x=battle_star.x; + obj_controller.y=battle_star.y; + show=current_battle; + + if (battle_world[current_battle]=-50){ + strin[1]=string(battle_pobject[current_battle].capital_number); + strin[2]=string(battle_pobject[current_battle].frigate_number); + strin[3]=string(battle_pobject[current_battle].escort_number); + // pull health values here + strin[4]=string(battle_pobject[current_battle].capital_health); + strin[5]=string(battle_pobject[current_battle].frigate_health); + strin[6]=string(battle_pobject[current_battle].escort_health); + + // Here + strin[7]=string(battle_object[current_battle].capital_number); + strin[8]=string(battle_object[current_battle].frigate_number); + strin[9]=string(battle_object[current_battle].escort_number); + // pull health values here + strin[10]="100"; + strin[11]="100"; + strin[12]="100"; + } + + + + if (battle_world[current_battle]>=1){ + var _p_data = new PlanetData(battle_world[current_battle], battle_object[current_battle]); + + scr_count_forces(string(battle_location[current_battle]),battle_world[current_battle],true); + + strin[1]=info_mahreens; + strin[2]=info_vehicles; + + if (info_mahreens+info_vehicles=0){ + if (battles>current_battle) then alarm[4]=1; + if (battles=current_battle) then alarm[1]=1; + } + + strin[3]=""; + + var tempy=0; + tempy=battle_object[current_battle].p_owner[battle_world[current_battle]]; + + if ((tempy>=1) || (tempy=2) || (tempy=3)){ + strin[3] = FORTIFICATION_GRADES_DESCRIPTIONS[clamp(_p_data.fortification_level, 0, 6)]; + } + + tempy=0; + if (battle_opponent[current_battle]=7) then tempy=battle_object[current_battle].p_orks[battle_world[current_battle]]; + if (battle_opponent[current_battle]=8) then tempy=battle_object[current_battle].p_tau[battle_world[current_battle]]; + if (battle_opponent[current_battle]=9) then tempy=battle_object[current_battle].p_tyranids[battle_world[current_battle]]; + if (battle_opponent[current_battle]=10) then tempy=battle_object[current_battle].p_traitors[battle_world[current_battle]]; + if (battle_opponent[current_battle]=30){ + tempy=1; + strin[4]="Master Spyrer"; + } + + if (battle_opponent[current_battle]<=20){ + tempy = clamp(tempy, 0, 6); + strin[4] = AUTO_BATTLE_FORCES_GRADE[tempy]; + } + } + + if (obj_controller.zoomed=1){ + scr_zoom() + }; + } + instance_activate_object(obj_star); + + } + + instance_activate_object(obj_star); + + + + + + + if (battle[1]=0) or (current_battle>battles){// This is temporary for the sake of testing + if (battle[1]=0){obj_controller.x=first_x;obj_controller.y=first_y;} + alarm[1]=1; + } + +} + function collect_next_end_turn_battle(){ if (battles<=0) || (current_battle>battles){ exit; @@ -144,8 +243,12 @@ function collect_next_end_turn_battle(){ strin[2]=info_vehicles; if (info_mahreens+info_vehicles=0){ - if (battles>current_battle) then alarm[4]=1; - if (battles=current_battle) then alarm[1]=1; + if (battles>current_battle){ + wait_and_execute(1, next_end_turn_battle_variables,[],self); + } + if (battles=current_battle){ + alarm[1]=1; + } } strin[3]=""; @@ -154,7 +257,7 @@ function collect_next_end_turn_battle(){ tempy=battle_object[current_battle].p_owner[battle_world[current_battle]]; if (tempy=1) or (tempy=2) or (tempy=3){ - var array_string = ["","Minimally","Lightly","Moderately","Highly","Extremely","Maximally"]; + var array_string = FORTIFICATION_GRADES_DESCRIPTIONS; var battle_fortification = battle_object[current_battle].p_fortified[battle_world[current_battle]]; strin[3] = array_string[clamp(battle_fortification, 1, 6)]; } From 02a8b36af2e925ee740d192b763b7db63b30458e Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 17 Nov 2025 02:45:06 +0000 Subject: [PATCH 142/155] kill obj_turn_end alarm 1 --- ChapterMaster.yyp | 1 + objects/obj_event/Step_0.gml | 4 +- objects/obj_ncombat/Alarm_7.gml | 6 +- objects/obj_popup/Destroy_0.gml | 3 +- objects/obj_popup/Keyboard_13.gml | 2 +- objects/obj_popup/Keyboard_32.gml | 4 +- objects/obj_popup/Step_0.gml | 8 +- objects/obj_turn_end/Create_0.gml | 2 + objects/obj_turn_end/obj_turn_end.yy | 1 - .../scr_end_turn_audiences_and_final.gml | 153 +++++++++--------- .../scr_end_turn_audiences_and_final.yy | 13 ++ .../scr_end_turn_combat_helpers.gml | 48 +++--- .../scr_inquisition_inspection.gml | 4 +- .../scr_popup_functions.gml | 2 +- .../scr_post_battle_events.gml | 2 +- 15 files changed, 133 insertions(+), 120 deletions(-) rename objects/obj_turn_end/Alarm_1.gml => scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.gml (58%) create mode 100644 scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 51940b14df..c84bec11c3 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -801,6 +801,7 @@ {"id":{"name":"scr_drop_fiddle","path":"scripts/scr_drop_fiddle/scr_drop_fiddle.yy",},}, {"id":{"name":"scr_drop_select_function","path":"scripts/scr_drop_select_function/scr_drop_select_function.yy",},}, {"id":{"name":"scr_en_weapon","path":"scripts/scr_en_weapon/scr_en_weapon.yy",},}, + {"id":{"name":"scr_end_turn_audiences_and_final","path":"scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.yy",},}, {"id":{"name":"scr_end_turn_combat_helpers","path":"scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.yy",},}, {"id":{"name":"scr_enemy_ai_a","path":"scripts/scr_enemy_ai_a/scr_enemy_ai_a.yy",},}, {"id":{"name":"scr_enemy_ai_b","path":"scripts/scr_enemy_ai_b/scr_enemy_ai_b.yy",},}, diff --git a/objects/obj_event/Step_0.gml b/objects/obj_event/Step_0.gml index 42a58107fc..8853ab6034 100644 --- a/objects/obj_event/Step_0.gml +++ b/objects/obj_event/Step_0.gml @@ -48,7 +48,9 @@ if (closing=true) and (fading=-1) and (fade_alpha<=0){ } with(obj_popup){ - if (number!=0) then obj_turn_end.alarm[1]=10; + if (number!=0){ + setup_audience_and_popup_timer(10); + } instance_destroy(); } obj_controller.cooldown=30; diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 37d257e722..a6ec9db399 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -393,7 +393,7 @@ try { obj_controller.current_eventing="chaos_meeting_end"; with(obj_temp_meeting){instance_destroy();}with(obj_popup){instance_destroy();} if (instance_exists(obj_turn_end)){ - obj_turn_end.combating=0;// obj_turn_end.alarm[1]=1; + obj_turn_end.combating=0;// setup_audience_and_popup_timer(1); } var pip;pip = instance_create(0,0,obj_popup); pip.title = "Enemies Vanquished"; @@ -409,7 +409,7 @@ try { with(obj_temp_meeting){instance_destroy();} with(obj_popup){instance_destroy();} if (instance_exists(obj_turn_end)){ - obj_turn_end.combating=0;// obj_turn_end.alarm[1]=1; + obj_turn_end.combating=0;// setup_audience_and_popup_timer(1); } var pip = instance_create(0,0,obj_popup); pip.title = "Survived"; @@ -447,7 +447,7 @@ try { instance_destroy(); } if (instance_exists(obj_turn_end)){ - obj_turn_end.combating=0;// obj_turn_end.alarm[1]=1; + obj_turn_end.combating=0;// setup_audience_and_popup_timer(1); } var pip = instance_create(0,0,obj_popup); pip.title = "Chaos Lord Killed"; diff --git a/objects/obj_popup/Destroy_0.gml b/objects/obj_popup/Destroy_0.gml index 3af0fb3804..0c35df4704 100644 --- a/objects/obj_popup/Destroy_0.gml +++ b/objects/obj_popup/Destroy_0.gml @@ -107,7 +107,8 @@ if (instance_exists(obj_controller)){ if (obj_controller.current_eventing="chaos_meeting_end") and (instance_exists(obj_turn_end)){ - obj_turn_end.alarm[1]=1;obj_controller.current_eventing=""; + setup_audience_and_popup_timer(1); + obj_controller.current_eventing=""; } } diff --git a/objects/obj_popup/Keyboard_13.gml b/objects/obj_popup/Keyboard_13.gml index 6b93008cc4..cc6131a758 100644 --- a/objects/obj_popup/Keyboard_13.gml +++ b/objects/obj_popup/Keyboard_13.gml @@ -17,7 +17,7 @@ if (array_length(options == 0) && type<5){ obj_controller.cooldown=10; if (number!=0) and (obj_controller.complex_event=false){ if (instance_exists(obj_turn_end)){ - obj_turn_end.alarm[1]=4; + setup_audience_and_popup_timer(4); } } instance_destroy(); diff --git a/objects/obj_popup/Keyboard_32.gml b/objects/obj_popup/Keyboard_32.gml index 058a40765d..4b261ff086 100644 --- a/objects/obj_popup/Keyboard_32.gml +++ b/objects/obj_popup/Keyboard_32.gml @@ -15,7 +15,9 @@ if (battle_special>0){ if (array_length(options) == 0) and (type<5){ obj_controller.cooldown=10; - if (number!=0) and (obj_controller.complex_event=false) then obj_turn_end.alarm[1]=4; + if (number!=0) and (obj_controller.complex_event=false){ + setup_audience_and_popup_timer(4); + } instance_destroy(); } diff --git a/objects/obj_popup/Step_0.gml b/objects/obj_popup/Step_0.gml index 3c7105ad7f..af4b6dc776 100644 --- a/objects/obj_popup/Step_0.gml +++ b/objects/obj_popup/Step_0.gml @@ -166,7 +166,7 @@ try { } if ((press == 2) && instance_exists(obj_turn_end)) { if (number != 0) { - obj_turn_end.alarm[1] = 4; + setup_audience_and_popup_timer(4); } with (obj_temp_meeting) { instance_destroy(); @@ -245,7 +245,7 @@ try { } obj_controller.cooldown = 10; if (number != 0 && instance_exists(obj_turn_end)) { - obj_turn_end.alarm[1] = 4; + setup_audience_and_popup_timer(4); } instance_destroy(); } @@ -547,7 +547,7 @@ try { obj_controller.cooldown = 10; if (obj_controller.complex_event == false) { if (number != 0 && instance_exists(obj_turn_end)) { - obj_turn_end.alarm[1] = 4; + setup_audience_and_popup_timer(4); } instance_destroy(); } @@ -604,7 +604,7 @@ try { if (obj_controller.complex_event == false) { if (number != 0 && instance_exists(obj_turn_end)) { - obj_turn_end.alarm[1] = 4; + setup_audience_and_popup_timer(4); } instance_destroy(); } diff --git a/objects/obj_turn_end/Create_0.gml b/objects/obj_turn_end/Create_0.gml index ba9c6be999..e083fc382f 100644 --- a/objects/obj_turn_end/Create_0.gml +++ b/objects/obj_turn_end/Create_0.gml @@ -61,6 +61,8 @@ battle_opponent = [];// faction ID battle_object = [];// faction object for the fleets battle_pobject = [];// player object for the fleets battle_special = []; + +battle = []; audiences = 0; diff --git a/objects/obj_turn_end/obj_turn_end.yy b/objects/obj_turn_end/obj_turn_end.yy index b82d4eb138..471e34017a 100644 --- a/objects/obj_turn_end/obj_turn_end.yy +++ b/objects/obj_turn_end/obj_turn_end.yy @@ -4,7 +4,6 @@ "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, diff --git a/objects/obj_turn_end/Alarm_1.gml b/scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.gml similarity index 58% rename from objects/obj_turn_end/Alarm_1.gml rename to scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.gml index d596f2f7ee..e53c320b18 100644 --- a/objects/obj_turn_end/Alarm_1.gml +++ b/scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.gml @@ -1,67 +1,67 @@ +function scr_end_turn_check_audiences_and_popups(){ + var _is_audience = false; + if (array_length(audience_stack) > 0){ + var current_audience = audience_stack[0]; + _is_audience = true; + } + + + if (_is_audience){ + with(obj_controller){ + if (zoomed=1){ + scr_zoom(); + } + } + + //show_debug_message(current_audience); + + if (obj_controller.menu != MENU.Diplomacy){ + scr_toggle_diplomacy(); + } + obj_controller.audience = current_audience.faction; + obj_controller.diplomacy = current_audience.faction; + obj_controller.audience_data = current_audience.audience_data; + + if (obj_controller.diplomacy=10) and (obj_controller.faction_gender[10]=2){ + scr_music("blood",60); + } + + if (string_count("intro",current_audience.topic)>0){ + obj_controller.known[obj_controller.diplomacy]=2; + obj_controller.faction_justmet=1; + if (obj_controller.diplomacy=6){ + + scr_dialogue("intro1"); + + } + if (obj_controller.diplomacy!=6){ + //show_debug_message("new_intro"); + scr_dialogue("intro"); + + } + }else { + scr_dialogue(current_audience.topic); + + } + array_delete(audience_stack, 0, 1); + exit; + } + + + if (!_is_audience){ + turn_end_popups(); + } -var _is_audience = false; -if (array_length(audience_stack) > 0){ - var current_audience = audience_stack[0]; - _is_audience = true; } - -if (_is_audience){ - with(obj_controller){ - if (zoomed=1){ - scr_zoom(); - } - } - - show_debug_message(current_audience); - - if (obj_controller.menu != MENU.Diplomacy){ - scr_toggle_diplomacy(); - } - obj_controller.audience=current_audience.faction; - obj_controller.diplomacy=current_audience.faction; - obj_controller.audience_data = current_audience.audience_data; - - if (obj_controller.diplomacy=10) and (obj_controller.faction_gender[10]=2){ - scr_music("blood",60); - } - - if (string_count("intro",current_audience.topic)>0){ - obj_controller.known[obj_controller.diplomacy]=2; - obj_controller.faction_justmet=1; - if (obj_controller.diplomacy=6){ - - scr_dialogue("intro1"); - - } - if (obj_controller.diplomacy!=6){ - //show_debug_message("new_intro"); - scr_dialogue("intro"); - - } - }else { - scr_dialogue(current_audience.topic); - - } - array_delete(audience_stack, 0, 1); - exit; +function setup_audience_and_popup_timer(timer = 1){ + wait_and_execute(timer,scr_end_turn_check_audiences_and_popups,[], obj_turn_end); } - - - - - - - - -// if (current_audience<=audiences) then alarm[1]=5; - - -if (!_is_audience){ - current_popup+=1; - - +function turn_end_popups(){ + current_popup+=1; + + if (current_popup>=0 && current_popup=array_length(popup); + + if (popups_end){ + final_end_turn_sequence(); + } // obj_controller.x=first_x; // obj_controller.y=first_y; // instance_destroy(); } -if (popups_end){ - - - /*if (popups=0){ - obj_controller.x=first_x; - obj_controller.y=first_y; - instance_destroy(); - }*/ + /*if (popups=0){ + obj_controller.x=first_x; + obj_controller.y=first_y; + instance_destroy(); + }*/ - - obj_controller.x=first_x; - obj_controller.y=first_y; +function final_end_turn_sequence(){ + obj_controller.x = first_x; + obj_controller.y = first_y; alarm[2]=10; obj_controller.menu=0; combating=0; - + increment_in_game_time(); +} + +function increment_in_game_time(){ with(obj_controller){ year_fraction+=84; if (year_fraction>999){ @@ -136,12 +140,9 @@ if (popups_end){ year_fraction=0; } if (year>=1000){ - millenium+=1;year-=1000; + millenium+=1; + year-=1000; } // menu=0; } - } - -/* */ -/* */ diff --git a/scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.yy b/scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.yy new file mode 100644 index 0000000000..b71e0761eb --- /dev/null +++ b/scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_end_turn_audiences_and_final", + "isCompatibility":false, + "isDnD":false, + "name":"scr_end_turn_audiences_and_final", + "parent":{ + "name":"Turn", + "path":"folders/Scripts/Turn.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index ecbb8ea937..3377a555b9 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -1,7 +1,19 @@ -function add_new_end_turn_battle(){ + + +enum EndTurnBattleTypes { + Ground, + Fleet, +} +function EndTurnBattle constructor(battle_type, system){ } + +function check_for_finished_end_turn_battles(){ + if (!array_length(battle)) or (current_battle>battles){ + setup_audience_and_popup_timer(); + } +} function end_turn_battle_next_sequence(next_battle = true, wait_time = 1){ if (next_battle){ obj_turn_end.current_battle++; @@ -13,20 +25,11 @@ function end_turn_battle_next_sequence(next_battle = true, wait_time = 1){ order_end_turn_battles(); - collect_next_end_turn_fleet_battle(); + collect_next_end_turn_battle(); instance_activate_object(obj_star); - - - - if (battle[1]=0) or (current_battle>battles){// This is temporary for the sake of testing - if (battle[1]=0){ - obj_controller.x=first_x; - obj_controller.y=first_y; - } - alarm[1]=1; - } + check_for_finished_end_turn_battles(); } wait_and_execute(wait_time,_main_func,[],obj_turn_end) @@ -119,8 +122,7 @@ function next_end_turn_battle_variables(){ strin[2]=info_vehicles; if (info_mahreens+info_vehicles=0){ - if (battles>current_battle) then alarm[4]=1; - if (battles=current_battle) then alarm[1]=1; + end_turn_battle_next_sequence(); } strin[3]=""; @@ -158,15 +160,7 @@ function next_end_turn_battle_variables(){ instance_activate_object(obj_star); - - - - - - if (battle[1]=0) or (current_battle>battles){// This is temporary for the sake of testing - if (battle[1]=0){obj_controller.x=first_x;obj_controller.y=first_y;} - alarm[1]=1; - } + end_turn_battle_next_sequence(); } @@ -243,12 +237,8 @@ function collect_next_end_turn_battle(){ strin[2]=info_vehicles; if (info_mahreens+info_vehicles=0){ - if (battles>current_battle){ - wait_and_execute(1, next_end_turn_battle_variables,[],self); - } - if (battles=current_battle){ - alarm[1]=1; - } + end_turn_battle_next_sequence(); + exit; } strin[3]=""; diff --git a/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml b/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml index 4ac1fc54f7..fced57bc5d 100644 --- a/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml +++ b/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml @@ -362,7 +362,9 @@ function inquisitor_inspection_structure() constructor { str1: "Over your dead body", method: function() { obj_controller.cooldown = 10; - if (number != 0 && instance_exists(obj_turn_end)) { obj_turn_end.alarm[1] = 4; } + if (number != 0 && instance_exists(obj_turn_end)) { + setup_audience_and_popup_timer(4); + } instance_destroy(); exit; } diff --git a/scripts/scr_popup_functions/scr_popup_functions.gml b/scripts/scr_popup_functions/scr_popup_functions.gml index b705acbe1a..c44f1c9bca 100644 --- a/scripts/scr_popup_functions/scr_popup_functions.gml +++ b/scripts/scr_popup_functions/scr_popup_functions.gml @@ -58,7 +58,7 @@ function popup_default_close(){ obj_controller.cooldown=10; if (instance_exists(obj_turn_end) && obj_controller.complex_event==false){ if (number!=0){ - obj_turn_end.alarm[1]=4; + setup_audience_and_popup_timer(4); } } instance_destroy(); diff --git a/scripts/scr_post_battle_events/scr_post_battle_events.gml b/scripts/scr_post_battle_events/scr_post_battle_events.gml index 0efbb63a11..557baf06f4 100644 --- a/scripts/scr_post_battle_events/scr_post_battle_events.gml +++ b/scripts/scr_post_battle_events/scr_post_battle_events.gml @@ -5,7 +5,7 @@ function necron_tomb_raid_post_battle_sequence(){ if (defeat == 1) { obj_controller.combat=0; obj_controller.cooldown=10; - obj_turn_end.alarm[1]=4; + setup_audience_and_popup_timer(4); } else if (defeat == 0){ From 6ea15f6d63831b5de4657f5fd3e452c47c12111d Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 17 Nov 2025 04:42:11 +0000 Subject: [PATCH 143/155] Implement new end turn battle constructor --- objects/obj_turn_end/Create_0.gml | 2 +- .../scr_end_turn_combat_helpers.gml | 15 ++++++++++++++- .../scr_mechanicus_missions.gml | 14 ++++++-------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/objects/obj_turn_end/Create_0.gml b/objects/obj_turn_end/Create_0.gml index e083fc382f..bc52887942 100644 --- a/objects/obj_turn_end/Create_0.gml +++ b/objects/obj_turn_end/Create_0.gml @@ -73,7 +73,7 @@ alert_alpha[1]=0.2; alert_char[1]=1; i=-1 -handle_discovered_governor_assasinations() +handle_discovered_governor_assasinations(); if (audiences>0){// This is a one-off change all messages to declare war diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 3377a555b9..183aa42966 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -5,9 +5,22 @@ enum EndTurnBattleTypes { Fleet, } function EndTurnBattle constructor(battle_type, system){ - + type = battle_type; + system = system; + planet = 1; + special = ""; + opponent = 7; } +function add_battle_to_end_turn_stack(new_battle){ + with (obj_turn_end){ + if (new_battle.type == Fleet){ + array_insert(battles, new_battle, 0); + } else { + array_push(battles,new_battle); + } + } +} function check_for_finished_end_turn_battles(){ if (!array_length(battle)) or (current_battle>battles){ diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 634fed476c..0f549de341 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -39,14 +39,12 @@ function mechanicus_missions_end_turn(planet){ if (roll1>=98) then battli=2;// very oops, much necron, wow if (battli>0) and (p_player[planet]>0){// Quene the battle - obj_turn_end.battles+=1; - obj_turn_end.battle[obj_turn_end.battles]=1; - obj_turn_end.battle_world[obj_turn_end.battles]=planet; - obj_turn_end.battle_opponent[obj_turn_end.battles]=13; - obj_turn_end.battle_location[obj_turn_end.battles]=name; - obj_turn_end.battle_object[obj_turn_end.battles]=id; - if (battli=1) then obj_turn_end.battle_special[obj_turn_end.battles]="study2a"; - if (battli=2) then obj_turn_end.battle_special[obj_turn_end.battles]="study2b"; + var _battle = new EndTurnBattle(EndTurnBattleTypes.Ground, self.id); + _battle.special = battli==1 ? "study2a" : "study2b"; + _battle.opponent = eFACTION.Necrons; + _battle.planet = planet; + + add_battle_to_end_turn_stack(_battle); if (obj_turn_end.battle_opponent[obj_turn_end.battles]==11){ if (planet_feature_bool(p_feature[planet],P_features.ChaosWarband)==1){ From db389825033db63d562086febfca2455039ce15d Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 18 Nov 2025 01:10:44 +0000 Subject: [PATCH 144/155] finish implimentation of EndTurnBattle constructor --- .../scr_end_turn_combat_helpers.gml | 81 +++++++++++++-- scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml | 98 +++---------------- .../scr_fleet_functions.gml | 36 ++++++- .../scr_mechanicus_missions.gml | 14 +-- .../scr_mission_functions.gml | 20 ++++ 5 files changed, 147 insertions(+), 102 deletions(-) diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 183aa42966..76bc08944c 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -10,18 +10,22 @@ function EndTurnBattle constructor(battle_type, system){ planet = 1; special = ""; opponent = 7; -} - -function add_battle_to_end_turn_stack(new_battle){ - with (obj_turn_end){ - if (new_battle.type == Fleet){ - array_insert(battles, new_battle, 0); - } else { - array_push(battles,new_battle); - } + player_object = -1; + + static add_to_stack = function(){ + var _new_battle = self; + location = system.name; + with (obj_turn_end){ + if (_new_battle.type == Fleet){ + array_insert(battles, _new_battle, 0); + } else { + array_push(battles,_new_battle); + } + } } } + function check_for_finished_end_turn_battles(){ if (!array_length(battle)) or (current_battle>battles){ setup_audience_and_popup_timer(); @@ -486,3 +490,62 @@ function draw_player_ground_combat_options(){ } } + +function add_system_end_turn_fleet_battles(){ + + //IF no valid enemy or player fleets just skip this step + var _nearest_en_fleet = instance_nearest(x,y,obj_en_fleet); + if (_nearest_en_fleet.x != x && _nearest_en_fleet.y != y) { + exit; + } + + var _nearest_p_fleet = instance_nearest(x,y,obj_p_fleet); + + if (_nearest_p_fleet.x != x && _nearest_p_fleet.y != y || _nearest_p_fleet.action == "move") { + exit; + } + + var _orbiting_fleets = scr_orbiting_fleets_all(); + + if (!array_length(_orbiting_fleets)){ + exit; + } + var _largest_fleet = -1; + var _largest_score = 0; + + for (var i=0;i _largest_score){ + _largest_fleet = _cur_fleet.id; + _largest_score = _cur_largest; + } + } + + if (_largest_score <=0 || !instance_exists(_largest_fleet)){ + exit; + } + + var _fleet_battle = new EndTurnBattle(EndTurnBattleTypes.Fleet, self); + + _fleet_battle.opponent = _largest_fleet.owner; + + if (fleet_has_cargo("warband", _largest_fleet)){ + _fleet_battle.special = "BLOOD"; + } + + if (fleet_has_cargo("csm", _largest_fleet)){ + _fleet_battle.special = "CSM"; + } + + _fleet_battle.add_to_stack(); + +} diff --git a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml index b1c56c0aea..141e11589b 100644 --- a/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml +++ b/scripts/scr_enemy_ai_e/scr_enemy_ai_e.gml @@ -385,58 +385,7 @@ function scr_enemy_ai_e() { } // End AI battle if (battle > 0) { - if (present_fleet[1] > 0) and((present_fleet[6] + present_fleet[7] + present_fleet[8] + present_fleet[9] + present_fleet[10] + present_fleet[13] > 0) or((present_fleet[2] > 0) and(obj_controller.faction_status[2] = "War"))) { - var i, onceh; - i = 1; - onceh = 0; - - repeat(9) { - i += 1; - var special_stop = false;; - if (i = 10) or(i = 11) { - special_stop = has_problem_star("meeting")||has_problem_star("meeting_trap"); - } - - if (obj_controller.faction_status[i] = "War") and(onceh = 0) and(!special_stop) { // Quene battle - obj_turn_end.battles += 1; - obj_turn_end.battle[obj_turn_end.battles] = 1; - obj_turn_end.battle_world[obj_turn_end.battles] = -50; - obj_turn_end.battle_opponent[obj_turn_end.battles] = i; // Who triggered it first - obj_turn_end.battle_location[obj_turn_end.battles] = name; - // obj_turn_end.battle_object[obj_turn_end.battles]=instance_nearest(x,y,obj_en_fleet); - obj_turn_end.battle_pobject[obj_turn_end.battles] = instance_nearest(x, y, obj_p_fleet); - - if (i = 10) { - obj_controller.temp[1049] = string(name); - with(obj_temp2) { - instance_destroy(); - } - with(obj_temp3) { - instance_destroy(); - } - with(obj_en_fleet) { - if (action = "") and(orbiting = obj_controller.temp[1049]) and(owner = 10) { - if (string_count("warband", trade_goods) > 0) then instance_create(x, y, obj_temp2); - if (string_lower(trade_goods) = "csm") then instance_create(x, y, obj_temp3); - } - } - if (instance_exists(obj_temp2)) { - obj_turn_end.battle_special[obj_turn_end.battles] = "BLOOD"; - with(obj_temp2) { - instance_destroy(); - } - } - if (instance_exists(obj_temp3)) { - obj_turn_end.battle_special[obj_turn_end.battles] = "CSM"; - with(obj_temp2) { - instance_destroy(); - } - } - } - onceh = 1; - } - } - } + add_system_end_turn_fleet_battles(); } instance_activate_object(obj_p_fleet); @@ -483,37 +432,17 @@ function scr_enemy_ai_e() { tixt += " seems to have vanished, presumably gone into hiding."; scr_popup("Spyrer Rampage", tixt, "spyrer", ""); } else if ((p_player[run] <= 20)){ - obj_turn_end.battles += 1; - obj_turn_end.battle[obj_turn_end.battles] = 1; - obj_turn_end.battle_world[obj_turn_end.battles] = run; - obj_turn_end.battle_opponent[obj_turn_end.battles] = 30; - obj_turn_end.battle_location[obj_turn_end.battles] = name; - obj_turn_end.battle_object[obj_turn_end.battles] = id; - obj_turn_end.battle_special[obj_turn_end.battles] = "spyrer"; + var _battle = new EndTurnBattle(EndTurnBattleTypes.Ground, self); + _battle.planet = run; + _battle.battle_special = "spyrer"; + _battle.battle_opponent = 30; + + _battle.add_to_stack(); } } if (p_player[run] > 0) and (has_problem_planet(run, "fallen")) { - var chan; - chan = choose(1, 2, 3, 4); - if (chan <= 2) { - obj_turn_end.battles += 1; - obj_turn_end.battle[obj_turn_end.battles] = 1; - obj_turn_end.battle_world[obj_turn_end.battles] = run; - obj_turn_end.battle_opponent[obj_turn_end.battles] = 10; - obj_turn_end.battle_location[obj_turn_end.battles] = name; - obj_turn_end.battle_object[obj_turn_end.battles] = id; - if (chan = 1) then obj_turn_end.battle_special[obj_turn_end.battles] = "fallen1"; - if (chan = 2) then obj_turn_end.battle_special[obj_turn_end.battles] = "fallen2"; - - }else if (chan >= 3) { - if (remove_planet_problem(run, "fallen")){ - tixt = "Your marines have scoured " + planet_numeral_name(run); - tixt += " in search of the Fallen. Despite their best efforts, and meticulous searching, none have been found. It appears as though the information was faulty or out of date."; - scr_popup("Hunt the Fallen", tixt, "fallen", ""); - scr_event_log("", $"Mission Successful: No Fallen located upon {planet_numeral_name(run)}"); - } - } + setup_fallen_capture_battle(); } } if (p_player[run] > 0 && has_problem_planet(run,"necron")){ @@ -583,13 +512,10 @@ function scr_enemy_ai_e() { // other battle crap here if (battle_opponent > 0) { - // obj_controller.x=self.x;obj_controller.y=self.y; - obj_turn_end.battles += 1; - obj_turn_end.battle[obj_turn_end.battles] = 1; - obj_turn_end.battle_world[obj_turn_end.battles] = run; - obj_turn_end.battle_opponent[obj_turn_end.battles] = battle_opponent; - obj_turn_end.battle_location[obj_turn_end.battles] = name; - obj_turn_end.battle_object[obj_turn_end.battles] = id; + var _battle = new EndTurnBattle(EndTurnBattleTypes.Ground, self); + _battle.planet = run; + _battle.battle_opponent = battle_opponent; + _battle.add_to_stack(); } } } diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index a29c7a8eab..cdebafe93f 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -476,6 +476,19 @@ function scr_orbiting_fleet(faction, system="none"){ return _found_fleet; } +function scr_orbiting_fleets_all(system="none"){ + var xx = system == "none" ? x : system.x; + var yy = system == "none" ? y : system.y; + var _found_fleets = []; + with (obj_en_fleet){ + if (x==xx && y==yy){ + array_push(_found_fleets, id); + } + } + + return _found_fleets; +} + /// @function object_distance(obj_1, obj_2) /// @description Returns the distance in pixels between two instances or objects based on their `x` and `y` coordinates. @@ -556,13 +569,34 @@ function get_orbiting_fleets(faction,system="none"){ return _fleets; } +function standard_fleet_strength_calc(fleet = "none"){ + if (fleet == "none"){ + return capital_number + (frigate_number/2) + (escort_number/4); + } else { + with (fleet){ + return standard_fleet_strength_calc(); + } + } +} + +function fleet_faction_status(fleet = "none"){ + if (fleet == "none"){ + return obj_controller.faction_status[owner]; + } else { + with (fleet){ + return fleet_faction_status(); + } + } +} +} + function sector_imperial_fleet_strength(){ obj_controller.imp_ships = 0; var _imperial_planet_count = 0; var _mech_worlds = 0; with(obj_en_fleet){ if (owner==eFACTION.Imperium){ - var _imperial_fleet_defence_score = capital_number + (frigate_number/2) + (escort_number/4); + var _imperial_fleet_defence_score = standard_fleet_strength_calc(); obj_controller.imp_ships += _imperial_fleet_defence_score; } } diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 0f549de341..caf0183bf0 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -44,18 +44,20 @@ function mechanicus_missions_end_turn(planet){ _battle.opponent = eFACTION.Necrons; _battle.planet = planet; - add_battle_to_end_turn_stack(_battle); - - if (obj_turn_end.battle_opponent[obj_turn_end.battles]==11){ + + //clearly reserved for an unfinished version of the mission where the player has to instead fight CSSM + if (_battle.opponent == 11){ if (planet_feature_bool(p_feature[planet],P_features.ChaosWarband)==1){ - obj_turn_end.battle_special[obj_turn_end.battles]="ChaosWarband"; + _battle.special="ChaosWarband"; } } + + _battle.add_to_stack(); } if (battli>0) and (p_player[planet]<=0){// XDDDDD scr_popup("Mechanicus Mission Failed","The Mechanicus Research team on planet "+string(name)+" "+scr_roman(planet)+" have been killed by Necrons in the absence of your astartes. The Mechanicus are absolutely livid, doubly so because of the promised security they did not recieve.","",""); - obj_controller.turns_ignored[3]+=choose(8,10,12,14,16,18,20,22,24); - obj_controller.disposition[3]-=25; + obj_controller.turns_ignored[eFACTION.Mechanicus]+=choose(8,10,12,14,16,18,20,22,24); + alter_disposition(eFACTION.Mechanicus,-25); remove_planet_problem(planet,"mech_tomb2"); } } diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 4a0ed5b2ca..4f0f6e95a6 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -500,6 +500,26 @@ function complete_beast_hunt_mission(targ_planet, problem_index){ } } +///@mixin obj_star +function setup_fallen_capture_battle(planet){ + var chan = choose(1, 2, 3, 4); + if (chan <= 2) { + var _battle = new EndTurnBattle(EndTurnBattleTypes.Ground, self); + _battle.planet = planet; + _battle.battle_special = chan == 1 ? "fallen1" : "fallen2"; + _battle.battle_opponent = 10; + _battle.add_to_stack(); + + + }else if (chan >= 3) { + if (remove_planet_problem(planet, "fallen")){ + tixt = "Your marines have scoured " + planet_numeral_name(planet); + tixt += " in search of the Fallen. Despite their best efforts, and meticulous searching, none have been found. It appears as though the information was faulty or out of date."; + scr_popup("Hunt the Fallen", tixt, "fallen", ""); + scr_event_log("", $"Mission Successful: No Fallen located upon {planet_numeral_name(planet)}"); + } + } +} //TODO allow most of these functions to be condensed and allow arrays of problems or planets and maybe increase filtering options //filtering options could be done via universal methods that all the filters to be passed to many other game systems function has_any_problem_planet(planet, star="none"){ From 123f87afe7b04d4c9f6b84ca325cea86d4baffd3 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 18 Nov 2025 01:16:03 +0000 Subject: [PATCH 145/155] deprecate and remove order_end_turn_battles --- objects/obj_controller/Alarm_5.gml | 1 - .../scr_end_turn_combat_helpers.gml | 40 +------------------ 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index e62e418442..8c7000b176 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -456,7 +456,6 @@ try{ } // Right here need to sort the battles within the obj_turn_end with(obj_turn_end){ - order_end_turn_battles(); end_turn_battle_next_sequence(false, 20); } diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 76bc08944c..7669282fd5 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -40,8 +40,6 @@ function end_turn_battle_next_sequence(next_battle = true, wait_time = 1){ instance_activate_object(obj_star); combating=0; - - order_end_turn_battles(); collect_next_end_turn_battle(); instance_activate_object(obj_star); @@ -53,43 +51,7 @@ function end_turn_battle_next_sequence(next_battle = true, wait_time = 1){ /* */ } -// Space battles first -// Ground battles after -function order_end_turn_battles(){ - var i; - i=50; - repeat(50){ - i-=1; - - if (battles<=i) and (i>=2){ - if (battle[i]!=0) and (battle[i-1]!=0) and (battle_world[i]=-50) and (battle_world[i-1]>0){ - var tem1=battle[i-1]; - var tem2=battle_location[i-1]; - var tem3=battle_world[i-1]; - var tem4=battle_opponent[i-1]; - var tem5=battle_object[i-1]; - var tem6=battle_pobject[i-1]; - var tem7=battle_special[i-1]; - - battle[i-1]=battle[i]; - battle_location[i-1]=battle_location[i]; - battle_world[i-1]=battle_world[i]; - battle_opponent[i-1]=battle_opponent[i]; - // battle_object[i-1]=battle_object[i]; - battle_pobject[i-1]=battle_pobject[i]; - battle_special[i-1]=battle_special[i]; - - battle[i]=tem1; - battle_location[i]=tem2; - battle_world[i]=tem3; - battle_opponent[i]=tem4; - battle_object[i]=tem5; - battle_pobject[i]=tem6; - battle_special[i]=tem7; - } - } - } -} + function next_end_turn_battle_variables(){ var battle_o=0; From 44cca9af6e18e310c097c48a1787d743ba9e7484 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 18 Nov 2025 02:20:20 +0000 Subject: [PATCH 146/155] compile issues --- scripts/macros/macros.gml | 6 +++--- .../scr_end_turn_combat_helpers.gml | 2 +- scripts/scr_fleet_functions/scr_fleet_functions.gml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index 3a553680d0..18a557546e 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -25,11 +25,11 @@ #macro ALLIANCE_GRADES ["Hated", "Hostile","Suspicious","Uneasy","Neutral","Allies","Close Allies","Battle Brothers"] -#macro AUTO_BATTLE_FORCES_GRADE = ["None", "Minimal Forces", "Sparse Forces", "Moderate Forces", "Numerous Forces", "Very Numerous", "Overwhelming"] +#macro AUTO_BATTLE_FORCES_GRADE ["None", "Minimal Forces", "Sparse Forces", "Moderate Forces", "Numerous Forces", "Very Numerous", "Overwhelming"] -#macro FORTIFICATION_GRADES = ["None", "Sparse","Light","Moderate","Heavy","Major","Extreme", "Maximum"] +#macro FORTIFICATION_GRADES ["None", "Sparse","Light","Moderate","Heavy","Major","Extreme", "Maximum"] -#macro FORTIFICATION_GRADES_DESCRIPTIONS = ["None", "Minimally","Lightly","Moderately","Highly","Extremely","Maximally", "Maximum"] +#macro FORTIFICATION_GRADES_DESCRIPTIONS ["None", "Minimally","Lightly","Moderately","Highly","Extremely","Maximally", "Maximum"] enum eFACTION { diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 7669282fd5..1e35a32152 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -4,7 +4,7 @@ enum EndTurnBattleTypes { Ground, Fleet, } -function EndTurnBattle constructor(battle_type, system){ +function EndTurnBattle (battle_type, system)constructor{ type = battle_type; system = system; planet = 1; diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index cdebafe93f..693e83299d 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -588,7 +588,7 @@ function fleet_faction_status(fleet = "none"){ } } } -} + function sector_imperial_fleet_strength(){ obj_controller.imp_ships = 0; From 87570f3d9e8f6ddb3521aaedf65f63a99c30285b Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 19 Nov 2025 08:27:16 +0000 Subject: [PATCH 147/155] fucking loads of reworking the end turn combat setup stuff --- objects/obj_turn_end/Draw_0.gml | 103 ------- objects/obj_turn_end/Draw_64.gml | 45 +-- .../scr_end_turn_combat_helpers.gml | 267 ++++++++++-------- .../scr_player_fleet_functions.gml | 6 +- 4 files changed, 161 insertions(+), 260 deletions(-) diff --git a/objects/obj_turn_end/Draw_0.gml b/objects/obj_turn_end/Draw_0.gml index ec434e32fb..5844c653df 100644 --- a/objects/obj_turn_end/Draw_0.gml +++ b/objects/obj_turn_end/Draw_0.gml @@ -17,106 +17,3 @@ if (show=0) and (obj_controller.zoomed=1) and (current_popup=0) then draw_sprite if (show>0 && current_battle<=battles){ } - - - - - - - -/* - -if (show>0) and (current_battle<=battles){ - var xxx,yyy,i; - xxx=view_xview[0]; - yyy=view_yview[0]; - i=current_battle; - - if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+90,yyy+101); - if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+90,yyy+101); - - draw_set_font(fnt_info);draw_set_halign(fa_left);draw_set_color(CM_GREEN_COLOR); - draw_text(xxx+103,yyy+115,string(i)+"/"+string(battles)); - - draw_set_halign(fa_center); - draw_set_font(fnt_fancy); - - if (battle_world[i]>0) then draw_text_transformed(xxx+313,yyy+111,"Forces Attacked!",1.5,1.5,0); - if (battle_world[i]=-50) then draw_text_transformed(xxx+313,yyy+111,"Fleet Attacked!",1.5,1.5,0); - - if (battle_world[i]>0) then draw_text_transformed(xxx+313,yyy+144,"Planet "+string(battle_location[i])+" "+string(battle_world[i]),1,1,0); - if (battle_world[i]=-50) then draw_text_transformed(xxx+313,yyy+144,string(battle_location[i])+" System",1,1,0); - - draw_sprite(spr_force_icon,1,xxx+340,yyy+191); - if (battle_world[i]>0) then draw_sprite(spr_force_icon,battle_opponent[i],xxx+340,yyy+285); - draw_set_font(fnt_40k_14);draw_set_halign(fa_left); - - - - - if (battle_world[i]=-50){ - if (strin[1]!="0"){ - if (string(strin[1])="1") then draw_text(xxx+367,yyy+210,string(strin[1])+" Battleship ("+string(strin[4])+"% HP)"); - if (string(strin[1])!="1") then draw_text(xxx+367,yyy+210,string(strin[1])+" Battleships ("+string(strin[4])+"% HP)");} - - if (strin[2]!="0"){ - if (string(strin[2])="1") then draw_text(xxx+367,yyy+222,string(strin[2])+" Cruiser ("+string(strin[5])+"% HP)"); - if (string(strin[2])!="1") then draw_text(xxx+367,yyy+222,string(strin[2])+" Cruisers ("+string(strin[5])+"% HP)");} - - if (strin[3]!="0"){ - if (string(strin[3])="1") then draw_text(xxx+367,yyy+234,string(strin[3])+" Escort ("+string(strin[6])+"% HP)"); - if (string(strin[3])!="1") then draw_text(xxx+367,yyy+234,string(strin[3])+" Escorts ("+string(strin[6])+"% HP)");} - - - if (strin[7]!="0"){ - if (string(strin[7])="1") draw_text(xxx+367,yyy+302,string(strin[7])+" Battleship ("+string(strin[10])+"% HP)"); - if (string(strin[7])!="1") draw_text(xxx+367,yyy+302,string(strin[7])+" Battleships ("+string(strin[10])+"% HP)");} - - if (strin[8]!="0"){ - if (string(strin[8])="1") draw_text(xxx+367,yyy+314,string(strin[8])+" Cruiser ("+string(strin[11])+"% HP)"); - if (string(strin[8])!="1") draw_text(xxx+367,yyy+314,string(strin[8])+" Cruisers ("+string(strin[11])+"% HP)");} - - if (strin[9]!="0"){ - if (string(strin[9])="1") draw_text(xxx+367,yyy+326,string(strin[9])+" Escort ("+string(strin[12])+"% HP)"); - if (string(strin[9])!="1") draw_text(xxx+367,yyy+326,string(strin[9])+" Escorts ("+string(strin[12])+"% HP)");} - - draw_rectangle(xxx+188,yyy+350,xxx+297,yyy+372,1);draw_rectangle(xxx+328,yyy+350,xxx+437,yyy+372,1); - draw_set_alpha(0.5); - draw_rectangle(xxx+189,yyy+351,xxx+296,yyy+371,1);draw_rectangle(xxx+329,yyy+351,xxx+436,yyy+371,1); - draw_set_alpha(1); - - draw_set_halign(fa_center); - draw_text(xxx+241,yyy+353,"Fight");draw_text(xxx+383,yyy+353,"Retreat"); - draw_set_halign(fa_left); - } - - - if (battle_world[i]>=1){ - if (battle_opponent[i]<=20){ - draw_text(xxx+367,yyy+210,string(strin[1])+" Marines"); - draw_text(xxx+367,yyy+222,string(strin[2])+" Vehicles"); - if (strin[3]!="") then draw_text(xxx+367,yyy+234,string(strin[3])+" Fortified");// Not / Barely / Lightly / Moderately / Highly / Maximally - } - - draw_set_halign(fa_center); - draw_text(xxx+440,yyy+302,string(strin[4])); - - draw_rectangle(xxx+188,yyy+350,xxx+297,yyy+372,1);draw_rectangle(xxx+328,yyy+350,xxx+437,yyy+372,1); - draw_set_alpha(0.5); - draw_rectangle(xxx+189,yyy+351,xxx+296,yyy+371,1);draw_rectangle(xxx+329,yyy+351,xxx+436,yyy+371,1); - draw_set_alpha(1); - - draw_text(xxx+241,yyy+353,"Offensive");draw_text(xxx+383,yyy+353,"Defensive"); - draw_set_halign(fa_left); - } - - - - -}*/ - - -/* */ - -/* */ -/* */ diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 96ca8c071f..7b40dec3af 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -34,48 +34,9 @@ if (alerts>0) and (popups_end=1){ } draw_set_alpha(1); -if (show>0 && current_battle<=battles && current_battle>-1){ - main_slate.inside_method = function(){ - if (show>0 && current_battle<=battles && current_battle>-1){ - var xxx=main_slate.XX; - var yyy=main_slate.YY; - var i=current_battle; - - // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); - // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); - var _img = battle_world[i]==-50; - - scr_image("attacked",_img,xxx+12,yyy+54,254,174); - - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_text(xxx+8,yyy+13,$"{i}/{battles}"); - - draw_set_halign(fa_center); - draw_set_font(fnt_40k_30b); - - if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({battle_location[i]} {scr_roman(battle_world[i])})",0.7,0.7,0); - if (battle_world[i]==-50){ - draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({battle_location[i]} System)",0.7,0.7,0); - } - - scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); - // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); - - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - if (battle_world[current_battle]<0){ - draw_player_fleet_combat_options(); - } else if (battle_world[i]>=1){ - draw_player_ground_combat_options(); - } - } - draw_set_alpha(1); - } - if (!instance_exists(obj_fleet) && !instance_exists(obj_ncombat)){ - main_slate.draw_with_dimensions(535, 200, 530, 400); - } +if (show>0 && current_battle-1){ + var _cur_battle = battles[current_battle]; + _cur_battle.draw(); } pop_draw_return_values(); diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 1e35a32152..c281509d1b 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -6,23 +6,129 @@ enum EndTurnBattleTypes { } function EndTurnBattle (battle_type, system)constructor{ type = battle_type; - system = system; + self.system = system; planet = 1; special = ""; opponent = 7; player_object = -1; + slate = new DataSlate(); + slate.inside_method = function(){ + var xxx=slate.XX; + var yyy=slate.YY; + var i=current_battle; + + // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); + var _img = type; + + scr_image("attacked",_img,xxx+12,yyy+54,254,174); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_set_color(c_gray); + draw_text(xxx+8,yyy+13,$"{current_battle}/{battles}"); + + draw_set_halign(fa_center); + draw_set_font(fnt_40k_30b); + + if (type == EndTurnBattleTypes.Ground){ + draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({pdata.name()})",0.7,0.7,0); + } else { + draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({location} System)",0.7,0.7,0); + } + + scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); + // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + if (type == EndTurnBattleTypes.Fleet){ + draw_player_fleet_combat_options(); + } else if (type == EndTurnBattleTypes.Ground){ + draw_player_ground_combat_options(); + } + } static add_to_stack = function(){ var _new_battle = self; location = system.name; + if (type == EndTurnBattleTypes.Ground){ + pdata = new PlanetData(planet,system); + } with (obj_turn_end){ if (_new_battle.type == Fleet){ - array_insert(battles, _new_battle, 0); + _new_battle.collect_fleet_battle_variables(); + //final check that there definatly are infact enemy ships to fight + if (array_length(_new_battle.enemy_fleets)){ + array_insert(battles, _new_battle, 0); + } } else { array_push(battles,_new_battle); } } } + + static new_ship_class_tracker = function(){ + return { + capital : 0, + frigate : 0, + escort : 0, + }; + } + static collect_fleet_battle_variables = function(){ + var _fleets = scr_orbiting_fleets_all(system); + enemy_fleets = []; + allied_fleets = []; + + for (var i=0;i=1){ var _p_data = new PlanetData(battle_world[current_battle], battle_object[current_battle]); @@ -158,56 +243,7 @@ function collect_next_end_turn_battle(){ obj_controller.y=battle_star.y; show=current_battle; - - if (battle_world[current_battle] == -50){ - strin[1]=string(round(battle_pobject[current_battle].capital_number)); - strin[2]=string(round(battle_pobject[current_battle].frigate_number)); - strin[3]=string(round(battle_pobject[current_battle].escort_number)); - // pull health values here - strin[4]=string(round(battle_pobject[current_battle].capital_health)); - strin[5]=string(round(battle_pobject[current_battle].frigate_health)); - strin[6]=string(round(battle_pobject[current_battle].escort_health)); - - // pull enemy ships here - - var e=1; - repeat(10){ - e+=1; - if (e=11) then e=13; - if (battle_star.present_fleet[e]>0){ - obj_controller.temp[1070]=battle_star.id; - obj_controller.temp[1071]=e; - obj_controller.temp[1072]=0; - obj_controller.temp[1073]=0; - obj_controller.temp[1074]=0; - - with(obj_en_fleet){ - if (orbiting=obj_controller.temp[1070]) and (owner=obj_controller.temp[1071]){ - obj_controller.temp[1072]+=round(capital_number); - obj_controller.temp[1073]+=round(frigate_number); - obj_controller.temp[1074]+=round(escort_number); - } - } - - var l1,l2;l1=0;l2=0; - if (obj_controller.faction_status[e]!="War"){ - repeat(10){l1+=1;if (allied_fleet[l1]=0) and (l2=0) then l2=l1;} - allied_fleet[l2]=e; - acap[l2]=obj_controller.temp[1072]; - afri[l2]=obj_controller.temp[1073]; - aesc[l2]=obj_controller.temp[1074]; - } - if (obj_controller.faction_status[e]="War") or (e=9) or (e=13){ - repeat(10){l1+=1;if (enemy_fleet[l1]=0) and (l2=0) then l2=l1;} - enemy_fleet[l2]=e; - ecap[l2]=obj_controller.temp[1072]; - efri[l2]=obj_controller.temp[1073]; - eesc[l2]=obj_controller.temp[1074]; - } - } - } - - } + if (battle_world[current_battle]>=1){ scr_count_forces(string(battle_location[current_battle]),battle_world[current_battle],true); @@ -262,68 +298,73 @@ function draw_player_fleet_combat_options(){ draw_text(xxx+12,yyy+237,"Enemy Fleets:"); draw_text(xxx+332,yyy+237,"Allied Fleets:"); - - draw_text(xxx+310,yyy+118,$"{strin[1]} {string_plural("Battleship",strin[1])} ({strin[4]}% HP)"); - draw_text(xxx+310,yyy+138,$"{strin[2]} {string_plural("Frigate",strin[2])} ({strin[5]}% HP)"); - draw_text(xxx+310,yyy+158,$"{strin[3]} {string_plural("Escort",strin[3])} ({strin[6]}% HP)"); + + draw_text(xxx+310,yyy+118,$"{caps} {string_plural("Battleship",caps)} ({capital_percentage}% HP)"); + draw_text(xxx+310,yyy+138,$"{frigs} {string_plural("Frigate",frigs)} ({frigs_percentage}% HP)"); + draw_text(xxx+310,yyy+158,$"{escorts} {string_plural("Escort",escorts)} ({escorts_percentage}% HP)"); draw_set_halign(fa_center); - for (var i=1;i1){ + if (i>0){ xxx+=110; } - if (enemy_fleet[i]!=0){ - scr_image("ui/force",enemy_fleet[i],xxx+44-32,yyy+269-32,64,64); - var shw=""; - shw += $"{ecap[i]} :"+string_plural( "Battleship",ecap[i]) + "\n"; - shw += $"{efri[i]} :"+string_plural("Frigate",efri[i]) + "\n"; - shw +=$"{eesc[i]} :"+string_plural( "Escort",eesc[i]) + "\n"; - - draw_text_transformed(xxx+44,yyy+286,shw,0.7,1,0); - draw_set_halign(fa_center); - draw_set_font(fnt_40k_14b); - } - if (array_length(allied_fleet)0){ + xxx+=110; } + var _fleet = allied_fleets[i]; + + scr_image("ui/force",_fleet.owner,xxx+44-32+_ali_mod,yyy+269-32,64,64); + var shw=""; + shw += $"{_fleet.capital} :"+string_plural( "Battleship",_fleet.capital) + "\n"; + shw += $"{_fleet.frigate} :"+string_plural("Frigate",_fleet.frigate) + "\n"; + shw +=$"{_fleet.escort} :"+string_plural( "Escort",_fleet.escort) + "\n"; + + draw_text_transformed(xxx+44+_ali_mod,yyy+286,shw,0.7,1,0); + draw_set_halign(fa_center); + draw_set_font(fnt_40k_14b); } + var xxx=main_slate.XX; var _retreat_button = draw_unit_buttons([xxx+180,yyy+350],"Retreat"); - var _battle_sys = battle_pobject[current_battle]; if (point_and_click(_retreat_button)){ with(obj_fleet_select){ instance_destroy(); } - var that=instance_nearest(_battle_sys.x,_battle_sys.y,obj_p_fleet); - that.alarm[3]=1; + + player_object.alarm[3]=1; var that2=instance_create(0,0,obj_popup); that2.type=99; obj_controller.force_scroll=1; } var _fight_button = draw_unit_buttons([xxx+272,yyy+350],"Fight"); - if (point_and_click(_fight_button) && enemy_fleet[1]!=0){ + if (point_and_click(_fight_button)){ instance_activate_all(); - var _star = star_by_name(battle_location[current_battle]); - setup_fleet_battle(enemy_fleet[1], _star); + setup_fleet_battle(opponent, system); if (instance_exists(obj_fleet)){ wait_and_execute(20, start_fleet_battle,[] , obj_turn_end); @@ -463,7 +504,7 @@ function add_system_end_turn_fleet_battles(){ var _nearest_p_fleet = instance_nearest(x,y,obj_p_fleet); - if (_nearest_p_fleet.x != x && _nearest_p_fleet.y != y || _nearest_p_fleet.action == "move") { + if (_nearest_p_fleet.x != x || _nearest_p_fleet.y != y || _nearest_p_fleet.action == "move") { exit; } @@ -500,6 +541,8 @@ function add_system_end_turn_fleet_battles(){ _fleet_battle.opponent = _largest_fleet.owner; + _fleet_battle.player_object = _nearest_p_fleet; + if (fleet_has_cargo("warband", _largest_fleet)){ _fleet_battle.special = "BLOOD"; } diff --git a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml index 216c0eb649..552a0fc4ec 100644 --- a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml +++ b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml @@ -486,19 +486,19 @@ function selected_ship_types(){ var capitals=0,frigates=0,escorts=0,i; for (i=0; i Date: Thu, 20 Nov 2025 02:26:26 +0000 Subject: [PATCH 148/155] remove repetitions and mnake variabkle naming sane --- objects/obj_controller/Alarm_5.gml | 4 - objects/obj_ncombat/Alarm_7.gml | 2 +- objects/obj_turn_end/Create_0.gml | 4 +- objects/obj_turn_end/Draw_64.gml | 2 +- .../scr_automated_ship_combat_functions.gml | 2 +- .../scr_end_turn_combat_helpers.gml | 211 ++++++------------ .../scr_player_fleet_functions.gml | 9 +- scripts/scr_roster/scr_roster.gml | 27 ++- 8 files changed, 99 insertions(+), 162 deletions(-) diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 8c7000b176..03435d5184 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -454,10 +454,6 @@ try{ } catch(_exception){ handle_exception(_exception); } -// Right here need to sort the battles within the obj_turn_end -with(obj_turn_end){ - end_turn_battle_next_sequence(false, 20); -} for(var i=1; i<=10; i++){ if (turns_ignored[i]<500){ diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index a6ec9db399..0eca9f52a9 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -285,7 +285,7 @@ try { } obj_controller.combat=0; with(obj_turn_end){ - alarm[4]=1; + end_turn_battle_next_sequence(); } } } diff --git a/objects/obj_turn_end/Create_0.gml b/objects/obj_turn_end/Create_0.gml index bc52887942..d37b8965e6 100644 --- a/objects/obj_turn_end/Create_0.gml +++ b/objects/obj_turn_end/Create_0.gml @@ -59,8 +59,6 @@ battle_location = []; battle_world = [];// Be like -50 for space battle battle_opponent = [];// faction ID battle_object = [];// faction object for the fleets -battle_pobject = [];// player object for the fleets -battle_special = []; battle = []; @@ -96,7 +94,7 @@ if (audiences>0){// This is a one-off change all messages to declare war alerts=0; fast=0; -show=0; +show=-1; /* */ diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 7b40dec3af..08e33f53cd 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -34,7 +34,7 @@ if (alerts>0) and (popups_end=1){ } draw_set_alpha(1); -if (show>0 && current_battle-1){ +if (show>-1 && current_battle-1){ var _cur_battle = battles[current_battle]; _cur_battle.draw(); } diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 92584e792c..0a867236b1 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -402,7 +402,7 @@ function ship_combat_cleanup(){ } if (player_started=0) and (instance_exists(obj_turn_end)){ - _player_battle_fleet=obj_turn_end.battle_pobject[obj_turn_end.current_battle]; + _player_battle_fleet=obj_turn_end.battle[obj_turn_end.current_battle].player_object; } diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index c281509d1b..30bc6a43eb 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -62,7 +62,10 @@ function EndTurnBattle (battle_type, system)constructor{ array_insert(battles, _new_battle, 0); } } else { - array_push(battles,_new_battle); + _new_battle.collect_ground_battle_variables(); + if (roster.total_selected()){ + array_push(battles,_new_battle); + } } } } @@ -104,7 +107,7 @@ function EndTurnBattle (battle_type, system)constructor{ var _ship = fetch_ship(player_object.capital_num[i]); capital_percentage += _ship.ship_hp_percentage(); } - capital_percentage /= caps + capital_percentage /= caps; var frigs_percentage = 0; @@ -112,7 +115,7 @@ function EndTurnBattle (battle_type, system)constructor{ var _ship = fetch_ship(player_object.frigate_num[i]); frigs_percentage += _ship.ship_hp_percentage(); } - frigs_percentage /= frigs + frigs_percentage /= frigs; var escorts_percentage = 0; @@ -120,10 +123,33 @@ function EndTurnBattle (battle_type, system)constructor{ var _ship = fetch_ship(player_object.escort_num[i]); escorts_percentage += _ship.ship_hp_percentage(); } - escorts_percentage /= escorts + escorts_percentage /= escorts; } + static collect_ground_battle_variables = function(){ + roster = new Roster(); + roster.location = system.name; + roster.roster_planet = planet; + roster.determine_full_roster(); + roster.only_locals(); + + player_marines = roster.marines_total(true); + player_vehicles = roster.vehicles_total(true); + + fortified_description = FORTIFICATION_GRADES_DESCRIPTIONS[pdata.fortification_level]; + + enemy_forces_descripton = ""; + if (opponent >= 3 && opponent <= 13){ + var _op_grade = pdata.planet_forces[opponent]; + enemy_forces_descripton = AUTO_BATTLE_FORCES_GRADE[clamp(_op_grade,0,7)]; + } + if (battle_opponent[current_battle]=30){ + enemy_forces_descripton = "Master Spyrer"; + } + + } + static draw = function(){ add_draw_return_values(); slate.draw_with_dimensions(535, 200, 530, 400); @@ -158,134 +184,29 @@ function end_turn_battle_next_sequence(next_battle = true, wait_time = 1){ /* */ } - -function next_end_turn_battle_variables(){ - var battle_o=0; - current_battle+=1; - combating=0; - - instance_activate_object(obj_star); - - if (battles>0) and (current_battle<=battles){ - - var ii=0,good=0; - var battle_star = star_by_name(battle_location[current_battle]); - obj_controller.temp[1060]=battle_location[current_battle]; - - if (battle_star!="none"){ - obj_controller.x=battle_star.x; - obj_controller.y=battle_star.y; - show=current_battle; - - if (battle_world[current_battle]>=1){ - var _p_data = new PlanetData(battle_world[current_battle], battle_object[current_battle]); - - scr_count_forces(string(battle_location[current_battle]),battle_world[current_battle],true); - - strin[1]=info_mahreens; - strin[2]=info_vehicles; - - if (info_mahreens+info_vehicles=0){ - end_turn_battle_next_sequence(); - } - - strin[3]=""; - - var tempy=0; - tempy=battle_object[current_battle].p_owner[battle_world[current_battle]]; - - if ((tempy>=1) || (tempy=2) || (tempy=3)){ - strin[3] = FORTIFICATION_GRADES_DESCRIPTIONS[clamp(_p_data.fortification_level, 0, 6)]; - } - - tempy=0; - if (battle_opponent[current_battle]=7) then tempy=battle_object[current_battle].p_orks[battle_world[current_battle]]; - if (battle_opponent[current_battle]=8) then tempy=battle_object[current_battle].p_tau[battle_world[current_battle]]; - if (battle_opponent[current_battle]=9) then tempy=battle_object[current_battle].p_tyranids[battle_world[current_battle]]; - if (battle_opponent[current_battle]=10) then tempy=battle_object[current_battle].p_traitors[battle_world[current_battle]]; - if (battle_opponent[current_battle]=30){ - tempy=1; - strin[4]="Master Spyrer"; - } - - if (battle_opponent[current_battle]<=20){ - tempy = clamp(tempy, 0, 6); - strin[4] = AUTO_BATTLE_FORCES_GRADE[tempy]; - } - } - - if (obj_controller.zoomed=1){ - scr_zoom() - }; - } - instance_activate_object(obj_star); - - } - - instance_activate_object(obj_star); - - end_turn_battle_next_sequence(); - -} - -function collect_next_end_turn_battle(){ - if (battles<=0) || (current_battle>battles){ +function c(){ + if (array_length(battle<=0) || (current_battle>array_length(battle)<=0){ exit; } - var ii, xx, yy, good; - ii=0; - good=0; + var xx, yy; + var ii=0; + var good=0; + + var _battle = battle[current_battle]; - var battle_star = star_by_name(battle_location[current_battle]); + var battle_star = _battle.system; if (battle_star != "none"){// trying to find the star obj_controller.x=battle_star.x; obj_controller.y=battle_star.y; show=current_battle; - - if (battle_world[current_battle]>=1){ - scr_count_forces(string(battle_location[current_battle]),battle_world[current_battle],true); - - strin[1]=info_mahreens; - strin[2]=info_vehicles; - - if (info_mahreens+info_vehicles=0){ - end_turn_battle_next_sequence(); - exit; + if (obj_controller.zoomed=1){ + with(obj_controller){ + scr_zoom(); } - - strin[3]=""; - - var tempy=0; - tempy=battle_object[current_battle].p_owner[battle_world[current_battle]]; - - if (tempy=1) or (tempy=2) or (tempy=3){ - var array_string = FORTIFICATION_GRADES_DESCRIPTIONS; - var battle_fortification = battle_object[current_battle].p_fortified[battle_world[current_battle]]; - strin[3] = array_string[clamp(battle_fortification, 1, 6)]; - } - - tempy=0; - if (battle_opponent[current_battle]=7) then tempy=battle_object[current_battle].p_orks[battle_world[current_battle]]; - if (battle_opponent[current_battle]=8) then tempy=battle_object[current_battle].p_tau[battle_world[current_battle]]; - if (battle_opponent[current_battle]=9) then tempy=battle_object[current_battle].p_tyranids[battle_world[current_battle]]; - if (battle_opponent[current_battle]=10) then tempy=battle_object[current_battle].p_traitors[battle_world[current_battle]]; - if (battle_opponent[current_battle]=13) then tempy=battle_object[current_battle].p_necrons[battle_world[current_battle]]; - - if (tempy=1) then strin[4]="Minimal Forces"; - if (tempy=2) then strin[4]="Sparse Forces"; - if (tempy=3) then strin[4]="Moderate Forces"; - if (tempy=4) then strin[4]="Numerous Forces"; - if (tempy=5) then strin[4]="Very Numerous"; - if (tempy=6) then strin[4]="Overwhelming"; - - // if (battle_opponent[current_battle]=2) then obj_controller.alarm[7]=1; - obj_controller.cooldown=9999; } - - if (obj_controller.zoomed=1) then with(obj_controller){scr_zoom();} } instance_activate_object(obj_star); } @@ -314,13 +235,13 @@ function draw_player_fleet_combat_options(){ var _fleet = enemy_fleets[i]; scr_image("ui/force",_fleet.owner,xxx+44-32,yyy+269-32,64,64); - var shw=""; + var _ship_type_string=""; - shw += $"{_fleet.capital} :"+string_plural( "Battleship",_fleet.capital) + "\n"; - shw += $"{_fleet.frigate} :"+string_plural("Frigate",_fleet.frigate) + "\n"; - shw +=$"{_fleet.escort} :"+string_plural( "Escort",_fleet.escort) + "\n"; + _ship_type_string += $"{_fleet.capital} :"+string_plural( "Battleship",_fleet.capital) + "\n"; + _ship_type_string += $"{_fleet.frigate} :"+string_plural("Frigate",_fleet.frigate) + "\n"; + _ship_type_string +=$"{_fleet.escort} :"+string_plural( "Escort",_fleet.escort) + "\n"; - draw_text_transformed(xxx+44,yyy+286,shw,0.7,1,0); + draw_text_transformed(xxx+44,yyy+286,_ship_type_string,0.7,1,0); draw_set_halign(fa_center); draw_set_font(fnt_40k_14b); @@ -335,12 +256,12 @@ function draw_player_fleet_combat_options(){ var _fleet = allied_fleets[i]; scr_image("ui/force",_fleet.owner,xxx+44-32+_ali_mod,yyy+269-32,64,64); - var shw=""; - shw += $"{_fleet.capital} :"+string_plural( "Battleship",_fleet.capital) + "\n"; - shw += $"{_fleet.frigate} :"+string_plural("Frigate",_fleet.frigate) + "\n"; - shw +=$"{_fleet.escort} :"+string_plural( "Escort",_fleet.escort) + "\n"; + var _ship_type_string=""; + _ship_type_string += $"{_fleet.capital} :"+string_plural( "Battleship",_fleet.capital) + "\n"; + _ship_type_string += $"{_fleet.frigate} :"+string_plural("Frigate",_fleet.frigate) + "\n"; + _ship_type_string +=$"{_fleet.escort} :"+string_plural( "Escort",_fleet.escort) + "\n"; - draw_text_transformed(xxx+44+_ali_mod,yyy+286,shw,0.7,1,0); + draw_text_transformed(xxx+44+_ali_mod,yyy+286,_ship_type_string,0.7,1,0); draw_set_halign(fa_center); draw_set_font(fnt_40k_14b); @@ -379,9 +300,11 @@ function draw_player_ground_combat_options(){ var xxx=main_slate.XX; var yyy=main_slate.YY; if (battle_opponent[current_battle]<=20){ - draw_text(xxx+310,yyy+118, $"{string(strin[1])} Marines"); - draw_text(xxx+310,yyy+138, $"{string(strin[2])} Vehicles"); - if (strin[3]!="") then draw_text(xxx+310,yyy+158,string(strin[3])+" Fortified");// Not / Barely / Lightly / Moderately / Highly / Maximally + draw_text(xxx+310,yyy+118, $"{player_marines} Marines"); + draw_text(xxx+310,yyy+138, $"{player_vehicles} Vehicles"); + + draw_text(xxx+310,yyy+158,$"{fortified_description} Fortified");// Not / Barely / Lightly / Moderately / Highly / Maximally + } draw_set_font(fnt_40k_14b); @@ -394,9 +317,10 @@ function draw_player_ground_combat_options(){ draw_set_halign(fa_center); // draw_sprite(spr_force_icon,battle_opponent[current_battle],xxx+44,yyy+289); - scr_image("ui/force",battle_opponent[current_battle],xxx+44-32,yyy+289-32,64,64); - draw_text_transformed(xxx+44,yyy+316,string(strin[4]),0.75,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); + scr_image("ui/force",opponent,xxx+44-32,yyy+289-32,64,64); + draw_text_transformed(xxx+44,yyy+316,enemy_forces_descripton,0.75,1,0); + draw_set_halign(fa_center); + draw_set_font(fnt_40k_14b); var _init_battle = false; @@ -455,7 +379,7 @@ function draw_player_ground_combat_options(){ if (obj_ncombat.enemy==13) then obj_ncombat.fortified=0; - obj_ncombat.battle_special=battle_special[current_battle]; + obj_ncombat.battle_special=special; obj_ncombat.battle_climate=_planet_data.planet_type; // show_message(string(battle_object[current_battle].p_feature[battle_world[current_battle]])); @@ -476,19 +400,14 @@ function draw_player_ground_combat_options(){ } // - _roster = new Roster(); - with (_roster){ - roster_location = _loc; - roster_planet = _planet; - determine_full_roster(); - only_locals(); - update_roster(); - if (array_length(selected_units)){ + with (roster){ + //final check that there are in fact player units present + if (total_selected()){ setup_battle_formations(); add_to_battle(); } } - delete _roster; + delete roster; instance_deactivate_object(battle_object[current_battle]); } diff --git a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml index 552a0fc4ec..70c371c39d 100644 --- a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml +++ b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml @@ -268,7 +268,7 @@ function add_ship_to_fleet(index, fleet="none"){ function player_retreat_from_fleet_combat(){ try{ var p_strength,ratio,diceh,_roll_100; - var mfleet=obj_turn_end.battle_pobject[obj_turn_end.current_battle];; + var mfleet = obj_turn_end.battle[obj_turn_end.current_battle].player_object; var _fleet_ships = fleet_full_ship_array(mfleet); var en_strength=0; @@ -382,8 +382,11 @@ function player_retreat_from_fleet_combat(){ obj_controller.menu=0; // 139; - with(obj_temp_inq){instance_destroy();} - instance_create(obj_turn_end.battle_pobject[obj_turn_end.current_battle].x,obj_turn_end.battle_pobject[obj_turn_end.current_battle].y,obj_temp_inq); + with(obj_temp_inq){ + instance_destroy(); + } + var _p_fleet = obj_turn_end.battle[obj_turn_end.current_battle].player_object; + instance_create(_p_fleet.x,_p_fleet.y,obj_temp_inq); with(obj_en_fleet){ if (navy=1) and (point_distance(x,y,obj_temp_inq.x,obj_temp_inq.y)<40) and (trade_goods="player_hold") then trade_goods=""; } diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml index 49d6635e2d..c844027d7c 100644 --- a/scripts/scr_roster/scr_roster.gml +++ b/scripts/scr_roster/scr_roster.gml @@ -10,6 +10,7 @@ function Roster() constructor{ squad_buttons = []; company_buttons = []; roster_local_string = ""; + local_button = new ToggleButton(); local_button.str1 = "Local Forces"; local_button.text_halign = fa_center; @@ -396,16 +397,36 @@ function Roster() constructor{ } - static marines_total = function(){ + static marines_total = function(selected_only = false){ var _marines = 0; - for (var i=0;i Date: Thu, 20 Nov 2025 03:43:13 +0000 Subject: [PATCH 149/155] refactor end turn alarms --- objects/obj_ncombat/Alarm_7.gml | 22 +------- objects/obj_turn_end/Draw_64.gml | 26 +++------- objects/obj_turn_end/Step_0.gml | 27 ---------- scripts/scr_alert/scr_alert.gml | 52 +++++++++++++++---- .../scr_end_turn_combat_helpers.gml | 6 ++- .../scr_post_battle_events.gml | 23 ++++++++ 6 files changed, 78 insertions(+), 78 deletions(-) diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 0eca9f52a9..222268065d 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -269,25 +269,7 @@ try { }; } if ((dropping+attacking=0)) and (string_count("_attack",battle_special)=0) and (string_count("mech",battle_special)=0) and (string_count("ruins",battle_special)=0) and (battle_special!="ship_demon") and (string_count("cs_meeting",battle_special)=0){ - - if (instance_exists(obj_turn_end)){ - var _battle_index = obj_turn_end.current_battle; - if (_battle_index0) and (defeat=1){ //TODO this logic is wrong assumes all player units died in ruins @@ -395,7 +377,7 @@ try { if (instance_exists(obj_turn_end)){ obj_turn_end.combating=0;// setup_audience_and_popup_timer(1); } - var pip;pip = instance_create(0,0,obj_popup); + var pip = instance_create(0,0,obj_popup); pip.title = "Enemies Vanquished"; pip.text = "Not only have you killed the Chaos Lord, "+string(obj_controller.faction_leader[eFACTION.Chaos])+", but also all of your battle brothers that questioned your rule. As you stand, alone, among the broken corpses of your enemies you begin to question what exactly it is that you accomplished. No matter the results, you feel as though your actions have been noticed."; } diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 08e33f53cd..f10a5aaa41 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -10,26 +10,14 @@ draw_set_font(fnt_40k_14b); draw_set_halign(fa_left); draw_set_color(CM_GREEN_COLOR); -if (alerts>0) and (popups_end=1){ - repeat(alerts){ - i+=1; - set_alert_draw_colour(alert_color[i]); - draw_set_alpha(min(1,alert_alpha[i])); - - if (obj_controller.zoomed=0){ - draw_text(32,+46+(i*20),string_hash_to_newline(string(alert_txt[i]))); - // draw_text(view_xview[0]+16.5,view_yview[0]+40.5+(i*12),string(alert_txt[i])); - } - /*if (obj_controller.zoomed=1){ - draw_text_transformed(80,80+(i*24),string(alert_txt[i]),2,2,0); - draw_text_transformed(81,81+(i*24),string(alert_txt[i]),2,2,0); - }*/ - - if (obj_controller.zoomed=1){ - draw_text_transformed(32,92+(i*40),string_hash_to_newline(string(alert_txt[i])),2,2,0); - // draw_text_transformed(122,122+(i*36),string(alert_txt[i]),3,3,0); - } +if (array_length(alert)) and (popups_end=1) { + for (var i=0;i=0) then cooldown-=1; - -if (alerts>0) and (popups_end=1) and (fadeout=0){ - repeat(alerts){ - i+=1; - - if (fast>=i) and (string_length(alert_txt[i])=i) and (alert_alpha[i]<1) then alert_alpha[i]+=0.03; - } -} - - -if (fadeout=1){ - i=0; - repeat(alerts){ - i+=1;alert_alpha[i]-=0.05; - if (i=1) and (alert_alpha[1]<=0) then instance_destroy(); - } -} - - if (alarm[2]=2000) then instance_destroy(); diff --git a/scripts/scr_alert/scr_alert.gml b/scripts/scr_alert/scr_alert.gml index 26faa10d9e..4b626c138c 100644 --- a/scripts/scr_alert/scr_alert.gml +++ b/scripts/scr_alert/scr_alert.gml @@ -16,6 +16,45 @@ function set_alert_draw_colour(alert_colour) { } } +function EndTurnAlert(type, text,colour)constructor{ + self.type=type; + self.text=text; + char=0; + alpha=1; + txt=""; + self.color=colour; + + static draw = function(){ + var _fast = obj_turn_end.fast; + if (_fast>=i) and (string_length(txt)=i) and (alpha<1){ + alpha+=0.03; + } + if (obj_turn_end.fadeout){ + alpha-=0.05; + } + set_alert_draw_colour(color); + draw_set_alpha(min(1,alpha)); + + if (obj_controller.zoomed=0){ + draw_text(32,+46+(i*20),string_hash_to_newline(txt)); + // draw_text(view_xview[0]+16.5,view_yview[0]+40.5+(i*12),string(alert_txt[i])); + } + /*if (obj_controller.zoomed=1){ + draw_text_transformed(80,80+(i*24),string(alert_txt[i]),2,2,0); + draw_text_transformed(81,81+(i*24),string(alert_txt[i]),2,2,0); + }*/ + + if (obj_controller.zoomed=1){ + draw_text_transformed(32,92+(i*40),string_hash_to_newline(txt),2,2,0); + // draw_text_transformed(122,122+(i*36),string(alert_txt[i]),3,3,0); + } + } +} + function scr_alert(colour, alert_type, alert_text, xx=00, yy=00) { // color / type / text /x/y @@ -26,16 +65,9 @@ function scr_alert(colour, alert_type, alert_text, xx=00, yy=00) { // if (obj_turn_end.alerts>0){ - if (instance_exists(obj_turn_end)){ - if (obj_turn_end.alert_type[obj_turn_end.alerts]!="-"+string(alert_text)) and (alert_type!="blank") and (colour!="blank"){ - obj_turn_end.alerts+=1; - obj_turn_end.alert[obj_turn_end.alerts]=1; - obj_turn_end.alert_color[obj_turn_end.alerts]=colour; // takes green, yellow, red, purple, default GM colorcodes(with c_ prefix), decimal, hexadecimal(with $ prefix, 6 or 8 digits) and CSS(with # prefix) - // if (colour="purple") then obj_turn_end.alert_color[obj_turn_end.alerts]="red"; - obj_turn_end.alert_type[obj_turn_end.alerts]=alert_type; - obj_turn_end.alert_text[obj_turn_end.alerts]="-"+string(alert_text); - obj_turn_end.alert[obj_turn_end.alerts]=1; - } + if (instance_exists(obj_turn_end) && (alert_type!="blank" && colour!="blank")){ + var _new_alert = new EndTurnAlert(alert_type,alert_text,colour); + array_push(obj_turn_end.alert, _new_alert); } diff --git a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml index 30bc6a43eb..d49a3b4558 100644 --- a/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml +++ b/scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.gml @@ -4,6 +4,8 @@ enum EndTurnBattleTypes { Ground, Fleet, } + + function EndTurnBattle (battle_type, system)constructor{ type = battle_type; self.system = system; @@ -184,8 +186,8 @@ function end_turn_battle_next_sequence(next_battle = true, wait_time = 1){ /* */ } -function c(){ - if (array_length(battle<=0) || (current_battle>array_length(battle)<=0){ +function collect_next_end_turn_battle(){ + if (array_length(battle<=0) || (current_battle>array_length(battle)<=0)){ exit; } var xx, yy; diff --git a/scripts/scr_post_battle_events/scr_post_battle_events.gml b/scripts/scr_post_battle_events/scr_post_battle_events.gml index 557baf06f4..8cbd560e6d 100644 --- a/scripts/scr_post_battle_events/scr_post_battle_events.gml +++ b/scripts/scr_post_battle_events/scr_post_battle_events.gml @@ -151,4 +151,27 @@ function space_hulk_explore_battle_aftermath(){ pop.text="The fallen heretics wore several suits of Terminator Armour- a handful of them were found to be cleansible and worthy of use. "+string(termi)+" Terminator Armour has been added to the Armamentarium."; } } +} + +function end_of_turn_defence_battle_cleanup(){ + + if (instance_exists(obj_turn_end)){ + var _battle_index = obj_turn_end.current_battle; + + var _battle = obj_turn_end.battle[_battle_index]; + var _battle_object = _battle.system; + + var _planet = _battle_object.planet + + _battle_object.p_player[_planet]-=world_size; + + if (defeat == 1){ + _battle_object.p_player[_planet] = 0; + }; + + obj_controller.combat=0; + with(obj_turn_end){ + end_turn_battle_next_sequence(); + } + } } \ No newline at end of file From 9771510840d225f4bdfc992c6a2e8181deaf5320 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 20 Nov 2025 04:58:19 +0000 Subject: [PATCH 150/155] other than alerts pretty much all workng sort of --- objects/obj_controller/Alarm_5.gml | 6 +++ objects/obj_controller/Step_0.gml | 2 +- objects/obj_fleet/Alarm_4.gml | 6 +-- objects/obj_ncombat/Alarm_7.gml | 7 ++-- objects/obj_popup/Keyboard_32.gml | 3 +- objects/obj_turn_end/Draw_0.gml | 5 --- objects/obj_turn_end/Draw_64.gml | 8 +++- scripts/scr_add_man/scr_add_man.gml | 4 +- scripts/scr_alert/scr_alert.gml | 22 ++++++++--- .../scr_automated_ship_combat_functions.gml | 26 +++---------- .../scr_end_turn_combat_helpers.gml | 37 +++++++++++-------- .../scr_player_fleet_functions.gml | 11 +++--- .../scr_post_battle_events.gml | 9 ++--- 13 files changed, 77 insertions(+), 69 deletions(-) diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 03435d5184..3a4d7d3925 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -559,3 +559,9 @@ with (obj_p_fleet){ instance_activate_object(obj_star); instance_activate_object(obj_en_fleet); + +// Right here need to sort the battles within the obj_turn_end +with(obj_turn_end){ + end_turn_battle_next_sequence(true, 20); +} + diff --git a/objects/obj_controller/Step_0.gml b/objects/obj_controller/Step_0.gml index 66681778c9..4aebc43569 100644 --- a/objects/obj_controller/Step_0.gml +++ b/objects/obj_controller/Step_0.gml @@ -577,7 +577,7 @@ try { man_sel[i] = 0; } if (b > -1 && b < array_length(obj_ini.ship_data)) { - obj_ini.ship_data.carrying -= man_size; + obj_ini.ship_data[b].carrying -= man_size; } reset_ship_manage_arrays(); cooldown = 10; diff --git a/objects/obj_fleet/Alarm_4.gml b/objects/obj_fleet/Alarm_4.gml index 09cf3dcb76..59050d3783 100644 --- a/objects/obj_fleet/Alarm_4.gml +++ b/objects/obj_fleet/Alarm_4.gml @@ -21,8 +21,7 @@ instance_activate_object(obj_turn_end); if (player_started=0){ with(obj_turn_end){ - current_battle+=1; - alarm[0]=1; + end_turn_battle_next_sequence(); } } if (player_started=1){ @@ -34,7 +33,8 @@ if (player_started=1){ taxt+=" fleet at "+string(battle_system.name)+".";scr_event_log("",taxt); if (instance_exists(obj_star_select)) then with(obj_star_select){ - alarm[1]=1;player_fleet=0; + alarm[1]=1; + player_fleet=0; var i=-1;repeat(15){i+=1;en_fleet[i]=0;} } if (instance_exists(pla_fleet)){ diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 222268065d..b5f83ca71f 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -286,11 +286,10 @@ try { if ((string_count("spyrer",battle_special)>0))/* and (string_count("demon",battle_special)>0))*/ and (defeat=0){ instance_activate_object(obj_star); - // show_message(obj_turn_end.current_battle); - // show_message(obj_turn_end.battle_world[obj_turn_end.current_battle]); + // title / text / image / speshul - var cur_star = obj_turn_end.battle_object[obj_turn_end.current_battle]; - var planet = obj_turn_end.battle_world[obj_turn_end.current_battle] + var cur_star = obj_turn_end.battle[obj_turn_end.current_battle].system; + var planet = obj_turn_end.battle[obj_turn_end.current_battle].planet; var _planet_string = scr_roman_numerals()[planet-1]; remove_planet_problem(planet ,"spyrer",cur_star) diff --git a/objects/obj_popup/Keyboard_32.gml b/objects/obj_popup/Keyboard_32.gml index 4b261ff086..6d92196e0a 100644 --- a/objects/obj_popup/Keyboard_32.gml +++ b/objects/obj_popup/Keyboard_32.gml @@ -23,8 +23,7 @@ if (array_length(options) == 0) and (type<5){ if (type=POPUP_TYPE.BATTLE_OPTIONS){ obj_controller.cooldown=10; - obj_turn_end.current_battle+=1; - obj_turn_end.alarm[0]=1; + end_turn_battle_next_sequence(); obj_controller.force_scroll=0; instance_destroy(); } diff --git a/objects/obj_turn_end/Draw_0.gml b/objects/obj_turn_end/Draw_0.gml index 5844c653df..f1f2b555ed 100644 --- a/objects/obj_turn_end/Draw_0.gml +++ b/objects/obj_turn_end/Draw_0.gml @@ -12,8 +12,3 @@ if (obj_controller.audience>0) then exit; if (show=0) and (obj_controller.zoomed=0) and (current_popup=0) then draw_sprite(spr_loading,image_index,__view_get( e__VW.XView, 0 )+23,__view_get( e__VW.YView, 0 )+73); if (show=0) and (obj_controller.zoomed=1) and (current_popup=0) then draw_sprite_ext(spr_loading,image_index,40,40,2,2,0,c_white,1); - - -if (show>0 && current_battle<=battles){ - -} diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index f10a5aaa41..93c91ce9e3 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -21,9 +21,13 @@ if (array_length(alert)) and (popups_end=1) { } } +if (popups_end && !array_length(alert)){ + instance_destroy(); +} + draw_set_alpha(1); -if (show>-1 && current_battle-1){ - var _cur_battle = battles[current_battle]; +if (show>-1 && current_battle-1){ + var _cur_battle = battle[current_battle]; _cur_battle.draw(); } diff --git a/scripts/scr_add_man/scr_add_man.gml b/scripts/scr_add_man/scr_add_man.gml index 42aa6ddb43..2f2969c3a5 100644 --- a/scripts/scr_add_man/scr_add_man.gml +++ b/scripts/scr_add_man/scr_add_man.gml @@ -243,8 +243,8 @@ function scr_add_man(man_role, target_company, spawn_exp, spawn_name, corruption //if (man_role=obj_ini.role[100][12]) and (corruption>=13) then obj_ini.god[target_company][good]=2;// Khorne!!!1 XDDDDDDD - if (missing = 1) and(man_role == obj_ini.role[100][12]) { - if (string_count("has joined the X Company", obj_turn_end.alert_text[obj_turn_end.alerts])) { + if (missing = 1) and (man_role == obj_ini.role[100][12]) { + if (instance_exists(obj_turn_end)) { scr_alert("red", $"recruiting", "Not enough {obj_ini.role[100][12]} equipment in the armoury!", 0, 0); } } diff --git a/scripts/scr_alert/scr_alert.gml b/scripts/scr_alert/scr_alert.gml index 4b626c138c..54988a5817 100644 --- a/scripts/scr_alert/scr_alert.gml +++ b/scripts/scr_alert/scr_alert.gml @@ -22,15 +22,27 @@ function EndTurnAlert(type, text,colour)constructor{ char=0; alpha=1; txt=""; - self.color=colour; + self.color=colour; + static turn = 0 + + static alert_count = 0 + if (turn != obj_controller.turn){ + turn = obj_controller.turn; + alert_count = 0; + } + + alert_id = alert_count; + + alert_count++; + static draw = function(){ var _fast = obj_turn_end.fast; - if (_fast>=i) and (string_length(txt)=alert_id) and (string_length(txt)=i) and (alpha<1){ + if (_fast>=alert_id) and (alpha<1){ alpha+=0.03; } if (obj_turn_end.fadeout){ @@ -40,7 +52,7 @@ function EndTurnAlert(type, text,colour)constructor{ draw_set_alpha(min(1,alpha)); if (obj_controller.zoomed=0){ - draw_text(32,+46+(i*20),string_hash_to_newline(txt)); + draw_text(32,+46+(alert_id*20),string_hash_to_newline(txt)); // draw_text(view_xview[0]+16.5,view_yview[0]+40.5+(i*12),string(alert_txt[i])); } /*if (obj_controller.zoomed=1){ @@ -49,7 +61,7 @@ function EndTurnAlert(type, text,colour)constructor{ }*/ if (obj_controller.zoomed=1){ - draw_text_transformed(32,92+(i*40),string_hash_to_newline(txt),2,2,0); + draw_text_transformed(32,92+(alert_id*40),string_hash_to_newline(txt),2,2,0); // draw_text_transformed(122,122+(i*36),string(alert_txt[i]),3,3,0); } } diff --git a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml index 0a867236b1..567feb0039 100644 --- a/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml +++ b/scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.gml @@ -402,7 +402,7 @@ function ship_combat_cleanup(){ } if (player_started=0) and (instance_exists(obj_turn_end)){ - _player_battle_fleet=obj_turn_end.battle[obj_turn_end.current_battle].player_object; + _player_battle_fleet=fetch_current_battle().player_object; } @@ -434,32 +434,18 @@ function ship_combat_cleanup(){ if (!player_started && instance_exists(obj_turn_end)){ - with(obj_star){ - if (name!=obj_turn_end.battle_location[obj_turn_end.current_battle]){ - x-=10000; - y-=10000; - } - } + ii = fetch_current_battle().system; } else { with(obj_star){ - if (id!=obj_fleet.battle_system){ - x-=10000;y-=10000; + if (id==obj_fleet.battle_system){ + ii = self.id; } } } - ii=instance_nearest(room_width,room_height,obj_star); + obj_controller.temp[1070]=ii.id; - with(obj_star){ - if (x<-5000) and (y<-5000){x+=10000;y+=10000; - } - } - - - - - - + op=0;var ofleet;ofleet=0; for (var op=0;opbattles){ + if (!array_length(battle) || current_battle >= array_length(battle)){ + show_debug_message("battles_over"); setup_audience_and_popup_timer(); } } function end_turn_battle_next_sequence(next_battle = true, wait_time = 1){ + show_debug_message("sequence"); if (next_battle){ obj_turn_end.current_battle++; } obj_controller.force_scroll=0; - static _main_func = function(){ + var _main_func = function(){ instance_activate_object(obj_star); combating=0; @@ -187,7 +192,7 @@ function end_turn_battle_next_sequence(next_battle = true, wait_time = 1){ } function collect_next_end_turn_battle(){ - if (array_length(battle<=0) || (current_battle>array_length(battle)<=0)){ + if (array_length(battle) <=0 || current_battle>array_length(battle)){ exit; } var xx, yy; @@ -301,7 +306,7 @@ function draw_player_fleet_combat_options(){ function draw_player_ground_combat_options(){ var xxx=main_slate.XX; var yyy=main_slate.YY; - if (battle_opponent[current_battle]<=20){ + if (opponent<=20){ draw_text(xxx+310,yyy+118, $"{player_marines} Marines"); draw_text(xxx+310,yyy+138, $"{player_vehicles} Vehicles"); @@ -318,7 +323,7 @@ function draw_player_ground_combat_options(){ draw_set_halign(fa_center); - // draw_sprite(spr_force_icon,battle_opponent[current_battle],xxx+44,yyy+289); + scr_image("ui/force",opponent,xxx+44-32,yyy+289-32,64,64); draw_text_transformed(xxx+44,yyy+316,enemy_forces_descripton,0.75,1,0); draw_set_halign(fa_center); @@ -337,8 +342,8 @@ function draw_player_ground_combat_options(){ } if (_init_battle){ - var _loc = battle_location[current_battle] - var _planet = battle_world[current_battle] // Fight fight fight, ground + var _loc = location + var _planet = planet; // Fight fight fight, ground obj_controller.cooldown=8; // Start battle here @@ -348,13 +353,13 @@ function draw_player_ground_combat_options(){ instance_deactivate_all(true); instance_activate_object(obj_controller); instance_activate_object(obj_ini); - instance_activate_object(battle_object[current_battle]); + instance_activate_object(system); - var _battle_obj = battle_object[current_battle]; + var _battle_obj = system; instance_create(0,0,obj_ncombat); - obj_ncombat.enemy=battle_opponent[current_battle]; - obj_ncombat.battle_object=_battle_obj; + obj_ncombat.enemy = opponent; + obj_ncombat.battle_object=system; obj_ncombat.battle_loc=_loc; obj_ncombat.battle_id=_planet; @@ -384,6 +389,8 @@ function draw_player_ground_combat_options(){ obj_ncombat.battle_special=special; obj_ncombat.battle_climate=_planet_data.planet_type; + + //TODO recover and move to mopdern syntax // show_message(string(battle_object[current_battle].p_feature[battle_world[current_battle]])); /*if (scr_planetary_feature.plant_feature_bool(battle_object[current_battle].p_feature[battle_world[current_battle]], P_features.Monastery)==1){ // show_message(string(battle_object[current_battle].p_defenses[battle_world[current_battle]])); @@ -410,7 +417,7 @@ function draw_player_ground_combat_options(){ } } delete roster; - instance_deactivate_object(battle_object[current_battle]); + instance_deactivate_object(system); } } diff --git a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml index 70c371c39d..68f9f8e303 100644 --- a/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml +++ b/scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml @@ -267,8 +267,9 @@ function add_ship_to_fleet(index, fleet="none"){ } function player_retreat_from_fleet_combat(){ try{ + var _battle = fetch_current_battle(); var p_strength,ratio,diceh,_roll_100; - var mfleet = obj_turn_end.battle[obj_turn_end.current_battle].player_object; + var mfleet = _battle.player_object; var _fleet_ships = fleet_full_ship_array(mfleet); var en_strength=0; @@ -279,11 +280,11 @@ function player_retreat_from_fleet_combat(){ _roll_100=roll_dice_chapter(1, 100, "low"); - var _loc_star = star_by_name(obj_turn_end.battle_location[obj_turn_end.current_battle]); + var _loc_star = _battle.system; obj_controller.temp[2001]=real(_loc_star.id); - obj_controller.temp[2002]=real(obj_turn_end.battle_opponent[obj_turn_end.current_battle]); - var _battle_opponent = obj_turn_end.battle_opponent[obj_turn_end.current_battle]; + obj_controller.temp[2002]=real(_battle.opponent); + var _battle_opponent = _battle.opponent; var cap_total=0,frig_total=0,escort_total=0; with(obj_en_fleet){ @@ -385,7 +386,7 @@ function player_retreat_from_fleet_combat(){ with(obj_temp_inq){ instance_destroy(); } - var _p_fleet = obj_turn_end.battle[obj_turn_end.current_battle].player_object; + var _p_fleet = fetch_current_battle().player_object; instance_create(_p_fleet.x,_p_fleet.y,obj_temp_inq); with(obj_en_fleet){ if (navy=1) and (point_distance(x,y,obj_temp_inq.x,obj_temp_inq.y)<40) and (trade_goods="player_hold") then trade_goods=""; diff --git a/scripts/scr_post_battle_events/scr_post_battle_events.gml b/scripts/scr_post_battle_events/scr_post_battle_events.gml index 8cbd560e6d..5b5e416169 100644 --- a/scripts/scr_post_battle_events/scr_post_battle_events.gml +++ b/scripts/scr_post_battle_events/scr_post_battle_events.gml @@ -59,8 +59,6 @@ function necron_tomb_raid_post_battle_sequence(){ /// @mixin obj_ncombat function protect_raiders_battle_aftermath(){ instance_activate_object(obj_star); - // show_message(obj_turn_end.current_battle); - // show_message(obj_turn_end.battle_world[obj_turn_end.current_battle]); // title / text / image / speshul var cur_star = battle_object; var planet = battle_id; @@ -89,9 +87,10 @@ function protect_raiders_battle_aftermath(){ function hunt_fallen_battle_aftermath(){ if (!defeat){ with (obj_turn_end){ - remove_planet_problem(battle_world[current_battle], "fallen", battle_object[current_battle]) - var tixt="The Fallen on "+ battle_object[current_battle].name; - tixt+=scr_roman(battle_world[current_battle]); + var _battle = fetch_current_battle(); + remove_planet_problem(_battle.planet, "fallen", _battle.system); + var tixt="The Fallen on "+ _battle.system.name; + tixt+=scr_roman(_battle.planet); scr_event_log("",$"Mission Succesful: {tixt} have been captured or purged."); tixt+=$" have been captured or purged. They shall be brought to the Chapter {obj_ini.role[100][14]}s posthaste, in order to account for their sins. "; var _tex_options = [ From b7792e7399166121da43aabf4e1416cf1335cfe1 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 20 Nov 2025 05:15:22 +0000 Subject: [PATCH 151/155] work out a few kinks --- objects/obj_fleet/Alarm_4.gml | 2 +- objects/obj_popup/Draw_64.gml | 4 ++-- objects/obj_turn_end/Draw_64.gml | 2 +- scripts/scr_alert/scr_alert.gml | 6 ++++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/objects/obj_fleet/Alarm_4.gml b/objects/obj_fleet/Alarm_4.gml index 59050d3783..645cd895ed 100644 --- a/objects/obj_fleet/Alarm_4.gml +++ b/objects/obj_fleet/Alarm_4.gml @@ -54,6 +54,6 @@ if (view_x+view_y>0){ -// show_message(obj_turn_end.current_battle); + with(obj_controller){instance_activate_all();} instance_destroy(); diff --git a/objects/obj_popup/Draw_64.gml b/objects/obj_popup/Draw_64.gml index 1bbd3cc8aa..c55adfc476 100644 --- a/objects/obj_popup/Draw_64.gml +++ b/objects/obj_popup/Draw_64.gml @@ -82,7 +82,7 @@ try{ if (instance_exists(obj_turn_end)) { var _pop_count = array_length(obj_turn_end.popup); if (_pop_count) { - draw_text(x1 + 20, y1 + (sprite_height * 0.07), $"{obj_turn_end.current_popup}/{_pop_count}"); + draw_text(x1 + 20, y1 + (sprite_height * 0.07), $"{obj_turn_end.current_popup+1}/{_pop_count}"); } } if (image == "debug") { @@ -125,7 +125,7 @@ try{ image_bot = (sprite_height * 0.07) + image_hei + 5; } - draw_popup_options() + draw_popup_options(); } if (type == "duel") {} diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 93c91ce9e3..fcd123fa22 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -11,7 +11,7 @@ draw_set_halign(fa_left); draw_set_color(CM_GREEN_COLOR); -if (array_length(alert)) and (popups_end=1) { +if (array_length(alert) && popups_end) { for (var i=0;i=alert_id) and (string_length(txt) Date: Sun, 7 Dec 2025 17:33:36 +0000 Subject: [PATCH 152/155] post merge updates --- .../scr_planet_setup_functions/scr_planet_setup_functions.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml index 72952f6ece..60c65b91b4 100644 --- a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -413,6 +413,7 @@ function setup_star_planet_defualts(){ } wait_and_execute(1,scr_income,[],obj_controller); + wait_and_execute(10,create_start_imperial_fleets,[],obj_controller); var i=choose(0,1); if (i==1) and (planets>0){ @@ -571,7 +572,6 @@ function setup_star_planet_defualts(){ } - obj_controller.alarm[9]=2; if (obj_controller.is_test_map!=true) and (p_owner[2]!=1){ for(var i=1; i<=4; i++){p_guardsmen[i]=0;} } From 3367524932a4cd6aec4635a6d2abd92c905ba6a9 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 11 Dec 2025 06:07:25 +0000 Subject: [PATCH 153/155] legacy enum names --- scripts/scr_cheatcode/scr_cheatcode.gml | 8 +- .../scr_mission_functions.gml | 246 ++++++++++++++---- 2 files changed, 194 insertions(+), 60 deletions(-) diff --git a/scripts/scr_cheatcode/scr_cheatcode.gml b/scripts/scr_cheatcode/scr_cheatcode.gml index 547e6a732b..18eb1b6102 100644 --- a/scripts/scr_cheatcode/scr_cheatcode.gml +++ b/scripts/scr_cheatcode/scr_cheatcode.gml @@ -443,11 +443,11 @@ function draw_planet_debug_options(){ function draw_planet_debug_features(){ static _addable_features = [ { - e_num : P_features.Gene_Stealer_Cult, + e_num : P_features.GeneStealerCult, name : "GeneStealer Cult" }, { - e_num : P_features.Ancient_Ruins, + e_num : P_features.AncientRuins, name : "Ancient Ruins" }, { @@ -455,11 +455,11 @@ function draw_planet_debug_features(){ name : "Artefact" }, { - e_num : P_features.STC_Fragment, + e_num : P_features.STCFragment, name : "STC Fragment" }, { - e_num : P_features.Sororitas_Cathedral, + e_num : P_features.SororitasCathedral, name : "Sororitas Cathedral" }, { diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 8aade9abf9..2019372c7a 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -12,7 +12,7 @@ function location_out_of_player_control(unit_loc){ return (array_contains(_locs,unit_loc )); } -#macro planet_problem_keys ["meeting_trap","meeting","succession","mech_raider","mech_bionics","mech_mars","mech_tomb1","fallen","great_crusade","harlequins","fund_elder","provide_garrison","hunt_beast","protect_raiders","join_communion","join_parade","recover_artifacts","train_forces","spyrer","inquisitor","recon","cleanse","purge","tyranid_org","artifact_loan","necron","ethereal","demon_world"] +#macro planet_problem_keys ["meeting_trap","meeting","succession","mech_raider","mech_bionics","mech_mars","mech_tomb1","fallen","great_crusade","harlequins","fund_elder","provide_garrison","hunt_beast","protect_raiders","join_communion","join_parade","recover_artifacts","train_forces","spyrer","inquisitor","recon","cleanse","purge","tyranid_org","artifact_loan","necron","ethereal","demon_world","deliver_trophy"] function mission_name_key(mission){ var mission_key = { @@ -86,13 +86,15 @@ function scr_new_governor_mission(planet, problem = ""){ }; if (problem != ""){ if (problem == "provide_garrison"){ - if (system_garrison[planet-1].garrison_force) then exit; + if (system_garrison[planet-1].garrison_force){ + exit; + } mission_data.reason = choose("stability", "importance"); } else if (problem=="purge_enemies"){ var enemy = 0; if (planets>1){ for (var i=1;i<=planets;i++){ - if(i=planet) then continue; + if (i=planet) then continue; if (p_owner[i]==eFACTION.Imperium){ enemy=i; break; @@ -151,30 +153,6 @@ function init_garrison_mission(planet, star, mission_slot){ } - - -function init_beast_hunt_mission(planet, star, mission_slot){ - var problems_data = star.p_problem_other_data[planet] - var mission_data = problems_data[mission_slot]; - if (mission_data.stage == "preliminary"){ - var numeral_name = planet_numeral_name(planet, star); - mission_data.stage = "active"; - var _mission_length=(irandom_range(2,5)); - star.p_timer[planet][mission_slot] = _mission_length; - //pop.image="ancient_ruins"; - var gar_pop=instance_create(0,0,obj_popup); - //TODO some new universal methods for popups - gar_pop.title=$"Marines assigned to hunt beasts around {numeral_name}"; - gar_pop.text=$"The govornor of {numeral_name} Thanks you for the participation of your elite warriors in your execution of such a menial task."; - //pip.image="event_march" - gar_pop.add_option("Happy Hunting"); - gar_pop.image=""; - gar_pop.cooldown=8; - obj_controller.cooldown=20; - scr_event_log("",$"Beast hunters deployed to {numeral_name} for {_mission_length} months.", star.name); - } -} - function role_compare(unit, role){ return unit.role() == obj_ini.role[100][role]; } @@ -355,8 +333,8 @@ function complete_garrison_mission(targ_planet, problem_index){ _mission_string+=$"while stationed {p_garrison.garrison_leader.name_role()} makes several notable observations and is able to instruct the planets defense core leaving the world better defended (fortifications++)."; } //TODO just generall apply this each turn with a garrison to see if a cult is found - if (planet_feature_bool(p_feature[targ_planet], P_features.GeneStealerCult)){ - var cult = return_planet_features(planet.features,P_features.GeneStealerCult)[0]; + if (planet_feature_bool(p_feature[targ_planet], P_features.Gene_Stealer_Cult)){ + var cult = return_planet_features(planet.features,P_features.Gene_Stealer_Cult)[0]; if (cult.hiding){ widom_test = tester.standard_test(p_garrison.garrison_leader, "wisdom",0, ["tyranids"]); if (widom_test[0]){ @@ -392,10 +370,10 @@ function complete_train_forces_mission(targ_planet, problem_index){ var _tyannic_vet = _trainer.has_trait("tyrannic_vet"); if (_tyannic_vet){ _wis_test_difficulty += 10; - if (planet.has_feature(P_features.GeneStealerCult)){ - var _cult = planet.get_features(P_features.GeneStealerCult)[0]; + if (planet.has_feature(P_features.Gene_Stealer_Cult)){ + var _cult = planet.get_features(P_features.Gene_Stealer_Cult)[0]; if (_cult.hiding){ - planet.delete_feature(P_features.GeneStealerCult); + planet.delete_feature(P_features.Gene_Stealer_Cult); _mission_string += $"Fortune has smiled on this mission, {_trainer.name_role()}'s abilities as a Veteran of dealing with the Tyranids came in handy and in a short period was able to discern the existencee of a cult. He was able to organise those he considered to be still loyal to rally an extermiation of the cult, reeports suggest he was so successful as to have completely wiped the genestealer presence from the planet"; } } @@ -471,6 +449,32 @@ function complete_train_forces_mission(targ_planet, problem_index){ } } } + +function init_beast_hunt_mission(planet, star, mission_slot){ + var problems_data = star.p_problem_other_data[planet] + var mission_data = problems_data[mission_slot]; + if (mission_data.stage == "preliminary"){ + var numeral_name = planet_numeral_name(planet, star); + mission_data.stage = "active"; + var _mission_length=(irandom_range(2,5)); + star.p_timer[planet][mission_slot] = _mission_length; + //pop.image="ancient_ruins"; + var gar_pop=instance_create(0,0,obj_popup); + //TODO some new universal methods for popups + gar_pop.title=$"Marines assigned to hunt beasts around {numeral_name}"; + gar_pop.text=$"The govornor of {numeral_name} Thanks you for the participation of your elite warriors in your execution of such a menial task."; + //pip.image="event_march" + gar_pop.add_option({ + str1: "Happy Hunting" + }); + gar_pop.image=""; + gar_pop.cooldown=8; + obj_controller.cooldown=20; + scr_event_log("",$"Beast hunters deployed to {numeral_name} for {_mission_length} months.", star.name); + } +} + + function complete_beast_hunt_mission(targ_planet, problem_index){ var planet = new PlanetData(targ_planet, self); if (problem_has_key_and_value(targ_planet,problem_index,"stage","active")){ @@ -490,18 +494,19 @@ function complete_beast_hunt_mission(targ_planet, problem_index){ remove_planet_problem(targ_planet, "hunt_beast"); return; } + var _successful_hunters = []; + var _largest_pass= 0; for (var i=0;i 20 && array_length(_navy_fleets)){ + _pop_data = { + trophy_owner : array_random_element(_successful_hunters), + system: self.name, + planet : targ_planet, + target_fleet : array_random_element(_navy_fleets) + }; + + var _options = { + choice_func : init_deliver_trophy_mission, + str1 : "Continue", + } + + _pop_data.options = _options; + } if (_success){ _mission_string = $"The mission was a success and a great number of beasts rounded up and slain, your marines were able to gain great skills and the prestige of your chapter has increased greatly across the planets populace." if (_deaths){ @@ -532,33 +555,144 @@ function complete_beast_hunt_mission(targ_planet, problem_index){ _mission_string = $"The mission was a failiure. The governor is disapointed and the legend of your chapter has undoubtedly been diminished"; _mission_string += $"\n{_unit_report_string}"; } - scr_popup($"Beast Hunt on {planet_numeral_name(i)}",_mission_string,"",""); + scr_popup($"Beast Hunt on {planet_numeral_name(i)}",_mission_string,"",_pop_data); remove_planet_problem(targ_planet, "hunt_beast"); + } else { remove_planet_problem(targ_planet, "hunt_beast"); } } +function init_deliver_trophy_mission(){ + text = $"After your marines return there is a great feast to honour them. Much fanfare is made of the great trophy {pop_data.trophy_owner.name_role()} bears, a great monstrous head as tall as he is that the governor proclaims must be the largest of it's kind and the momst fearsome beast in the sector."; -///@mixin obj_star -function setup_fallen_capture_battle(planet){ - var chan = choose(1, 2, 3, 4); - if (chan <= 2) { - var _battle = new EndTurnBattle(EndTurnBattleTypes.Ground, self); - _battle.planet = planet; - _battle.battle_special = chan == 1 ? "fallen1" : "fallen2"; - _battle.battle_opponent = 10; - _battle.add_to_stack(); + text += $"\n\nAn astropathic message is later recieved from the Commander of an Imperial Navy fleet explaining that his fleet is currrently home to the {irandom_numeral(100)},{irandom_numeral(100)} and {irandom_numeral(100)} {pop_data.system} Regiments and pleads that the trophy be handed over to his fleet in order to boost the moral of the regiments and fleet in general"; + replace_options([ + { + str1 : "Refuse and place the trophy into the Librarium", + choice_func : function(){ + scr_add_artifact(); + } - }else if (chan >= 3) { - if (remove_planet_problem(planet, "fallen")){ - tixt = "Your marines have scoured " + planet_numeral_name(planet); - tixt += " in search of the Fallen. Despite their best efforts, and meticulous searching, none have been found. It appears as though the information was faulty or out of date."; - scr_popup("Hunt the Fallen", tixt, "fallen", ""); - scr_event_log("", $"Mission Successful: No Fallen located upon {planet_numeral_name(planet)}"); - } - } + }, + { + str1 : "Accept", + choice_func : accept_deliver_trophy_mission + } + ]); + +} + + + +function accept_deliver_trophy_mission(){ + text = $"You Send a reply to tell the commander you accept and will ensure the trophy is delivered in person by the marine that slew the beast"; + var _targ_fleet = pop_data.target_fleet; + + var _targ_fleet_intercept = fleets_next_location(_targ_fleet); + if (_targ_fleet.action==""){ + text += $"\n\n the fleet in question is currently active around the {_targ_fleet_intercept.name} system"; + } else { + text += $"\n\n the fleet will next be accessible around the {_targ_fleet_intercept.name} system"; + } + + pop_data.target_fleet = _targ_fleet.uid; + + pop_data.delivering_marine = pop_data.trophy_owner.name_role(); + var _t_owner = pop_data.trophy_owner; + pop_data.trophy_owner = _t_owner.uid; + + var _fleet_event = new FleetEvent(pop_data); + + _fleet_event.turn_end = "deliver_trophy_end_turn_check"; + _fleet_event.destroy = "deliver_trophy_mission_fleet_destroyed"; + _fleet_event.timer_end = "deliver_trophy_mission_timed_out"; + + _fleet_event.timer = 120; + + _targ_fleet.add_event(_fleet_event); + + reset_popup_options(); +} + + +///@mixin FleetEvent +function deliver_trophy_mission_timed_out(){ + scr_popup( + "Objective Forgotten", + $"It has been so long in the life of a mortal that the commanders that once saught your delivery of the trophy from the hunt on {fleetevent_data.system} have now all either died or moved to greener pastures. The trophy will instead remain in the chapters possession", + ); +} + +///@mixin FleetEvent +function deliver_trophy_mission_fleet_destroyed(){ + scr_popup( + "Fleet Destroyed", + $"With the Imperial Navy fleet containing the regiments from {fleetevent_data.system} destroyed there is no reason to now deliver the trophy from the hunt to them The trophy will instead remain in the chapters possession", + ); +} + +///@mixin FleetEvent +function deliver_trophy_end_turn_check(){ + show_debug_message($"evetn_Data = {fleetevent_data}"); + var _navy_fleet = get_fleet_uid(fleet_uid); + if (!instance_exists(_navy_fleet)){ + deliver_trophy_mission_fleet_destroyed(); + return; + } + + var _ratio =0; + with (_navy_fleet){ + _ratio = fleet_remaining_guard_ratio(); + } + + if (_ratio<=0){ + scr_popup( + "Regiments Destroyed ", + $"The guard Regiments from {fleetevent_data.system} serving in the imperial navy fleet have been annihilated wholesale there is no reason to now deliver the trophy from the hunt to them The trophy will instead remain in the chapters possession", + ); + return; + } + + if (is_orbiting(_navy_fleet)){ + var _nearest_player = instance_at_location(_navy_fleet.x,_navy_fleet.y,obj_p_fleet); + if (instance_exists(_nearest_player)){ + var _ships = fleet_full_ship_array(_nearest_player); + var _marine = fetch_unit_uid(fleetevent_data.trophy_owner); + var _present = _marine.is_at_location("", 0, _ships); + var _meet_point = _navy_fleet.orbiting; + if (_present){ + var _text = "{_marine.role(name)} is able to rendevous with the imperial navy at {_meet_point.name}." + _text += $" The guard regiments of {fleetevent_data.system} are overjoyed at the delivery of the trophy and find the beast that the head came from adorns many of the regiments banners."; + _text += $" While The task is for the most part thankless your chapters esteem has risen greatly with the exploits of {_marine.role(name)} spreading far and wide amoung guard regiments."; + var _roll = roll_dice_chapter(1, 100, "high"); + if (_roll>30 && _roll<70){ + //TODO would be cool to have this changed to be a guard specific piece of equipment + _text += "In return for your labour and in honour of your chapter the commander of the guard division has a brand new Rhino destined for the army diverted to your chapter"; + scr_add_vehicle("Rhino"); + } else if (_roll>=70 ){ + var _wanted_types = ["Ice","Desert","Agri","Lava","Death"]; + var _star = scr_get_stars(true,[],_wanted_types)[0]; + _text += "During the concourse that follows with the fleet command your marines learn of a old battle ground discovered on {_star.name}."; + _text += "According too intel it appeared to be an old astartes battle ground from an unknown age, communications have been passed onto the adeptus mechanicus who will no doubt pick the site clean should they reach it befre you do"; + + var _planet = scr_get_planet_with_type(_wanted_types); + var _battle_ground = new NewPlanetFeature(P_features.AstartesBattleGround); + + _battle_ground.player_hidden = false; + + _star.add_feature(_planet,_battle_ground); + } + scr_popup( + "Trophy Delivered ", + _text, + ); + } + } + } } + + //TODO allow most of these functions to be condensed and allow arrays of problems or planets and maybe increase filtering options //filtering options could be done via universal methods that all the filters to be passed to many other game systems function has_any_problem_planet(planet, star="none"){ From 506e8140ab81e5484f8ca2c2f25daef4cf6776d4 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Tue, 16 Dec 2025 23:07:50 +0000 Subject: [PATCH 154/155] error messages --- ChapterMaster.yyp | 2 +- objects/obj_ini/Create_0.gml | 5 +- scripts/scr_PlanetData/scr_PlanetData.gml | 8 +-- scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml | 8 +-- .../scr_imperial_navy_functions.gml | 2 +- .../scr_mission_functions.gml | 10 ++-- .../spr_fleet_imperial/spr_fleet_imperial.yy | 45 +++++++++++------ sprites/spr_fleet_tau/spr_fleet_tau.yy | 49 +++++++++++++------ 8 files changed, 82 insertions(+), 47 deletions(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index fe4e9980a1..c0d01793d9 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -579,7 +579,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.901", + "IDEVersion":"2024.1400.0.904", }, "name":"ChapterMaster", "resources":[ diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 975b41a8ec..01d107518e 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -332,19 +332,18 @@ deserialize = function(save_data){ if (i<_lb){ if (left_broad[i].weapon != false){ left_broad[i].weapon = new ShipWeapon(left_broad[i].weapon.name, left_broad[i].weapon); - array_push(left_broad[i].weapon) } } if (i<_rb){ if (right_broad[i].weapon != false){ right_broad[i].weapon = new ShipWeapon(right_broad[i].weapon.name, right_broad[i].weapon); - array_push(right_broad[i].weapon) + } } if (i<_cb){ if (center_cannons[i].weapon != false){ center_cannons[i].weapon = new ShipWeapon(center_cannons[i].weapon.name, center_cannons[i].weapon); - array_push(center_cannons[i].weapon) + } } } diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml index 0ed24bc8b8..b621134fff 100644 --- a/scripts/scr_PlanetData/scr_PlanetData.gml +++ b/scripts/scr_PlanetData/scr_PlanetData.gml @@ -743,7 +743,7 @@ function PlanetData(planet, system) constructor{ }else if (planet_forces[eFACTION.Tyranids]>0){ if (has_feature(P_features.GeneStealerCult)){ - var _hidden_cult = get_features(P_features.Gene_Stealer_Cult)[0].hiding; + var _hidden_cult = get_features(P_features.GeneStealerCult)[0].hiding; if (!_hidden_cult){ guard_attack="tyranids"; @@ -782,7 +782,7 @@ function PlanetData(planet, system) constructor{ } } else if (current_owner == eFACTION.Tau){ _pdf_attack="guard"; - }else if (has_feature(P_features.Gene_Stealer_Cult) && population_influences[eFACTION.Tyranids]>=50){ + }else if (has_feature(P_features.GeneStealerCult) && population_influences[eFACTION.Tyranids]>=50){ _pdf_attack="guard"; } } @@ -1220,9 +1220,9 @@ function PlanetData(planet, system) constructor{ if (population_influences[eFACTION.Tyranids] > 3){ var _max_influence_reduction = min(_pop_percentage_kill,population_influences[eFACTION.Tyranids]-3); adjust_influence(eFACTION.Tyranids,-_max_influence_reduction,planet,system); - if (has_feature(P_features.Gene_Stealer_Cult)){ + if (has_feature(P_features.GeneStealerCult)){ if (population_influences[eFACTION.Tyranids]<20){ - delete_feature(P_features.Gene_Stealer_Cult); + delete_feature(P_features.GeneStealerCult); } } } diff --git a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml index 1287e85abd..7793c4a541 100644 --- a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml +++ b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml @@ -320,12 +320,12 @@ function scr_enemy_ai_a() { if (guard_score>=3) and (p_pdf[_run]<10000) then p_pdf[_run]*=(min(0.95, 0+pdf_loss_reduction)); if (guard_score>=2) and (p_pdf[_run]<2000) then p_pdf[_run]=0; if (guard_score>=1) and (p_pdf[_run]<200) then p_pdf[_run]=0; - if (_planet_data.population_influences[eFACTION.Tyranids] > 50 && _planet_data.has_feature(P_features.Gene_Stealer_Cult)){ + if (_planet_data.population_influences[eFACTION.Tyranids] > 50 && _planet_data.has_feature(P_features.GeneStealerCult)){ var _cur_influ = p_influence[_run][eFACTION.Tyranids]; var _influence_reduction = _cur_influ * (p_pdf[_run]/_pdf_before); adjust_influence(eFACTION.Tyranids,-min(_influence_reduction,_cur_influ-3) , _run); if (p_influence[_run][eFACTION.Tyranids] < 20){ - _planet_data.delete_feature(P_features.Gene_Stealer_Cult); + _planet_data.delete_feature(P_features.GeneStealerCult); } } } @@ -776,9 +776,9 @@ function scr_enemy_ai_a() { p_necrons[_run]=after_combat_necrons; if (p_tyranids[_run] != after_combat_tyranids){ p_tyranids[_run] = after_combat_tyranids; - if (_planet_data.has_feature(P_features.Gene_Stealer_Cult)){ + if (_planet_data.has_feature(P_features.GeneStealerCult)){ adjust_influence(eFACTION.Tyranids,-min(p_influence[_run][eFACTION.Tyranids]-4, 5),_run); - var _cult = _planet_data.get_features(P_features.Gene_Stealer_Cult)[0]; + var _cult = _planet_data.get_features(P_features.GeneStealerCult)[0]; if (p_influence[_run][eFACTION.Tyranids]<5){ _cult.hiding = true; } diff --git a/scripts/scr_imperial_navy_functions/scr_imperial_navy_functions.gml b/scripts/scr_imperial_navy_functions/scr_imperial_navy_functions.gml index 0fa27ee7f9..bf32b03f2d 100644 --- a/scripts/scr_imperial_navy_functions/scr_imperial_navy_functions.gml +++ b/scripts/scr_imperial_navy_functions/scr_imperial_navy_functions.gml @@ -280,7 +280,7 @@ function imperial_navy_bombard(){ _bombard=p; } else{ - var _cults = return_planet_features(orbiting.p_feature[p],P_features.Gene_Stealer_Cult); + var _cults = return_planet_features(orbiting.p_feature[p],P_features.GeneStealerCult); if (array_length(_cults)){ if (!_cults[0].hiding){ _bombard=p; diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 2019372c7a..766ccdddbf 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -333,8 +333,8 @@ function complete_garrison_mission(targ_planet, problem_index){ _mission_string+=$"while stationed {p_garrison.garrison_leader.name_role()} makes several notable observations and is able to instruct the planets defense core leaving the world better defended (fortifications++)."; } //TODO just generall apply this each turn with a garrison to see if a cult is found - if (planet_feature_bool(p_feature[targ_planet], P_features.Gene_Stealer_Cult)){ - var cult = return_planet_features(planet.features,P_features.Gene_Stealer_Cult)[0]; + if (planet_feature_bool(p_feature[targ_planet], P_features.GeneStealerCult)){ + var cult = return_planet_features(planet.features,P_features.GeneStealerCult)[0]; if (cult.hiding){ widom_test = tester.standard_test(p_garrison.garrison_leader, "wisdom",0, ["tyranids"]); if (widom_test[0]){ @@ -370,10 +370,10 @@ function complete_train_forces_mission(targ_planet, problem_index){ var _tyannic_vet = _trainer.has_trait("tyrannic_vet"); if (_tyannic_vet){ _wis_test_difficulty += 10; - if (planet.has_feature(P_features.Gene_Stealer_Cult)){ - var _cult = planet.get_features(P_features.Gene_Stealer_Cult)[0]; + if (planet.has_feature(P_features.GeneStealerCult)){ + var _cult = planet.get_features(P_features.GeneStealerCult)[0]; if (_cult.hiding){ - planet.delete_feature(P_features.Gene_Stealer_Cult); + planet.delete_feature(P_features.GeneStealerCult); _mission_string += $"Fortune has smiled on this mission, {_trainer.name_role()}'s abilities as a Veteran of dealing with the Tyranids came in handy and in a short period was able to discern the existencee of a cult. He was able to organise those he considered to be still loyal to rally an extermiation of the cult, reeports suggest he was so successful as to have completely wiped the genestealer presence from the planet"; } } diff --git a/sprites/spr_fleet_imperial/spr_fleet_imperial.yy b/sprites/spr_fleet_imperial/spr_fleet_imperial.yy index bd2735723c..8de0f77ce1 100644 --- a/sprites/spr_fleet_imperial/spr_fleet_imperial.yy +++ b/sprites/spr_fleet_imperial/spr_fleet_imperial.yy @@ -77,22 +77,39 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2227933-b8bc-4bf6-9d8e-524410250dc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1746812c-c63b-415d-b459-f12dc9208349","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edc14729-eece-4ed2-8dfc-a5f8c7dfe38b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c517f52-18b0-4ce3-907a-266b27998f5e","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da9e9585-4af5-4c8f-bf1e-b0865913f48c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e924ab6f-120a-498b-80ba-78f1ec0f34fe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83e2105e-06f4-433a-b155-899860422247","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e7f9699-c511-43fb-b4aa-f01b6cb66560","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cfe88df-f523-462d-bcf6-20f2367cf625","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"948a2eb0-29bf-4b0d-8710-2641375e304c","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e41b6128-03e4-490c-be0e-4c177c1dcfaa","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38bd26a6-a925-4d86-8cc1-91d1fa137e25","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"212d7172-82b2-47e9-95c1-fb55d943413e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f2227933-b8bc-4bf6-9d8e-524410250dc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1746812c-c63b-415d-b459-f12dc9208349","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"edc14729-eece-4ed2-8dfc-a5f8c7dfe38b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c517f52-18b0-4ce3-907a-266b27998f5e","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"da9e9585-4af5-4c8f-bf1e-b0865913f48c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e924ab6f-120a-498b-80ba-78f1ec0f34fe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83e2105e-06f4-433a-b155-899860422247","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6e7f9699-c511-43fb-b4aa-f01b6cb66560","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8cfe88df-f523-462d-bcf6-20f2367cf625","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"948a2eb0-29bf-4b0d-8710-2641375e304c","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e41b6128-03e4-490c-be0e-4c177c1dcfaa","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"38bd26a6-a925-4d86-8cc1-91d1fa137e25","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"212d7172-82b2-47e9-95c1-fb55d943413e","IsCreationKey":false,"Key":9.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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":11, "yorigin":11, diff --git a/sprites/spr_fleet_tau/spr_fleet_tau.yy b/sprites/spr_fleet_tau/spr_fleet_tau.yy index 3e3b10899a..ea24ba85e3 100644 --- a/sprites/spr_fleet_tau/spr_fleet_tau.yy +++ b/sprites/spr_fleet_tau/spr_fleet_tau.yy @@ -78,23 +78,42 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1641c7b0-ba32-46a1-bdef-7751da95e1c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95d93dc5-c7db-4369-b68a-31026d5959fc","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1f176e9-a3cc-4a3b-94bf-ade7ddc106a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"617ee12d-133c-4e96-ba8d-93535804252d","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1051b8c3-13b3-4b12-909d-886c3a09de27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06e6544f-caed-4f40-8705-c7108e508215","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"195aff74-b345-485c-8c41-640d808b3d87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a06bc4eb-65c2-4824-b12e-4b2594e8cdc6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5c0c0a4-63b3-43bc-8743-90cbd113bcb7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c0c4440-a668-4464-9e1c-647382b2af86","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a28eb7be-b330-4c6f-a971-0412e89f9546","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21ad7732-67d7-4445-a580-dc99939fd767","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c836550-2c0b-4ff6-bdf5-db3f343e1f8c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"621a69a7-bcaa-4299-821f-7014d3b98d91","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed6f8cbd-bba9-4119-b444-6aa8e37e6443","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1641c7b0-ba32-46a1-bdef-7751da95e1c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95d93dc5-c7db-4369-b68a-31026d5959fc","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b1f176e9-a3cc-4a3b-94bf-ade7ddc106a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"617ee12d-133c-4e96-ba8d-93535804252d","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1051b8c3-13b3-4b12-909d-886c3a09de27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06e6544f-caed-4f40-8705-c7108e508215","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"195aff74-b345-485c-8c41-640d808b3d87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a06bc4eb-65c2-4824-b12e-4b2594e8cdc6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a5c0c0a4-63b3-43bc-8743-90cbd113bcb7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4c0c4440-a668-4464-9e1c-647382b2af86","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a28eb7be-b330-4c6f-a971-0412e89f9546","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"21ad7732-67d7-4445-a580-dc99939fd767","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8c836550-2c0b-4ff6-bdf5-db3f343e1f8c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"621a69a7-bcaa-4299-821f-7014d3b98d91","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ed6f8cbd-bba9-4119-b444-6aa8e37e6443","IsCreationKey":false,"Key":10.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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":11, "yorigin":11, From 29c6dd034322259d0e6ccd5f36b8719b695259a3 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 17 Dec 2025 01:51:00 +0000 Subject: [PATCH 155/155] compiling fix again --- objects/obj_controller/Alarm_5.gml | 2 +- .../scr_destroy_planet/scr_destroy_planet.gml | 2 +- scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml | 4 +- scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml | 4 +- .../scr_inquisition_fleet_functions.gml | 2 +- .../scr_mission_functions.gml | 59 ------------------- .../scr_planet_setup_functions.gml | 2 +- .../scr_planetary_feature.gml | 6 +- scripts/scr_trade/scr_trade.gml | 2 +- 9 files changed, 12 insertions(+), 71 deletions(-) diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index efb1b321f9..e28fba2f47 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -30,7 +30,7 @@ try_and_report_loop("chaos_spread", function(){ if (faction_gender[eFACTION.Chaos]==1) and (faction_defeated[eFACTION.Chaos]==0) and (turn>=chaos_turn) then repeat(times){ if (_star.p_type[plani]!="Dead") and (_star.planets>0) and (turn>=20){ var cathedral=0; - if (planet_feature_bool(_star.p_feature[plani], P_features.Sororitas_Cathedral)==1) then cathedral=choose(0,1,1); + if (planet_feature_bool(_star.p_feature[plani], P_features.SororitasCathedral)==1) then cathedral=choose(0,1,1); if (cathedral=0){ if (_star.p_heresy[plani]>=0) and (_star.p_heresy[plani]<10){ diff --git a/scripts/scr_destroy_planet/scr_destroy_planet.gml b/scripts/scr_destroy_planet/scr_destroy_planet.gml index 489ece9fce..dfcd745863 100644 --- a/scripts/scr_destroy_planet/scr_destroy_planet.gml +++ b/scripts/scr_destroy_planet/scr_destroy_planet.gml @@ -124,7 +124,7 @@ function scr_destroy_planet(destruction_method) { decare_war_on_imperium_audiences() - if (planet_feature_bool(you.p_feature[baid], P_features.Sororitas_Cathedral) == 1) { + if (planet_feature_bool(you.p_feature[baid], P_features.SororitasCathedral) == 1) { obj_controller.disposition[5] -= 30; } } else if (you.p_owner[baid] == eFACTION.Imperium && (you.p_type[baid] == "Temperate" || you.p_type[baid] == "Desert")) { diff --git a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml index 7793c4a541..b8ce8069dd 100644 --- a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml +++ b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml @@ -526,7 +526,7 @@ function scr_enemy_ai_a() { if (p_type[_run] == "Forge") { dispo[_run] -= 5; // 10 Disposition decrease for the planet govrnor if it's overrun by orks obj_controller.disposition[3] -= 5; // obj_controller.disposition[3] refer to the disposition of the toaster jocks. - } else if (planet_feature_bool(p_feature[_run], P_features.Sororitas_Cathedral) or(p_type[_run] == "Shrine")) { + } else if (planet_feature_bool(p_feature[_run], P_features.SororitasCathedral) or(p_type[_run] == "Shrine")) { dispo[_run] -= 10; // diso[_run] is the disposition of the planet. where _run refer to the planet that is currently running the code. obj_controller.disposition[5] -= 3; // obj_controller.disposition[2] refer to the disposition of the sororitas while 3 refer to mechanicus } else dispo[_run] -= 5; @@ -747,7 +747,7 @@ function scr_enemy_ai_a() { if (p_type[_run] == "Forge") { //visited variable check whether the star has been visisted or not 1 for true 0 for false dispo[_run] -= 10; // 10 Disposition decrease for the planet govrnor if it's overrun by necrons obj_controller.disposition[3] -= 10; // 10 dis decrease for the faction mechanicus - } else if (planet_feature_bool(p_feature[_run], P_features.Sororitas_Cathedral) or(p_type[_run] == "Shrine")) { + } else if (planet_feature_bool(p_feature[_run], P_features.SororitasCathedral) or(p_type[_run] == "Shrine")) { dispo[_run] -= 10; // 10 Disposition decrease for the planet govrnor if it's overrun by necrons obj_controller.disposition[5] -= 5; // 5 dis decrease for the Nurses } else dispo[_run] -= 10; diff --git a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml index b79e2bb403..c893231048 100644 --- a/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml +++ b/scripts/scr_enemy_ai_b/scr_enemy_ai_b.gml @@ -197,7 +197,7 @@ function scr_enemy_ai_b() { if (p_type[i] == "Forge") { dispo[i] -= 10; // 10 disposition decreases for the respective planet obj_controller.disposition[3] -= 3; // 10 disposition decrease for the toaster Fetishest since they aren't that numerous - } else if (planet_feature_bool(p_feature[i], P_features.Sororitas_Cathedral) || (p_type[i] == "Shrine")) { + } else if (planet_feature_bool(p_feature[i], P_features.SororitasCathedral) || (p_type[i] == "Shrine")) { dispo[i] -= 4; // similarly 10 disposition decrease, note those nurses are a bit pissy and // and you can't easily gain their favor because you cannot ask them to "step down" from office. obj_controller.disposition[5] -= 5; @@ -418,7 +418,7 @@ function scr_enemy_ai_b() { if (p_type[i] == "Forge") { dispo[i] -= 10; // 10 disposition decreases for the respective planet obj_controller.disposition[eFACTION.Mechanicus] -= 10; // 10 disposition decrease for the toaster Fetishest since they aren't that many toasters in 41 millennia - } else if (planet_feature_bool(p_feature[i], P_features.Sororitas_Cathedral) || (p_type[i] == "Shrine")) { + } else if (planet_feature_bool(p_feature[i], P_features.SororitasCathedral) || (p_type[i] == "Shrine")) { dispo[i] -= 10; // 10 disposition decreases for the respective planet obj_controller.disposition[5] -= 5; } else { diff --git a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml index aebf6119af..0d080982ee 100644 --- a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml +++ b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml @@ -281,7 +281,7 @@ function inquisitor_inspect_base(){ p_owner[cur_planet]=1; } if (p_type[cur_planet]=="Dead") and (array_length(p_upgrades[cur_planet])>0){ - if (planet_feature_bool(p_feature[cur_planet], [P_features.Secret_Base,P_features.Arsenal,P_features.Gene_Vault])==0) /*and (string_count(".0|",p_upgrades[cur_planet])>0)*/{ + if (planet_feature_bool(p_feature[cur_planet], [P_features.SecretBase,P_features.Arsenal,P_features.GeneVault])==0) /*and (string_count(".0|",p_upgrades[cur_planet])>0)*/{ yep=cur_planet; } } diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 766ccdddbf..765267fd36 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -632,65 +632,6 @@ function deliver_trophy_mission_fleet_destroyed(){ ); } -///@mixin FleetEvent -function deliver_trophy_end_turn_check(){ - show_debug_message($"evetn_Data = {fleetevent_data}"); - var _navy_fleet = get_fleet_uid(fleet_uid); - if (!instance_exists(_navy_fleet)){ - deliver_trophy_mission_fleet_destroyed(); - return; - } - - var _ratio =0; - with (_navy_fleet){ - _ratio = fleet_remaining_guard_ratio(); - } - - if (_ratio<=0){ - scr_popup( - "Regiments Destroyed ", - $"The guard Regiments from {fleetevent_data.system} serving in the imperial navy fleet have been annihilated wholesale there is no reason to now deliver the trophy from the hunt to them The trophy will instead remain in the chapters possession", - ); - return; - } - - if (is_orbiting(_navy_fleet)){ - var _nearest_player = instance_at_location(_navy_fleet.x,_navy_fleet.y,obj_p_fleet); - if (instance_exists(_nearest_player)){ - var _ships = fleet_full_ship_array(_nearest_player); - var _marine = fetch_unit_uid(fleetevent_data.trophy_owner); - var _present = _marine.is_at_location("", 0, _ships); - var _meet_point = _navy_fleet.orbiting; - if (_present){ - var _text = "{_marine.role(name)} is able to rendevous with the imperial navy at {_meet_point.name}." - _text += $" The guard regiments of {fleetevent_data.system} are overjoyed at the delivery of the trophy and find the beast that the head came from adorns many of the regiments banners."; - _text += $" While The task is for the most part thankless your chapters esteem has risen greatly with the exploits of {_marine.role(name)} spreading far and wide amoung guard regiments."; - var _roll = roll_dice_chapter(1, 100, "high"); - if (_roll>30 && _roll<70){ - //TODO would be cool to have this changed to be a guard specific piece of equipment - _text += "In return for your labour and in honour of your chapter the commander of the guard division has a brand new Rhino destined for the army diverted to your chapter"; - scr_add_vehicle("Rhino"); - } else if (_roll>=70 ){ - var _wanted_types = ["Ice","Desert","Agri","Lava","Death"]; - var _star = scr_get_stars(true,[],_wanted_types)[0]; - _text += "During the concourse that follows with the fleet command your marines learn of a old battle ground discovered on {_star.name}."; - _text += "According too intel it appeared to be an old astartes battle ground from an unknown age, communications have been passed onto the adeptus mechanicus who will no doubt pick the site clean should they reach it befre you do"; - - var _planet = scr_get_planet_with_type(_wanted_types); - var _battle_ground = new NewPlanetFeature(P_features.AstartesBattleGround); - - _battle_ground.player_hidden = false; - - _star.add_feature(_planet,_battle_ground); - } - scr_popup( - "Trophy Delivered ", - _text, - ); - } - } - } -} //TODO allow most of these functions to be condensed and allow arrays of problems or planets and maybe increase filtering options diff --git a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml index 60c65b91b4..89e5b400a4 100644 --- a/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml +++ b/scripts/scr_planet_setup_functions/scr_planet_setup_functions.gml @@ -453,7 +453,7 @@ function setup_star_planet_defualts(){ if (goo==0){ switch (ranb){ case 1: - array_push(p_feature[i], new PlanetFeature(P_features.Sororitas_Cathedral)) + array_push(p_feature[i], new PlanetFeature(P_features.SororitasCathedral)) if (p_heresy[i]>10) then p_heresy[i]-=10; p_sisters[i]=choose(2,2,3); adjust_influence(eFACTION.Ecclesiarchy, (p_sisters[i]*10)-irandom(3), i) diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index e70658cb69..891eb67ee9 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -1,5 +1,5 @@ enum P_features { - Sororitas_Cathedral, + SororitasCathedral, NecronTomb, Artifact, STCFragment, @@ -135,7 +135,7 @@ function PlanetFeature(feature_type, other_data={}) constructor{ cave_depth =irandom(3);//allow_multiple levels of caves, option to go deeper planet_display = "Unexplored Cave Network"; break; - case P_features.Sororitas_Cathedral: + case P_features.SororitasCathedral: player_hidden = 1; planet_display = "Sororitas Cathedral"; break; @@ -407,7 +407,7 @@ function scr_planetary_feature(planet_num) { feat.player_hidden =0; var numeral_n = planet_numeral_name(planet_num); switch (feat.f_type){ - case P_features.Sororitas_Cathedral: + case P_features.SororitasCathedral: if (obj_controller.known[eFACTION.Ecclesiarchy]=0) then obj_controller.known[eFACTION.Ecclesiarchy]=1; var lop=$"Sororitas Cathedral discovered on {numeral_n}."; scr_alert("green","feature",lop,x,y); diff --git a/scripts/scr_trade/scr_trade.gml b/scripts/scr_trade/scr_trade.gml index 09975ba533..3def3a9c33 100644 --- a/scripts/scr_trade/scr_trade.gml +++ b/scripts/scr_trade/scr_trade.gml @@ -226,7 +226,7 @@ function TradeAttempt(diplomacy) constructor{ repeat(planets){ q+=1; if (p_owner[q]=5) then ahuh=1; - if (p_owner[q]<6) and (planet_feature_bool(p_feature[q],P_features.Sororitas_Cathedral) == 1) then ahuh=1; + if (p_owner[q]<6) and (planet_feature_bool(p_feature[q],P_features.SororitasCathedral) == 1) then ahuh=1; } if (ahuh=1){ array_push(viable_faction_trade_stars, id);