From 9ffaad94968ad0c079c1b6ba50b97d2bf3162b87 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 7 Dec 2024 11:57:13 +0000 Subject: [PATCH 1/3] fix index problem with refugess ships --- ChapterMaster.yyp | 125 +++++++++++++----- fonts/fnt_menu/fnt_menu.old.png | Bin 28184 -> 28184 bytes fonts/fnt_menu/fnt_menu.old.yy | 2 +- fonts/fnt_menu/fnt_menu.png | Bin 28184 -> 28184 bytes objects/obj_drop_select/obj_drop_select.yy | 2 +- objects/obj_star_select/obj_star_select.yy | 4 +- rooms/Game/Game.yy | 1 + scripts/scr_PlanetData/scr_PlanetData.yy | 11 ++ scripts/scr_apothecarium/scr_apothecarium.yy | 11 ++ .../scr_complex_colour_kit.yy | 11 ++ .../scr_drop_select_function.yy | 11 ++ .../scr_equipment_struct.yy | 11 ++ .../scr_get_item_names/scr_get_item_names.yy | 11 ++ scripts/scr_livery_setup/scr_livery_setup.yy | 11 ++ .../scr_ork_fleet_functions.gml | 25 ++-- .../scr_player_fleet_combat_functions.yy | 11 ++ scripts/scr_roster/scr_roster.yy | 11 ++ .../scr_specialist_point_handler.yy | 11 ++ .../scr_specialist_points.yy | 11 ++ .../scr_sprite_functions.yy | 11 ++ .../scr_sprite_helpers/scr_sprite_helpers.yy | 11 ++ scripts/scr_unit_traits/scr_unit_traits.yy | 11 ++ .../full_livery_shader/full_livery_shader.yy | 10 ++ sprites/Sprite544/Sprite544.yy | 74 +++++++++++ sprites/spr_bionics_arm/spr_bionics_arm.yy | 3 +- .../spr_chaplain_skull_helm.yy | 10 +- sprites/spr_da_backpack/spr_da_backpack.yy | 4 +- .../spr_da_term_honor/spr_da_term_honor.yy | 2 +- .../spr_faction_icons/spr_faction_icons.yy | 104 +++++++++++++++ sprites/spr_gear_chap/spr_gear_chap.yy | 4 +- .../spr_gear_librarian/spr_gear_librarian.yy | 74 +++++++++++ .../spr_gothic_numbers_right_pauldron.yy | 94 +++++++++++++ .../spr_indomitus_backpack_variants.yy | 78 +++++++++++ .../spr_indomitus_chest_variants.yy | 78 +++++++++++ .../spr_indomitus_complex.yy | 74 +++++++++++ .../spr_indomitus_left_arm.yy | 74 +++++++++++ .../spr_indomitus_leg_variants.yy | 78 +++++++++++ .../spr_indomitus_right_arm.yy | 74 +++++++++++ sprites/spr_mk3_complex/spr_mk3_complex.yy | 74 +++++++++++ .../spr_mk3_complex_backpack.yy | 74 +++++++++++ .../spr_mk3_head_variants.yy | 80 +++++++++++ sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy | 74 +++++++++++ .../spr_mk3_left_trim/spr_mk3_left_trim.yy | 80 +++++++++++ .../spr_mk3_right_arm/spr_mk3_right_arm.yy | 74 +++++++++++ .../spr_mk3_right_trim/spr_mk3_right_trim.yy | 80 +++++++++++ .../spr_mk4_chest_variants.yy | 80 +++++++++++ sprites/spr_mk4_complex/spr_mk4_complex.yy | 74 +++++++++++ .../spr_mk4_complex_backpack.yy | 74 +++++++++++ sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy | 74 +++++++++++ .../spr_mk4_left_trim/spr_mk4_left_trim.yy | 82 ++++++++++++ .../spr_mk4_leg_variants.yy | 80 +++++++++++ .../spr_mk4_mouth_variants.yy | 82 ++++++++++++ .../spr_mk4_right_arm/spr_mk4_right_arm.yy | 74 +++++++++++ .../spr_mk4_right_trim/spr_mk4_right_trim.yy | 82 ++++++++++++ sprites/spr_mk5_complex/spr_mk5_complex.yy | 74 +++++++++++ .../spr_mk5_complex_backpack.yy | 74 +++++++++++ .../spr_mk5_head_variants.yy | 74 +++++++++++ sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy | 74 +++++++++++ .../spr_mk5_right_arm/spr_mk5_right_arm.yy | 74 +++++++++++ sprites/spr_mk6_complex/spr_mk6_complex.yy | 74 +++++++++++ .../spr_mk6_complex_backpack.yy | 74 +++++++++++ sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy | 74 +++++++++++ .../spr_mk6_right_arm/spr_mk6_right_arm.yy | 74 +++++++++++ .../spr_mk7_chest_variants.yy | 82 ++++++++++++ sprites/spr_mk7_complex/spr_mk7_complex.yy | 74 +++++++++++ .../spr_mk7_complex_backpack.yy | 74 +++++++++++ .../spr_mk7_full_colour.yy | 80 +++++++++++ sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy | 74 +++++++++++ .../spr_mk7_left_trim/spr_mk7_left_trim.yy | 80 +++++++++++ .../spr_mk7_leg_variants.yy | 78 +++++++++++ .../spr_mk7_mouth_variants.yy | 80 +++++++++++ .../spr_mk7_right_arm/spr_mk7_right_arm.yy | 74 +++++++++++ .../spr_mk7_right_trim/spr_mk7_right_trim.yy | 80 +++++++++++ .../spr_mk7_thorax_variants.yy | 84 ++++++++++++ sprites/spr_mk8_complex/spr_mk8_complex.yy | 74 +++++++++++ .../spr_mk8_complex_backpack.yy | 74 +++++++++++ sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy | 74 +++++++++++ .../spr_mk8_right_arm/spr_mk8_right_arm.yy | 74 +++++++++++ .../spr_numeral_left_knee.yy | 94 +++++++++++++ sprites/spr_pa_arms/spr_pa_arms.yy | 3 +- .../spr_pa_arms_ornate/spr_pa_arms_ornate.yy | 3 +- sprites/spr_pa_hands/spr_pa_hands.yy | 4 +- .../spr_pack_brazier2/spr_pack_brazier2.yy | 74 +++++++++++ .../spr_pack_brazier3/spr_pack_brazier3.yy | 74 +++++++++++ .../spr_pack_devastator.yy | 10 +- sprites/spr_pack_jump/spr_pack_jump.yy | 4 +- sprites/spr_scout_arms/spr_scout_arms.yy | 8 +- .../spr_scout_colors2/spr_scout_colors2.yy | 6 +- .../spr_tartaros_complex.yy | 74 +++++++++++ .../spr_tartaros_left_arm.yy | 74 +++++++++++ .../spr_tartaros_right_arm.yy | 74 +++++++++++ .../spr_terminator_arms.yy | 11 +- .../spr_terminator_hands.yy | 8 +- .../spr_weapon_autocannon.yy | 4 +- .../spr_weapon_autocannon2.yy | 74 +++++++++++ .../spr_weapon_bolter/spr_weapon_bolter.yy | 22 ++- .../spr_weapon_boltpis/spr_weapon_boltpis.yy | 16 +-- .../spr_weapon_boltstorm_gauntlet_small.yy | 4 +- .../spr_weapon_chainfist_small.yy | 4 +- sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy | 22 ++- .../spr_weapon_chsword/spr_weapon_chsword.yy | 18 +-- .../spr_weapon_colors/spr_weapon_colors.yy | 4 +- .../spr_weapon_comflamer.yy | 18 ++- .../spr_weapon_comgrav/spr_weapon_comgrav.yy | 74 +++++++++++ .../spr_weapon_commelta.yy | 74 +++++++++++ .../spr_weapon_complas/spr_weapon_complas.yy | 74 +++++++++++ .../spr_weapon_crozarc/spr_weapon_crozarc.yy | 4 +- .../spr_weapon_eldsword.yy | 4 +- sprites/spr_weapon_evisc/spr_weapon_evisc.yy | 4 +- .../spr_weapon_flamer/spr_weapon_flamer.yy | 22 ++- .../spr_weapon_frcstaff.yy | 18 +-- .../spr_weapon_grav_cannon.yy | 30 ++--- .../spr_weapon_grav_gun.yy | 14 +- .../spr_weapon_grav_pistol.yy | 14 +- .../spr_weapon_hand_flamer.yy | 14 +- sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy | 4 +- .../spr_weapon_hflamer/spr_weapon_hflamer.yy | 4 +- .../spr_weapon_hthhammer.yy | 4 +- .../spr_weapon_inferno/spr_weapon_inferno.yy | 18 ++- sprites/spr_weapon_knife/spr_weapon_knife.yy | 22 ++- sprites/spr_weapon_lasca/spr_weapon_lasca.yy | 4 +- .../spr_weapon_lightning1.yy | 4 +- .../spr_weapon_mace_of_absolution.yy | 74 +++++++++++ sprites/spr_weapon_melta/spr_weapon_melta.yy | 18 ++- .../spr_weapon_missile/spr_weapon_missile.yy | 20 ++- .../spr_weapon_mmelta/spr_weapon_mmelta.yy | 4 +- sprites/spr_weapon_plasc/spr_weapon_plasc.yy | 4 +- sprites/spr_weapon_plasg/spr_weapon_plasg.yy | 10 +- sprites/spr_weapon_plasp/spr_weapon_plasp.yy | 16 +-- .../spr_weapon_powaxe/spr_weapon_powaxe.yy | 26 ++-- .../spr_weapon_powfist/spr_weapon_powfist.yy | 4 +- .../spr_weapon_powfist2.yy | 4 +- .../spr_weapon_powfist_old.yy | 4 +- .../spr_weapon_powmace/spr_weapon_powmace.yy | 24 ++-- .../spr_weapon_powmaul/spr_weapon_powmaul.yy | 18 +-- .../spr_weapon_powspear.yy | 18 +-- .../spr_weapon_powspear2.yy | 4 +- .../spr_weapon_powspear3.yy | 10 +- .../spr_weapon_powswo/spr_weapon_powswo.yy | 18 +-- .../spr_weapon_relbla/spr_weapon_relbla.yy | 4 +- .../spr_weapon_relic_blade.yy | 4 +- .../spr_weapon_sbolter/spr_weapon_sbolter.yy | 20 ++- .../spr_weapon_sniper/spr_weapon_sniper.yy | 24 ++-- .../spr_weapon_stalker/spr_weapon_stalker.yy | 20 ++- .../spr_weapon_standard.yy | 4 +- .../spr_weapon_thhammer.yy | 4 +- .../spr_ws_mk3__pualdron_veteran.yy | 74 +++++++++++ .../spr_ws_mk4_monovisor.yy | 74 +++++++++++ .../spr_ws_mk7_scar_of_the_ancients.yy | 74 +++++++++++ 149 files changed, 5486 insertions(+), 413 deletions(-) create mode 100644 scripts/scr_PlanetData/scr_PlanetData.yy create mode 100644 scripts/scr_apothecarium/scr_apothecarium.yy create mode 100644 scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy create mode 100644 scripts/scr_drop_select_function/scr_drop_select_function.yy create mode 100644 scripts/scr_equipment_struct/scr_equipment_struct.yy create mode 100644 scripts/scr_get_item_names/scr_get_item_names.yy create mode 100644 scripts/scr_livery_setup/scr_livery_setup.yy create mode 100644 scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy create mode 100644 scripts/scr_roster/scr_roster.yy create mode 100644 scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy create mode 100644 scripts/scr_specialist_points/scr_specialist_points.yy create mode 100644 scripts/scr_sprite_functions/scr_sprite_functions.yy create mode 100644 scripts/scr_sprite_helpers/scr_sprite_helpers.yy create mode 100644 scripts/scr_unit_traits/scr_unit_traits.yy create mode 100644 shaders/full_livery_shader/full_livery_shader.yy create mode 100644 sprites/Sprite544/Sprite544.yy create mode 100644 sprites/spr_faction_icons/spr_faction_icons.yy create mode 100644 sprites/spr_gear_librarian/spr_gear_librarian.yy create mode 100644 sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy create mode 100644 sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy create mode 100644 sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy create mode 100644 sprites/spr_indomitus_complex/spr_indomitus_complex.yy create mode 100644 sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy create mode 100644 sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy create mode 100644 sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy create mode 100644 sprites/spr_mk3_complex/spr_mk3_complex.yy create mode 100644 sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy create mode 100644 sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy create mode 100644 sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy create mode 100644 sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy create mode 100644 sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy create mode 100644 sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy create mode 100644 sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy create mode 100644 sprites/spr_mk4_complex/spr_mk4_complex.yy create mode 100644 sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy create mode 100644 sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy create mode 100644 sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy create mode 100644 sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy create mode 100644 sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy create mode 100644 sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy create mode 100644 sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy create mode 100644 sprites/spr_mk5_complex/spr_mk5_complex.yy create mode 100644 sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy create mode 100644 sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy create mode 100644 sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy create mode 100644 sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy create mode 100644 sprites/spr_mk6_complex/spr_mk6_complex.yy create mode 100644 sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy create mode 100644 sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy create mode 100644 sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy create mode 100644 sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy create mode 100644 sprites/spr_mk7_complex/spr_mk7_complex.yy create mode 100644 sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy create mode 100644 sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy create mode 100644 sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy create mode 100644 sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy create mode 100644 sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy create mode 100644 sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy create mode 100644 sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy create mode 100644 sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy create mode 100644 sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy create mode 100644 sprites/spr_mk8_complex/spr_mk8_complex.yy create mode 100644 sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy create mode 100644 sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy create mode 100644 sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy create mode 100644 sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy create mode 100644 sprites/spr_pack_brazier2/spr_pack_brazier2.yy create mode 100644 sprites/spr_pack_brazier3/spr_pack_brazier3.yy create mode 100644 sprites/spr_tartaros_complex/spr_tartaros_complex.yy create mode 100644 sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy create mode 100644 sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy create mode 100644 sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy create mode 100644 sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy create mode 100644 sprites/spr_weapon_commelta/spr_weapon_commelta.yy create mode 100644 sprites/spr_weapon_complas/spr_weapon_complas.yy create mode 100644 sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy create mode 100644 sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy create mode 100644 sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy create mode 100644 sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 0ab56fc326..d41af64106 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -61,8 +61,17 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"arms_hands","folderPath":"folders/Sprites/Marine Viewer/arms_hands.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"bionics","folderPath":"folders/Sprites/Marine Viewer/bionics.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"body_types","folderPath":"folders/Sprites/Marine Viewer/body_types.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"indomitus_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_3_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_4_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_5_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_6_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_7_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_8_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"specialist","folderPath":"folders/Sprites/Marine Viewer/body_types/specialist.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"dark_angels_specials","folderPath":"folders/Sprites/Marine Viewer/body_types/specialist/dark_angels_specials.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"white_scars_specials","folderPath":"folders/Sprites/Marine Viewer/body_types/specialist/white_scars_specials.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"tartaros_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"decorations","folderPath":"folders/Sprites/Marine Viewer/decorations.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"deprecated","folderPath":"folders/Sprites/Marine Viewer/deprecated.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"dreadnought","folderPath":"folders/Sprites/Marine Viewer/dreadnought.yy",}, @@ -71,8 +80,12 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"helms","folderPath":"folders/Sprites/Marine Viewer/helms.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"dark_angels","folderPath":"folders/Sprites/Marine Viewer/helms/dark_angels.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"packs","folderPath":"folders/Sprites/Marine Viewer/packs.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"unused","folderPath":"folders/Sprites/Marine Viewer/unused.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"weapons_terminator","folderPath":"folders/Sprites/Marine Viewer/weapons_terminator.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"weapons","folderPath":"folders/Sprites/Marine Viewer/weapons.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"heavy_ranged","folderPath":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"melee","folderPath":"folders/Sprites/Marine Viewer/weapons/melee.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"ranged","folderPath":"folders/Sprites/Marine Viewer/weapons/ranged.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"New Ground","folderPath":"folders/Sprites/New Ground.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"New UI","folderPath":"folders/Sprites/New UI.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Ally Splash","folderPath":"folders/Sprites/New UI/Ally Splash.yy",}, @@ -94,32 +107,7 @@ ], "IncludedFiles": [ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"custom_icons_help.txt","CopyToMask":153157610357391598,"filePath":"datafiles/icons",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"creation_icons.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing1.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing2.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing3.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing4.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing5.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing7.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing8.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"instructions.txt","CopyToMask":9223372036854775807,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"lamenters_alternate.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main1.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main2.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main3.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main4.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main5.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main6.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main7.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main8.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main9.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other1.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other3.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other5.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other6.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other7.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"slate1.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"slate2.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"advisor1.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"advisor11.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"advisor12.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, @@ -336,6 +324,7 @@ {"id":{"name":"spr_creation_icon","path":"sprites/spr_creation_icon/spr_creation_icon.yy",},}, {"id":{"name":"spr_weapon_boltstorm_gauntlet","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},}, {"id":{"name":"spr_cm_specialty","path":"sprites/spr_cm_specialty/spr_cm_specialty.yy",},}, + {"id":{"name":"scr_drop_select_function","path":"scripts/scr_drop_select_function/scr_drop_select_function.yy",},}, {"id":{"name":"spr_planet_splash","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},}, {"id":{"name":"spr_creation_arrow","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},}, {"id":{"name":"spr_creation_check","path":"sprites/spr_creation_check/spr_creation_check.yy",},}, @@ -346,6 +335,7 @@ {"id":{"name":"spr_creation_other","path":"sprites/spr_creation_other/spr_creation_other.yy",},}, {"id":{"name":"spr_generic_sgt_mk4","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},}, {"id":{"name":"spr_creation_nosplash","path":"sprites/spr_creation_nosplash/spr_creation_nosplash.yy",},}, + {"id":{"name":"spr_mk5_complex_backpack","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},}, {"id":{"name":"spr_rg_mk6_helm","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},}, {"id":{"name":"spr_creation_slate","path":"sprites/spr_creation_slate/spr_creation_slate.yy",},}, {"id":{"name":"spr_gear_halo","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},}, @@ -388,7 +378,9 @@ {"id":{"name":"spr_termi_wep_fix","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},}, {"id":{"name":"spr_honor_helm","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},}, {"id":{"name":"spr_pack_brazier","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},}, + {"id":{"name":"spr_mk7_left_trim","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},}, {"id":{"name":"spr_pack_arm","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},}, + {"id":{"name":"spr_mk7_leg_variants","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},}, {"id":{"name":"spr_pack_arms","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},}, {"id":{"name":"spr_pack_jump","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},}, {"id":{"name":"scr_forge_world_functions","path":"scripts/scr_forge_world_functions/scr_forge_world_functions.yy",},}, @@ -397,6 +389,7 @@ {"id":{"name":"spr_weapon_blank","path":"sprites/spr_weapon_blank/spr_weapon_blank.yy",},}, {"id":{"name":"scr_draw_rectangle","path":"scripts/scr_draw_rectangle/scr_draw_rectangle.yy",},}, {"id":{"name":"scr_buttons","path":"scripts/scr_buttons/scr_buttons.yy",},}, + {"id":{"name":"spr_mk6_complex","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},}, {"id":{"name":"spr_purity_s","path":"sprites/spr_purity_s/spr_purity_s.yy",},}, {"id":{"name":"spr_weapon_boltpis","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},}, {"id":{"name":"spr_weapon_bolter","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},}, @@ -409,6 +402,7 @@ {"id":{"name":"spr_weapon_hbolt","path":"sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy",},}, {"id":{"name":"spr_weapon_mmelta","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},}, {"id":{"name":"spr_weapon_assca","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},}, + {"id":{"name":"spr_mk6_complex_backpack","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},}, {"id":{"name":"spr_weapon_lasca","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},}, {"id":{"name":"spr_generic_sgt_mk7","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},}, {"id":{"name":"spr_weapon_plasg","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},}, @@ -426,6 +420,7 @@ {"id":{"name":"spr_weapon_thhammer","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},}, {"id":{"name":"spr_weapon_evisc","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},}, {"id":{"name":"spr_weapon_powaxe","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},}, + {"id":{"name":"spr_weapon_complas","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},}, {"id":{"name":"spr_weapon_chaxe","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},}, {"id":{"name":"spr_weapon_powswo","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},}, {"id":{"name":"spr_weapon_powspear","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},}, @@ -443,6 +438,7 @@ {"id":{"name":"scr_star_travel_algorithm","path":"scripts/scr_star_travel_algorithm/scr_star_travel_algorithm.yy",},}, {"id":{"name":"spr_weapon_inferno","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},}, {"id":{"name":"spr_cloth_tabbard","path":"sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy",},}, + {"id":{"name":"scr_equipment_struct","path":"scripts/scr_equipment_struct/scr_equipment_struct.yy",},}, {"id":{"name":"spr_weapon_relbla","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},}, {"id":{"name":"spr_weapon_storm","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},}, {"id":{"name":"spr_weapon_stalker","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},}, @@ -466,6 +462,7 @@ {"id":{"name":"spr_loadbar","path":"sprites/spr_loadbar/spr_loadbar.yy",},}, {"id":{"name":"scr_mission_functions","path":"scripts/scr_mission_functions/scr_mission_functions.yy",},}, {"id":{"name":"spr_loadbar_empty","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},}, + {"id":{"name":"spr_mk8_right_arm","path":"sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy",},}, {"id":{"name":"spr_loadbar_cover","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},}, {"id":{"name":"scr_ground_ai_helpers","path":"scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.yy",},}, {"id":{"name":"spr_load_text","path":"sprites/spr_load_text/spr_load_text.yy",},}, @@ -475,16 +472,17 @@ {"id":{"name":"scr_load_controller","path":"scripts/scr_load_controller/scr_load_controller.yy",},}, {"id":{"name":"spr_formation_arrow","path":"sprites/spr_formation_arrow/spr_formation_arrow.yy",},}, {"id":{"name":"scr_player_fleet_functions","path":"scripts/scr_player_fleet_functions/scr_player_fleet_functions.yy",},}, + {"id":{"name":"spr_mk6_right_arm","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},}, {"id":{"name":"spr_formation_splash","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},}, {"id":{"name":"spr_purge_panel","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},}, {"id":{"name":"spr_purge_buttons","path":"sprites/spr_purge_buttons/spr_purge_buttons.yy",},}, {"id":{"name":"spr_mm_butts","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},}, - {"id":{"name":"scr_colour_modifiers","path":"scripts/scr_colour_modifiers/scr_colour_modifiers.yy",},}, {"id":{"name":"spr_mm_glowold","path":"sprites/spr_mm_glowold/spr_mm_glowold.yy",},}, {"id":{"name":"spr_new_ui","path":"sprites/spr_new_ui/spr_new_ui.yy",},}, {"id":{"name":"spr_new_resource","path":"sprites/spr_new_resource/spr_new_resource.yy",},}, {"id":{"name":"spr_warp_level_icon","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},}, {"id":{"name":"spr_new_banner","path":"sprites/spr_new_banner/spr_new_banner.yy",},}, + {"id":{"name":"spr_mk6_left_arm","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},}, {"id":{"name":"spr_new_ui_cover","path":"sprites/spr_new_ui_cover/spr_new_ui_cover.yy",},}, {"id":{"name":"scr_unit_spawn_functions","path":"scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.yy",},}, {"id":{"name":"spr_ui_but_1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},}, @@ -493,8 +491,10 @@ {"id":{"name":"spr_ui_but_4","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},}, {"id":{"name":"spr_ui_hov_1","path":"sprites/spr_ui_hov_1/spr_ui_hov_1.yy",},}, {"id":{"name":"spr_ui_hov_2","path":"sprites/spr_ui_hov_2/spr_ui_hov_2.yy",},}, + {"id":{"name":"spr_mk7_left_arm","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},}, {"id":{"name":"spr_ui_hov_3","path":"sprites/spr_ui_hov_3/spr_ui_hov_3.yy",},}, {"id":{"name":"spr_pa_hands","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},}, + {"id":{"name":"spr_mk7_complex","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},}, {"id":{"name":"scr_image","path":"scripts/scr_image/scr_image.yy",},}, {"id":{"name":"spr_ui_hov_4","path":"sprites/spr_ui_hov_4/spr_ui_hov_4.yy",},}, {"id":{"name":"spr_settings_button","path":"sprites/spr_settings_button/spr_settings_button.yy",},}, @@ -532,8 +532,10 @@ {"id":{"name":"dsgsdgsdg","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},}, {"id":{"name":"spr_loading","path":"sprites/spr_loading/spr_loading.yy",},}, {"id":{"name":"spr_loading2","path":"sprites/spr_loading2/spr_loading2.yy",},}, + {"id":{"name":"spr_mk4_left_trim","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},}, {"id":{"name":"spr_penitent_ui","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},}, {"id":{"name":"sprite230","path":"sprites/sprite230/sprite230.yy",},}, + {"id":{"name":"spr_mk3_left_arm","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},}, {"id":{"name":"spr_fast_forward","path":"sprites/spr_fast_forward/spr_fast_forward.yy",},}, {"id":{"name":"spr_psy_hood","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},}, {"id":{"name":"spr_view_small","path":"sprites/spr_view_small/spr_view_small.yy",},}, @@ -550,8 +552,10 @@ {"id":{"name":"spr_star_screen","path":"sprites/spr_star_screen/spr_star_screen.yy",},}, {"id":{"name":"spr_planet_screen","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},}, {"id":{"name":"spr_red_button","path":"sprites/spr_red_button/spr_red_button.yy",},}, + {"id":{"name":"spr_pack_brazier2","path":"sprites/spr_pack_brazier2/spr_pack_brazier2.yy",},}, {"id":{"name":"spr_popup","path":"sprites/spr_popup/spr_popup.yy",},}, {"id":{"name":"spr_attacked","path":"sprites/spr_attacked/spr_attacked.yy",},}, + {"id":{"name":"scr_unit_traits","path":"scripts/scr_unit_traits/scr_unit_traits.yy",},}, {"id":{"name":"scr_marine_struct","path":"scripts/scr_marine_struct/scr_marine_struct.yy",},}, {"id":{"name":"spr_raid","path":"sprites/spr_raid/spr_raid.yy",},}, {"id":{"name":"spr_purge_1","path":"sprites/spr_purge_1/spr_purge_1.yy",},}, @@ -561,8 +565,11 @@ {"id":{"name":"spr_advisors","path":"sprites/spr_advisors/spr_advisors.yy",},}, {"id":{"name":"spr_diplomacy","path":"sprites/spr_diplomacy/spr_diplomacy.yy",},}, {"id":{"name":"spr_maximus_colors2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},}, + {"id":{"name":"spr_indomitus_leg_variants","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},}, {"id":{"name":"spr_diplomacy_dae","path":"sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy",},}, {"id":{"name":"sprite267","path":"sprites/sprite267/sprite267.yy",},}, + {"id":{"name":"spr_mk4_left_arm","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},}, + {"id":{"name":"scr_sprite_functions","path":"scripts/scr_sprite_functions/scr_sprite_functions.yy",},}, {"id":{"name":"spr_master_splash","path":"sprites/spr_master_splash/spr_master_splash.yy",},}, {"id":{"name":"spr_saveload","path":"sprites/spr_saveload/spr_saveload.yy",},}, {"id":{"name":"spr_sw_mk5_helm","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},}, @@ -570,7 +577,9 @@ {"id":{"name":"spr_diplomacy_med","path":"sprites/spr_diplomacy_med/spr_diplomacy_med.yy",},}, {"id":{"name":"spr_diplomacy_defeated","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},}, {"id":{"name":"sprite266","path":"sprites/sprite266/sprite266.yy",},}, + {"id":{"name":"spr_mk3_complex_backpack","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},}, {"id":{"name":"spr_ship_song","path":"sprites/spr_ship_song/spr_ship_song.yy",},}, + {"id":{"name":"spr_tartaros_left_arm","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},}, {"id":{"name":"sprite235","path":"sprites/sprite235/sprite235.yy",},}, {"id":{"name":"spr_bionics_leg_2","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},}, {"id":{"name":"spr_ship_bb","path":"sprites/spr_ship_bb/spr_ship_bb.yy",},}, @@ -582,6 +591,7 @@ {"id":{"name":"scr_draw_unit_stat_data","path":"scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.yy",},}, {"id":{"name":"spr_ship_glad","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},}, {"id":{"name":"spr_ship_hunt","path":"sprites/spr_ship_hunt/spr_ship_hunt.yy",},}, + {"id":{"name":"spr_numeral_left_knee","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},}, {"id":{"name":"spr_luck_icon","path":"sprites/spr_luck_icon/spr_luck_icon.yy",},}, {"id":{"name":"spr_ship_apoc","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},}, {"id":{"name":"spr_ship_nem","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},}, @@ -599,10 +609,13 @@ {"id":{"name":"spr_ship_craftworld","path":"sprites/spr_ship_craftworld/spr_ship_craftworld.yy",},}, {"id":{"name":"spr_binders_robes","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},}, {"id":{"name":"spr_helm_decorations","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},}, + {"id":{"name":"spr_ws_mk7_scar_of_the_ancients","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},}, {"id":{"name":"spr_ship_ammer","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},}, + {"id":{"name":"spr_weapon_autocannon2","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},}, {"id":{"name":"scr_diplomacy_helpers","path":"scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.yy",},}, {"id":{"name":"spr_dread_iron_clad","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},}, {"id":{"name":"scr_has_adv","path":"scripts/scr_has_adv/scr_has_adv.yy",},}, + {"id":{"name":"spr_mk3_right_trim","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},}, {"id":{"name":"spr_ship_deth","path":"sprites/spr_ship_deth/spr_ship_deth.yy",},}, {"id":{"name":"spr_ship_gorbag","path":"sprites/spr_ship_gorbag/spr_ship_gorbag.yy",},}, {"id":{"name":"spr_ship_kroozer","path":"sprites/spr_ship_kroozer/spr_ship_kroozer.yy",},}, @@ -611,17 +624,21 @@ {"id":{"name":"spr_ih_mk6_helm","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},}, {"id":{"name":"spr_mk5_colors","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},}, {"id":{"name":"spr_ship_slam","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},}, + {"id":{"name":"spr_mk7_right_trim","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},}, {"id":{"name":"spr_ship_hulk","path":"sprites/spr_ship_hulk/spr_ship_hulk.yy",},}, {"id":{"name":"spr_fighta","path":"sprites/spr_fighta/spr_fighta.yy",},}, + {"id":{"name":"spr_weapon_comgrav","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},}, {"id":{"name":"spr_weapon_hand_flamer","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},}, {"id":{"name":"spr_ship_void","path":"sprites/spr_ship_void/spr_ship_void.yy",},}, {"id":{"name":"spr_faith_icon","path":"sprites/spr_faith_icon/spr_faith_icon.yy",},}, {"id":{"name":"spr_mk7_colors","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},}, {"id":{"name":"spr_mk4_colors","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},}, {"id":{"name":"spr_ship_shadow","path":"sprites/spr_ship_shadow/spr_ship_shadow.yy",},}, + {"id":{"name":"spr_mk4_complex_backpack","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},}, {"id":{"name":"spr_ws_mk5_helm","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},}, {"id":{"name":"spr_ship_aconite","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},}, {"id":{"name":"spr_ship_hellebore","path":"sprites/spr_ship_hellebore/spr_ship_hellebore.yy",},}, + {"id":{"name":"spr_mk5_right_arm","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},}, {"id":{"name":"spr_darkstar","path":"sprites/spr_darkstar/spr_darkstar.yy",},}, {"id":{"name":"sprite221","path":"sprites/sprite221/sprite221.yy",},}, {"id":{"name":"spr_ship_custodian","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},}, @@ -633,7 +650,9 @@ {"id":{"name":"spr_ship_castellan","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},}, {"id":{"name":"spr_manta","path":"sprites/spr_manta/spr_manta.yy",},}, {"id":{"name":"spr_ship_leviathan","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},}, + {"id":{"name":"spr_mk8_complex","path":"sprites/spr_mk8_complex/spr_mk8_complex.yy",},}, {"id":{"name":"spr_ship_razorfiend","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},}, + {"id":{"name":"spr_mk7_right_arm","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},}, {"id":{"name":"scr_wait_and_execute","path":"scripts/scr_wait_and_execute/scr_wait_and_execute.yy",},}, {"id":{"name":"spr_ship_stalker","path":"sprites/spr_ship_stalker/spr_ship_stalker.yy",},}, {"id":{"name":"spr_weapon_plasc","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},}, @@ -672,7 +691,9 @@ {"id":{"name":"spr_battle_block2","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},}, {"id":{"name":"spr_weapon_storm2","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},}, {"id":{"name":"spr_rg_mk7_helm","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},}, + {"id":{"name":"scr_apothecarium","path":"scripts/scr_apothecarium/scr_apothecarium.yy",},}, {"id":{"name":"spr_pa_arms","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},}, + {"id":{"name":"scr_complex_colour_kit","path":"scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy",},}, {"id":{"name":"spr_ws_mk6_helm","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},}, {"id":{"name":"spr_postbattle","path":"sprites/spr_postbattle/spr_postbattle.yy",},}, {"id":{"name":"spr_postbattle_space","path":"sprites/spr_postbattle_space/spr_postbattle_space.yy",},}, @@ -685,14 +706,17 @@ {"id":{"name":"spr_melta","path":"sprites/spr_melta/spr_melta.yy",},}, {"id":{"name":"spr_carrion_breath","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},}, {"id":{"name":"spr_bullet","path":"sprites/spr_bullet/spr_bullet.yy",},}, + {"id":{"name":"Sprite544","path":"sprites/Sprite544/Sprite544.yy",},}, {"id":{"name":"spr_tech_area_pad","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},}, {"id":{"name":"spr_bolt","path":"sprites/spr_bolt/spr_bolt.yy",},}, {"id":{"name":"spr_pulse","path":"sprites/spr_pulse/spr_pulse.yy",},}, {"id":{"name":"spr_railgun","path":"sprites/spr_railgun/spr_railgun.yy",},}, + {"id":{"name":"spr_mk7_full_colour","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},}, {"id":{"name":"spr_ground_las","path":"sprites/spr_ground_las/spr_ground_las.yy",},}, {"id":{"name":"spr_weapon_standard2","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},}, {"id":{"name":"spr_green_las","path":"sprites/spr_green_las/spr_green_las.yy",},}, {"id":{"name":"spr_ground_conv","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},}, + {"id":{"name":"spr_mk4_right_trim","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},}, {"id":{"name":"spr_ground_plasma","path":"sprites/spr_ground_plasma/spr_ground_plasma.yy",},}, {"id":{"name":"spr_glob","path":"sprites/spr_glob/spr_glob.yy",},}, {"id":{"name":"spr_cannon","path":"sprites/spr_cannon/spr_cannon.yy",},}, @@ -705,10 +729,12 @@ {"id":{"name":"UIComponents","path":"scripts/UIComponents/UIComponents.yy",},}, {"id":{"name":"spr_mahreen_gun","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},}, {"id":{"name":"spr_star","path":"sprites/spr_star/spr_star.yy",},}, + {"id":{"name":"spr_mk3_right_arm","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},}, {"id":{"name":"spr_da_mk5","path":"sprites/spr_da_mk5/spr_da_mk5.yy",},}, {"id":{"name":"spr_dexterity_icon","path":"sprites/spr_dexterity_icon/spr_dexterity_icon.yy",},}, {"id":{"name":"spr_star_hulk","path":"sprites/spr_star_hulk/spr_star_hulk.yy",},}, {"id":{"name":"spr_warp_storm","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},}, + {"id":{"name":"spr_mk4_right_arm","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},}, {"id":{"name":"sprite205","path":"sprites/sprite205/sprite205.yy",},}, {"id":{"name":"spr_happenings_green","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},}, {"id":{"name":"spr_happenings_red","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},}, @@ -724,6 +750,7 @@ {"id":{"name":"spr_ih_mk5_helm","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},}, {"id":{"name":"spr_fleet_imperial","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},}, {"id":{"name":"light_dark_shader","path":"shaders/light_dark_shader/light_dark_shader.yy",},}, + {"id":{"name":"spr_indomitus_chest_variants","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},}, {"id":{"name":"spr_fleet_mechanicus","path":"sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy",},}, {"id":{"name":"spr_mm_glow","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},}, {"id":{"name":"spr_fleet_inquisition","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},}, @@ -738,10 +765,12 @@ {"id":{"name":"spr_ork_target","path":"sprites/spr_ork_target/spr_ork_target.yy",},}, {"id":{"name":"sprite269","path":"sprites/sprite269/sprite269.yy",},}, {"id":{"name":"spr_mar_fire_body1","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},}, + {"id":{"name":"spr_tartaros_complex","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},}, {"id":{"name":"spr_mar_fire_body2","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},}, {"id":{"name":"spr_mar_fire_body3","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},}, {"id":{"name":"spr_mar_fire_pauldron1","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},}, {"id":{"name":"spr_mar_fire_pauldron2","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},}, + {"id":{"name":"spr_mk7_complex_backpack","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},}, {"id":{"name":"spr_mar_walk_body1","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},}, {"id":{"name":"spr_mar_walk_body2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},}, {"id":{"name":"spr_mar_walk_body3","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},}, @@ -770,6 +799,7 @@ {"id":{"name":"snd_postbattle","path":"sounds/snd_postbattle/snd_postbattle.yy",},}, {"id":{"name":"snd_defeat","path":"sounds/snd_defeat/snd_defeat.yy",},}, {"id":{"name":"snd_buzz","path":"sounds/snd_buzz/snd_buzz.yy",},}, + {"id":{"name":"spr_indomitus_right_arm","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},}, {"id":{"name":"scr_unit_quick_find_pane","path":"scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.yy",},}, {"id":{"name":"snd_redownload","path":"sounds/snd_redownload/snd_redownload.yy",},}, {"id":{"name":"snd_click","path":"sounds/snd_click/snd_click.yy",},}, @@ -809,12 +839,15 @@ {"id":{"name":"scr_json_functions","path":"scripts/scr_json_functions/scr_json_functions.yy",},}, {"id":{"name":"scr_colors_initialize","path":"scripts/scr_colors_initialize/scr_colors_initialize.yy",},}, {"id":{"name":"scr_shader_initialize","path":"scripts/scr_shader_initialize/scr_shader_initialize.yy",},}, + {"id":{"name":"spr_indomitus_complex","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},}, {"id":{"name":"spr_sal_mk6_helm","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},}, + {"id":{"name":"spr_mk4_chest_variants","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},}, {"id":{"name":"spr_weapon_boarding","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},}, {"id":{"name":"spr_bionics_hand","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},}, {"id":{"name":"explode_script","path":"scripts/explode_script/explode_script.yy",},}, {"id":{"name":"relative_direction","path":"scripts/relative_direction/relative_direction.yy",},}, {"id":{"name":"draw_line_dashed","path":"scripts/draw_line_dashed/draw_line_dashed.yy",},}, + {"id":{"name":"spr_mk7_mouth_variants","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},}, {"id":{"name":"turn_towards_point","path":"scripts/turn_towards_point/turn_towards_point.yy",},}, {"id":{"name":"spr_forge_points_icon","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},}, {"id":{"name":"scr_display_number","path":"scripts/scr_display_number/scr_display_number.yy",},}, @@ -827,8 +860,6 @@ {"id":{"name":"scr_lines_increase","path":"scripts/scr_lines_increase/scr_lines_increase.yy",},}, {"id":{"name":"scr_save","path":"scripts/scr_save/scr_save.yy",},}, {"id":{"name":"scr_load","path":"scripts/scr_load/scr_load.yy",},}, - {"id":{"name":"file_encrypt","path":"scripts/file_encrypt/file_encrypt.yy",},}, - {"id":{"name":"file_decrypt","path":"scripts/file_decrypt/file_decrypt.yy",},}, {"id":{"name":"spr_charisma_icon","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},}, {"id":{"name":"spr_weapon_hflamer","path":"sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy",},}, {"id":{"name":"spr_mk8_colors","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},}, @@ -842,15 +873,20 @@ {"id":{"name":"spr_servo_arm","path":"sprites/spr_servo_arm/spr_servo_arm.yy",},}, {"id":{"name":"scr_battle_roster","path":"scripts/scr_battle_roster/scr_battle_roster.yy",},}, {"id":{"name":"scr_civil_roster","path":"scripts/scr_civil_roster/scr_civil_roster.yy",},}, + {"id":{"name":"scr_specialist_points","path":"scripts/scr_specialist_points/scr_specialist_points.yy",},}, {"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},}, {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},}, + {"id":{"name":"spr_mk8_left_arm","path":"sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy",},}, {"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},}, {"id":{"name":"spr_um_mk6_helm","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},}, {"id":{"name":"scr_count_forces","path":"scripts/scr_count_forces/scr_count_forces.yy",},}, {"id":{"name":"spr_weapon_powmace","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},}, {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},}, + {"id":{"name":"spr_ws_mk3__pualdron_veteran","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},}, + {"id":{"name":"scr_specialist_point_handler","path":"scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy",},}, {"id":{"name":"scr_ini_ship_cleanup","path":"scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.yy",},}, {"id":{"name":"spr_ultra_honor_guard","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},}, + {"id":{"name":"spr_mk4_mouth_variants","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},}, {"id":{"name":"scr_punit_combat_heplers","path":"scripts/scr_punit_combat_heplers/scr_punit_combat_heplers.yy",},}, {"id":{"name":"spr_weapon_powspear3","path":"sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy",},}, {"id":{"name":"scr_drop_fiddle","path":"scripts/scr_drop_fiddle/scr_drop_fiddle.yy",},}, @@ -868,11 +904,11 @@ {"id":{"name":"scr_weapon","path":"scripts/scr_weapon/scr_weapon.yy",},}, {"id":{"name":"UINodeScripts","path":"scripts/UINodeScripts/UINodeScripts.yy",},}, {"id":{"name":"scr_move_unit_info","path":"scripts/scr_move_unit_info/scr_move_unit_info.yy",},}, + {"id":{"name":"spr_indomitus_backpack_variants","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},}, {"id":{"name":"scr_en_weapon","path":"scripts/scr_en_weapon/scr_en_weapon.yy",},}, - {"id":{"name":"scr_special_weapon","path":"scripts/scr_special_weapon/scr_special_weapon.yy",},}, {"id":{"name":"spr_narthecium_2","path":"sprites/spr_narthecium_2/spr_narthecium_2.yy",},}, {"id":{"name":"scr_vehicle_weapon","path":"scripts/scr_vehicle_weapon/scr_vehicle_weapon.yy",},}, - {"id":{"name":"scr_wep_abbreviate","path":"scripts/scr_wep_abbreviate/scr_wep_abbreviate.yy",},}, + {"id":{"name":"scr_sprite_helpers","path":"scripts/scr_sprite_helpers/scr_sprite_helpers.yy",},}, {"id":{"name":"scr_scrollbar","path":"scripts/scr_scrollbar/scr_scrollbar.yy",},}, {"id":{"name":"scr_thought","path":"scripts/scr_thought/scr_thought.yy",},}, {"id":{"name":"scr_ui_refresh","path":"scripts/scr_ui_refresh/scr_ui_refresh.yy",},}, @@ -891,13 +927,14 @@ {"id":{"name":"scr_ui_diplomacy","path":"scripts/scr_ui_diplomacy/scr_ui_diplomacy.yy",},}, {"id":{"name":"scr_ui_popup","path":"scripts/scr_ui_popup/scr_ui_popup.yy",},}, {"id":{"name":"spr_weapon_plasma_cannon_term","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},}, + {"id":{"name":"spr_weapon_commelta","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},}, {"id":{"name":"scr_ui_formation_bars","path":"scripts/scr_ui_formation_bars/scr_ui_formation_bars.yy",},}, {"id":{"name":"scr_ui_settings","path":"scripts/scr_ui_settings/scr_ui_settings.yy",},}, {"id":{"name":"scr_arti_descr","path":"scripts/scr_arti_descr/scr_arti_descr.yy",},}, {"id":{"name":"spr_terminator_chap","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},}, {"id":{"name":"spr_sal_mk7_helm","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},}, {"id":{"name":"scr_draw_rainbow","path":"scripts/scr_draw_rainbow/scr_draw_rainbow.yy",},}, - {"id":{"name":"scr_weapons_equip","path":"scripts/scr_weapons_equip/scr_weapons_equip.yy",},}, + {"id":{"name":"scr_get_item_names","path":"scripts/scr_get_item_names/scr_get_item_names.yy",},}, {"id":{"name":"spr_chap_area_pad","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},}, {"id":{"name":"scr_master_loc","path":"scripts/scr_master_loc/scr_master_loc.yy",},}, {"id":{"name":"scr_creation","path":"scripts/scr_creation/scr_creation.yy",},}, @@ -908,6 +945,7 @@ {"id":{"name":"spr_dreadnought_chasis_colors","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},}, {"id":{"name":"scr_vehicle_count","path":"scripts/scr_vehicle_count/scr_vehicle_count.yy",},}, {"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},}, + {"id":{"name":"spr_mk8_complex_backpack","path":"sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.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":"spr_leopard_sprite","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},}, @@ -939,6 +977,7 @@ {"id":{"name":"scr_string_functions","path":"scripts/scr_string_functions/scr_string_functions.yy",},}, {"id":{"name":"scr_income","path":"scripts/scr_income/scr_income.yy",},}, {"id":{"name":"scr_apothecary_ship","path":"scripts/scr_apothecary_ship/scr_apothecary_ship.yy",},}, + {"id":{"name":"spr_mk3_complex","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},}, {"id":{"name":"scr_apothecary_ground","path":"scripts/scr_apothecary_ground/scr_apothecary_ground.yy",},}, {"id":{"name":"scr_mission_eta","path":"scripts/scr_mission_eta/scr_mission_eta.yy",},}, {"id":{"name":"obj_garbage_collector","path":"objects/obj_garbage_collector/obj_garbage_collector.yy",},}, @@ -947,8 +986,11 @@ {"id":{"name":"scr_random_event","path":"scripts/scr_random_event/scr_random_event.yy",},}, {"id":{"name":"obj_planet_map","path":"objects/obj_planet_map/obj_planet_map.yy",},}, {"id":{"name":"scr_khornate_fleet_functions","path":"scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.yy",},}, + {"id":{"name":"spr_faction_icons","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},}, {"id":{"name":"scr_random_find","path":"scripts/scr_random_find/scr_random_find.yy",},}, {"id":{"name":"scr_max_marine","path":"scripts/scr_max_marine/scr_max_marine.yy",},}, + {"id":{"name":"spr_mk3_left_trim","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},}, + {"id":{"name":"spr_mk5_left_arm","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},}, {"id":{"name":"scr_random_marine","path":"scripts/scr_random_marine/scr_random_marine.yy",},}, {"id":{"name":"scr_roman","path":"scripts/scr_roman/scr_roman.yy",},}, {"id":{"name":"scr_draw_management_unit","path":"scripts/scr_draw_management_unit/scr_draw_management_unit.yy",},}, @@ -968,13 +1010,13 @@ {"id":{"name":"spr_dread_heavy_bolter","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},}, {"id":{"name":"spr_purity_seal","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},}, {"id":{"name":"scr_zoom","path":"scripts/scr_zoom/scr_zoom.yy",},}, - {"id":{"name":"scr_chapter","path":"scripts/scr_chapter/scr_chapter.yy",},}, {"id":{"name":"scr_map_and_warp_functions","path":"scripts/scr_map_and_warp_functions/scr_map_and_warp_functions.yy",},}, + {"id":{"name":"spr_ws_mk4_monovisor","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},}, {"id":{"name":"scr_chapter_new","path":"scripts/scr_chapter_new/scr_chapter_new.yy",},}, {"id":{"name":"scr_chapter_random","path":"scripts/scr_chapter_random/scr_chapter_random.yy",},}, + {"id":{"name":"spr_gear_librarian","path":"sprites/spr_gear_librarian/spr_gear_librarian.yy",},}, {"id":{"name":"scr_vehicle_order","path":"scripts/scr_vehicle_order/scr_vehicle_order.yy",},}, {"id":{"name":"scr_icon","path":"scripts/scr_icon/scr_icon.yy",},}, - {"id":{"name":"scr_squad_names","path":"scripts/scr_squad_names/scr_squad_names.yy",},}, {"id":{"name":"scr_initialize_custom","path":"scripts/scr_initialize_custom/scr_initialize_custom.yy",},}, {"id":{"name":"scr_roman_numerals","path":"scripts/scr_roman_numerals/scr_roman_numerals.yy",},}, {"id":{"name":"scr_restart_variables","path":"scripts/scr_restart_variables/scr_restart_variables.yy",},}, @@ -1006,11 +1048,13 @@ {"id":{"name":"spr_medicine_icon","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},}, {"id":{"name":"spr_ship_back_black","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},}, {"id":{"name":"action_kill_object","path":"scripts/action_kill_object/action_kill_object.yy",},}, + {"id":{"name":"spr_tartaros_right_arm","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},}, {"id":{"name":"action_restart_game","path":"scripts/action_restart_game/action_restart_game.yy",},}, {"id":{"name":"action_set_alarm","path":"scripts/action_set_alarm/action_set_alarm.yy",},}, {"id":{"name":"action_set_relative","path":"scripts/action_set_relative/action_set_relative.yy",},}, {"id":{"name":"__init_action","path":"scripts/__init_action/__init_action.yy",},}, {"id":{"name":"d3d_set_fog","path":"scripts/d3d_set_fog/d3d_set_fog.yy",},}, + {"id":{"name":"scr_PlanetData","path":"scripts/scr_PlanetData/scr_PlanetData.yy",},}, {"id":{"name":"__init_d3d","path":"scripts/__init_d3d/__init_d3d.yy",},}, {"id":{"name":"draw_set_blend_mode","path":"scripts/draw_set_blend_mode/draw_set_blend_mode.yy",},}, {"id":{"name":"instance_create","path":"scripts/instance_create/instance_create.yy",},}, @@ -1025,9 +1069,11 @@ {"id":{"name":"sReplaceColor","path":"shaders/sReplaceColor/sReplaceColor.yy",},}, {"id":{"name":"fnt_cul_14","path":"fonts/fnt_cul_14/fnt_cul_14.yy",},}, {"id":{"name":"fnt_cul_18","path":"fonts/fnt_cul_18/fnt_cul_18.yy",},}, + {"id":{"name":"spr_mk4_leg_variants","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},}, {"id":{"name":"fnt_40k_10","path":"fonts/fnt_40k_10/fnt_40k_10.yy",},}, {"id":{"name":"fnt_40k_12","path":"fonts/fnt_40k_12/fnt_40k_12.yy",},}, {"id":{"name":"fnt_40k_12i","path":"fonts/fnt_40k_12i/fnt_40k_12i.yy",},}, + {"id":{"name":"spr_indomitus_left_arm","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},}, {"id":{"name":"spr_dread_autocannon","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},}, {"id":{"name":"fnt_40k_14","path":"fonts/fnt_40k_14/fnt_40k_14.yy",},}, {"id":{"name":"fnt_40k_14i","path":"fonts/fnt_40k_14i/fnt_40k_14i.yy",},}, @@ -1043,6 +1089,7 @@ {"id":{"name":"fnt_fancy","path":"fonts/fnt_fancy/fnt_fancy.yy",},}, {"id":{"name":"fnt_menu","path":"fonts/fnt_menu/fnt_menu.yy",},}, {"id":{"name":"spr_dreadnought_decorations","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},}, + {"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},}, {"id":{"name":"fnt_info","path":"fonts/fnt_info/fnt_info.yy",},}, {"id":{"name":"fnt_tiny","path":"fonts/fnt_tiny/fnt_tiny.yy",},}, {"id":{"name":"scr_necron_tombs","path":"scripts/scr_necron_tombs/scr_necron_tombs.yy",},}, @@ -1050,6 +1097,7 @@ {"id":{"name":"fnt_legal","path":"fonts/fnt_legal/fnt_legal.yy",},}, {"id":{"name":"obj_fleet","path":"objects/obj_fleet/obj_fleet.yy",},}, {"id":{"name":"obj_circular","path":"objects/obj_circular/obj_circular.yy",},}, + {"id":{"name":"spr_mk4_complex","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},}, {"id":{"name":"obj_fleet_spawner","path":"objects/obj_fleet_spawner/obj_fleet_spawner.yy",},}, {"id":{"name":"obj_fleet_controller","path":"objects/obj_fleet_controller/obj_fleet_controller.yy",},}, {"id":{"name":"obj_p_ship","path":"objects/obj_p_ship/obj_p_ship.yy",},}, @@ -1077,7 +1125,9 @@ {"id":{"name":"scr_system_search_helpers","path":"scripts/scr_system_search_helpers/scr_system_search_helpers.yy",},}, {"id":{"name":"obj_p_round","path":"objects/obj_p_round/obj_p_round.yy",},}, {"id":{"name":"spr_slate_2","path":"sprites/spr_slate_2/spr_slate_2.yy",},}, + {"id":{"name":"spr_mk7_chest_variants","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},}, {"id":{"name":"obj_en_round","path":"objects/obj_en_round/obj_en_round.yy",},}, + {"id":{"name":"spr_gothic_numbers_right_pauldron","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},}, {"id":{"name":"obj_al_round","path":"objects/obj_al_round/obj_al_round.yy",},}, {"id":{"name":"scr_keyboard_helpers","path":"scripts/scr_keyboard_helpers/scr_keyboard_helpers.yy",},}, {"id":{"name":"obj_en_pulse","path":"objects/obj_en_pulse/obj_en_pulse.yy",},}, @@ -1091,6 +1141,7 @@ {"id":{"name":"obj_enunit","path":"objects/obj_enunit/obj_enunit.yy",},}, {"id":{"name":"scr_log","path":"scripts/scr_log/scr_log.yy",},}, {"id":{"name":"obj_nfort","path":"objects/obj_nfort/obj_nfort.yy",},}, + {"id":{"name":"scr_livery_setup","path":"scripts/scr_livery_setup/scr_livery_setup.yy",},}, {"id":{"name":"obj_temp1","path":"objects/obj_temp1/obj_temp1.yy",},}, {"id":{"name":"obj_temp2","path":"objects/obj_temp2/obj_temp2.yy",},}, {"id":{"name":"obj_temp3","path":"objects/obj_temp3/obj_temp3.yy",},}, @@ -1115,6 +1166,7 @@ {"id":{"name":"obj_restart_vars","path":"objects/obj_restart_vars/obj_restart_vars.yy",},}, {"id":{"name":"obj_formation_bar","path":"objects/obj_formation_bar/obj_formation_bar.yy",},}, {"id":{"name":"obj_dropdown_sel","path":"objects/obj_dropdown_sel/obj_dropdown_sel.yy",},}, + {"id":{"name":"spr_pack_brazier3","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},}, {"id":{"name":"obj_enemy_leftest","path":"objects/obj_enemy_leftest/obj_enemy_leftest.yy",},}, {"id":{"name":"scr_distributions","path":"scripts/scr_distributions/scr_distributions.yy",},}, {"id":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},}, @@ -1123,6 +1175,7 @@ {"id":{"name":"obj_p1_bullet","path":"objects/obj_p1_bullet/obj_p1_bullet.yy",},}, {"id":{"name":"obj_p1_bullet_miss","path":"objects/obj_p1_bullet_miss/obj_p1_bullet_miss.yy",},}, {"id":{"name":"obj_main_menu","path":"objects/obj_main_menu/obj_main_menu.yy",},}, + {"id":{"name":"spr_mk5_complex","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},}, {"id":{"name":"obj_cuicons","path":"objects/obj_cuicons/obj_cuicons.yy",},}, {"id":{"name":"obj_img","path":"objects/obj_img/obj_img.yy",},}, {"id":{"name":"scr_manage_task_selector","path":"scripts/scr_manage_task_selector/scr_manage_task_selector.yy",},}, @@ -1131,9 +1184,12 @@ {"id":{"name":"obj_fade","path":"objects/obj_fade/obj_fade.yy",},}, {"id":{"name":"obj_defeat","path":"objects/obj_defeat/obj_defeat.yy",},}, {"id":{"name":"spr_marine_head","path":"sprites/spr_marine_head/spr_marine_head.yy",},}, + {"id":{"name":"scr_player_fleet_combat_functions","path":"scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy",},}, + {"id":{"name":"spr_mk5_head_variants","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},}, {"id":{"name":"obj_ini","path":"objects/obj_ini/obj_ini.yy",},}, {"id":{"name":"spr_weapon_hthhammer","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},}, {"id":{"name":"obj_controller","path":"objects/obj_controller/obj_controller.yy",},}, + {"id":{"name":"spr_mk7_thorax_variants","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},}, {"id":{"name":"obj_mass_equip","path":"objects/obj_mass_equip/obj_mass_equip.yy",},}, {"id":{"name":"obj_turn_end","path":"objects/obj_turn_end/obj_turn_end.yy",},}, {"id":{"name":"obj_saveload","path":"objects/obj_saveload/obj_saveload.yy",},}, @@ -1151,6 +1207,7 @@ {"id":{"name":"obj_popup","path":"objects/obj_popup/obj_popup.yy",},}, {"id":{"name":"obj_popup_dialogue","path":"objects/obj_popup_dialogue/obj_popup_dialogue.yy",},}, {"id":{"name":"obj_event","path":"objects/obj_event/obj_event.yy",},}, + {"id":{"name":"scr_roster","path":"scripts/scr_roster/scr_roster.yy",},}, {"id":{"name":"obj_event_log","path":"objects/obj_event_log/obj_event_log.yy",},}, {"id":{"name":"scr_get_diag_string","path":"scripts/scr_get_diag_string/scr_get_diag_string.yy",},}, {"id":{"name":"spr_apoth_area_pad","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},}, @@ -1161,6 +1218,7 @@ {"id":{"name":"obj_crusade","path":"objects/obj_crusade/obj_crusade.yy",},}, {"id":{"name":"obj_star","path":"objects/obj_star/obj_star.yy",},}, {"id":{"name":"spr_rack_and_pinion","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},}, + {"id":{"name":"full_livery_shader","path":"shaders/full_livery_shader/full_livery_shader.yy",},}, {"id":{"name":"obj_star_event","path":"objects/obj_star_event/obj_star_event.yy",},}, {"id":{"name":"spr_cog_pinion","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},}, {"id":{"name":"obj_tooltip","path":"objects/obj_tooltip/obj_tooltip.yy",},}, @@ -1171,6 +1229,7 @@ {"id":{"name":"Creation","path":"rooms/Creation/Creation.yy",},}, {"id":{"name":"Game","path":"rooms/Game/Game.yy",},}, {"id":{"name":"Tutorial","path":"rooms/Tutorial/Tutorial.yy",},}, + {"id":{"name":"spr_mk3_head_variants","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},}, {"id":{"name":"scr_draw_text","path":"scripts/scr_draw_text/scr_draw_text.yy",},}, {"id":{"name":"spr_data_slate_border","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},}, {"id":{"name":"spr_terminator_arms","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},}, diff --git a/fonts/fnt_menu/fnt_menu.old.png b/fonts/fnt_menu/fnt_menu.old.png index c4702d90280dfdf06d54726909eb359814d39b65..50ebc1c7c34de3ebcefc2a7651a789c48c8a50e2 100644 GIT binary patch delta 122 zcmbPnhjGRo#tjp4JuG#N4MGgftxPPfjE%Jo46Fe9TWtFkWy{P8605puj)78&qol`;+0Kk1B(EtDd delta 122 zcmbPnhjGRo#tjp4Jxp{B3_}bJt&B{pj19C646F\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: â–¯ (9647)", "sdfSpread": 4, "size": 12.0, diff --git a/fonts/fnt_menu/fnt_menu.png b/fonts/fnt_menu/fnt_menu.png index 50ebc1c7c34de3ebcefc2a7651a789c48c8a50e2..a9f0b20ede459a49849ec4e4ddfe25565d8c6619 100644 GIT binary patch delta 124 zcmbPnhjGRo#tr?so`y!c2Ie7#hE}E~Rz@b;1_o9J21XI;QyCZ-R7+eVN>UO_Qmu0H sQ!>*k8H@~!OmwknaAuvaIr&Dej0!eM5rKW*fTl5cy85}Sb4q9e0DbKtRsaA1 delta 124 zcmbPnhjGRo#tr?so(7h>#s(pV=2j+_R>sEK1_o9J2Iq_?Zf0O$P%UwdC`m~yNwvz& sPsvQHWH2%?GSS7RVSk<`|KuCFGAh_4UsQ8k0Gh_&>FVdQ&MBb@0Q)T?F#rGn diff --git a/objects/obj_drop_select/obj_drop_select.yy b/objects/obj_drop_select/obj_drop_select.yy index c0da15312a..0bfdfdf18d 100644 --- a/objects/obj_drop_select/obj_drop_select.yy +++ b/objects/obj_drop_select/obj_drop_select.yy @@ -13,8 +13,8 @@ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":56,"eventType":6,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":50,"eventType":6,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":68,"eventType":9,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], diff --git a/objects/obj_star_select/obj_star_select.yy b/objects/obj_star_select/obj_star_select.yy index 6b0465d84f..66306352e0 100644 --- a/objects/obj_star_select/obj_star_select.yy +++ b/objects/obj_star_select/obj_star_select.yy @@ -30,8 +30,8 @@ "physicsSensor": false, "physicsShape": 0, "physicsShapePoints": [ - {"x":4,"y":16,}, - {"x":96,"y":96,}, + {"x":4.0,"y":16.0,}, + {"x":96.0,"y":96.0,}, ], "physicsStartAwake": true, "properties": [], diff --git a/rooms/Game/Game.yy b/rooms/Game/Game.yy index 7761dea204..f441d671e9 100644 --- a/rooms/Game/Game.yy +++ b/rooms/Game/Game.yy @@ -15,6 +15,7 @@ {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Compatibility_Instances_Depth_-60000","depth":-60000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_794579B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,}, ],"layers":[],"properties":[],"userdefinedDepth":true,"visible":true,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances_1","depth":-59900,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":false,}, {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Compatibility_Instances_Depth_-1000","depth":-1000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_8494E946","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_controller","path":"objects/obj_controller/obj_controller.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, ],"layers":[],"properties":[],"userdefinedDepth":true,"visible":true,}, diff --git a/scripts/scr_PlanetData/scr_PlanetData.yy b/scripts/scr_PlanetData/scr_PlanetData.yy new file mode 100644 index 0000000000..820201a8b9 --- /dev/null +++ b/scripts/scr_PlanetData/scr_PlanetData.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_PlanetData", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_apothecarium/scr_apothecarium.yy b/scripts/scr_apothecarium/scr_apothecarium.yy new file mode 100644 index 0000000000..de196db027 --- /dev/null +++ b/scripts/scr_apothecarium/scr_apothecarium.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_apothecarium", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy new file mode 100644 index 0000000000..7b472b3083 --- /dev/null +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_complex_colour_kit", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_drop_select_function/scr_drop_select_function.yy b/scripts/scr_drop_select_function/scr_drop_select_function.yy new file mode 100644 index 0000000000..d0402e12a2 --- /dev/null +++ b/scripts/scr_drop_select_function/scr_drop_select_function.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_drop_select_function", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_equipment_struct/scr_equipment_struct.yy b/scripts/scr_equipment_struct/scr_equipment_struct.yy new file mode 100644 index 0000000000..e7b079433d --- /dev/null +++ b/scripts/scr_equipment_struct/scr_equipment_struct.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_equipment_struct", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_get_item_names/scr_get_item_names.yy b/scripts/scr_get_item_names/scr_get_item_names.yy new file mode 100644 index 0000000000..d2f72f9ee8 --- /dev/null +++ b/scripts/scr_get_item_names/scr_get_item_names.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_get_item_names", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Interface Help", + "path": "folders/Scripts/Interface Help.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_livery_setup/scr_livery_setup.yy b/scripts/scr_livery_setup/scr_livery_setup.yy new file mode 100644 index 0000000000..ea65ef99ae --- /dev/null +++ b/scripts/scr_livery_setup/scr_livery_setup.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_livery_setup", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file 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 f74c641caf..3ceafbc4b9 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -15,11 +15,12 @@ function build_new_ork_ships_to_fleet(star, planet){ // Increase ship number for this object? var rando=irandom(101); if (obj_controller.known[eFACTION.Ork]>0) then rando-=10; - if (star.p_type[planet]=="Forge"){ + var _planet_type = star.p_type[planet]; + if (_planet_type=="Forge"){ rando-=20; - } else if (star.p_type[planet]=="Hive"){ + } else if (_planet_type=="Hive"){ rando-=10; - }else if (star.p_type[planet]=="Shrine" || star.p_type[planet]=="Temperate"){ + }else if (_planet_type=="Shrine" || _planet_type=="Temperate"){ rando-=5; } if (rando<=15){// was 25 @@ -93,21 +94,23 @@ function ork_fleet_arrive_target(){ var _imperial_ship = scr_orbiting_fleet([eFACTION.Player, eFACTION.Imperium]); if (_imperial_ship == "none" && _ork_fleet!="none" && planets>0){ - var _allow_landing=true,t1=0,l=0; + var _allow_landing=true,ork_attack_planet=0,l=0; repeat(planets){ l+=1; - if (t1=0) and (p_tyranids[l]>0) then t1=l; + if (ork_attack_planet=0) and (p_tyranids[l]>0) then ork_attack_planet=l; } - if (t1>0) then p_tyranids[t1]-=_ork_fleet.capital_number+(_ork_fleet.frigate_number/2); - if (p_tyranids[t1]<=0){ - if (planet_feature_bool(p_feature[t1], P_features.Gene_Stealer_Cult)){ - delete_features(p_feature[t1], P_features.Gene_Stealer_Cult); - adjust_influence(eFACTION.Tyranids, -25, t1); + if (ork_attack_planet>0) then p_tyranids[ork_attack_planet]-=_ork_fleet.capital_number+(_ork_fleet.frigate_number/2); + + if (p_tyranids[ork_attack_planet]<=0){ + if (planet_feature_bool(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult)){ + delete_features(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult); + 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"){ var targ_planet = scr_get_planet_with_owner(nearest_imperial,eFACTION.Imperium); - new_colony_fleet(self.id, t1, nearest_imperial.id, targ_planet, "refugee"); + if (targ_planet==-1) then targ_planet = irandom_range(1, nearest_imperial.planets); + new_colony_fleet(self.id, ork_attack_planet, nearest_imperial.id, targ_planet, "refugee"); } } } diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy new file mode 100644 index 0000000000..e093381324 --- /dev/null +++ b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_player_fleet_combat_functions", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_roster/scr_roster.yy b/scripts/scr_roster/scr_roster.yy new file mode 100644 index 0000000000..583c5d4590 --- /dev/null +++ b/scripts/scr_roster/scr_roster.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_roster", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy b/scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy new file mode 100644 index 0000000000..2cde7a8b95 --- /dev/null +++ b/scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_specialist_point_handler", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_specialist_points/scr_specialist_points.yy b/scripts/scr_specialist_points/scr_specialist_points.yy new file mode 100644 index 0000000000..cd0de95096 --- /dev/null +++ b/scripts/scr_specialist_points/scr_specialist_points.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_specialist_points", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_sprite_functions/scr_sprite_functions.yy b/scripts/scr_sprite_functions/scr_sprite_functions.yy new file mode 100644 index 0000000000..eec3246e5d --- /dev/null +++ b/scripts/scr_sprite_functions/scr_sprite_functions.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_sprite_functions", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_sprite_helpers/scr_sprite_helpers.yy b/scripts/scr_sprite_helpers/scr_sprite_helpers.yy new file mode 100644 index 0000000000..f4e2932640 --- /dev/null +++ b/scripts/scr_sprite_helpers/scr_sprite_helpers.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_sprite_helpers", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Helpers", + "path": "folders/Scripts/Helpers.yy", + }, +} \ No newline at end of file diff --git a/scripts/scr_unit_traits/scr_unit_traits.yy b/scripts/scr_unit_traits/scr_unit_traits.yy new file mode 100644 index 0000000000..7fa766a7d9 --- /dev/null +++ b/scripts/scr_unit_traits/scr_unit_traits.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "scr_unit_traits", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/shaders/full_livery_shader/full_livery_shader.yy b/shaders/full_livery_shader/full_livery_shader.yy new file mode 100644 index 0000000000..c255be8327 --- /dev/null +++ b/shaders/full_livery_shader/full_livery_shader.yy @@ -0,0 +1,10 @@ +{ + "resourceType": "GMShader", + "resourceVersion": "1.0", + "name": "full_livery_shader", + "parent": { + "name": "Shaders", + "path": "folders/Shaders.yy", + }, + "type": 1, +} \ No newline at end of file diff --git a/sprites/Sprite544/Sprite544.yy b/sprites/Sprite544/Sprite544.yy new file mode 100644 index 0000000000..7c99bb1a8d --- /dev/null +++ b/sprites/Sprite544/Sprite544.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "Sprite544", + "bbox_bottom": 0, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1132b02e-7adf-47d6-ae57-ba65d8120062",}, + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3c99ce96-378e-4d09-9ec1-821e81e7ad78","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "UI", + "path": "folders/Sprites/UI.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "Sprite544", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1132b02e-7adf-47d6-ae57-ba65d8120062","path":"sprites/Sprite544/Sprite544.yy",},},},"Disabled":false,"id":"fdc6d240-127c-4364-9fb6-649444dd8487","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 64, +} \ No newline at end of file diff --git a/sprites/spr_bionics_arm/spr_bionics_arm.yy b/sprites/spr_bionics_arm/spr_bionics_arm.yy index a3f0ad23ad..4595a9446e 100644 --- a/sprites/spr_bionics_arm/spr_bionics_arm.yy +++ b/sprites/spr_bionics_arm/spr_bionics_arm.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_bionics_arm", - "bbox_bottom": 105, + "bbox_bottom": 125, "bbox_left": 17, "bbox_right": 47, "bbox_top": 74, @@ -23,6 +23,7 @@ "height": 232, "HTile": false, "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"54b9c784-108c-4807-834f-2b0291f26540","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9b0962d1-9e03-4c2d-a749-3e90ee6c8cf2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, diff --git a/sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy b/sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy index b2ad54333c..382c788ad0 100644 --- a/sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy +++ b/sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_chaplain_skull_helm", - "bbox_bottom": 40, + "bbox_bottom": 44, "bbox_left": 63, "bbox_right": 101, - "bbox_top": 13, + "bbox_top": 12, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,13 +14,14 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"da41be00-1d23-4fe3-8ae9-f9c5f26d0ab0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"86934807-ea9a-4216-8308-41baa548c8fa",}, ], "gridX": 0, "gridY": 0, "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0ec8b8ce-26b7-4897-ab90-3a4cc9b46459","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ae0c933d-af58-4bf7-b86c-2e064499e4ff","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, @@ -43,7 +44,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +56,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"da41be00-1d23-4fe3-8ae9-f9c5f26d0ab0","path":"sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy",},},},"Disabled":false,"id":"46d5fc8b-24b4-4f1f-bb74-95468a5371d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"86934807-ea9a-4216-8308-41baa548c8fa","path":"sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy",},},},"Disabled":false,"id":"2b341050-df0d-4c0f-b9ea-378f61546574","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, diff --git a/sprites/spr_da_backpack/spr_da_backpack.yy b/sprites/spr_da_backpack/spr_da_backpack.yy index 0d3238df30..15448b217a 100644 --- a/sprites/spr_da_backpack/spr_da_backpack.yy +++ b/sprites/spr_da_backpack/spr_da_backpack.yy @@ -26,8 +26,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "dark_angels_specials", - "path": "folders/Sprites/Marine Viewer/body_types/specialist/dark_angels_specials.yy", + "name": "packs", + "path": "folders/Sprites/Marine Viewer/packs.yy", }, "preMultiplyAlpha": false, "sequence": { 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 b055c26586..5c80cb87f0 100644 --- a/sprites/spr_da_term_honor/spr_da_term_honor.yy +++ b/sprites/spr_da_term_honor/spr_da_term_honor.yy @@ -60,7 +60,7 @@ "visibleRange": null, "volume": 1.0, "xorigin": 7, - "yorigin": 30, + "yorigin": 38, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_faction_icons/spr_faction_icons.yy b/sprites/spr_faction_icons/spr_faction_icons.yy new file mode 100644 index 0000000000..0de239627b --- /dev/null +++ b/sprites/spr_faction_icons/spr_faction_icons.yy @@ -0,0 +1,104 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_faction_icons", + "bbox_bottom": 57, + "bbox_left": 7, + "bbox_right": 56, + "bbox_top": 2, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"da1147b4-25e5-43ff-9cb6-1b9630a91188",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4a5a2538-7f5a-4ef5-809d-3efb68056895",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fbd273df-a4ac-45f0-9567-d25b0554cae3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"641ce88d-47a2-4ef5-a453-26c175c3fa47",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"458ae16e-c6e8-45b5-b056-9c021caa006d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f13a3c9b-197b-483a-bf2b-7e73d0652796",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"42355dbb-212b-40b0-bebd-21530e2fa783",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1e240158-bc5c-4162-85c8-a39ec678cea5",}, + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c741583e-dc86-4eed-b69d-339ccd9b2d98","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "UI", + "path": "folders/Sprites/UI.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_faction_icons", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 16.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"d70ecb5d-690b-460c-8ca5-89d5cfba7807","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"44cd17a1-e6c0-4ede-9f27-59cd285845e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"2de99ab3-2c6e-4ff1-92a0-84baaab0a45f","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"2b0c9adc-db88-4f02-8ca9-61a9f1bdbde7","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"3601bbbe-f76d-4c96-a08a-26c7d2ef5caa","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"458ae16e-c6e8-45b5-b056-9c021caa006d","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"b392962f-07ba-432b-abfa-1dec5bd977a7","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"c4d8139e-197d-4160-a6b5-347132c816f9","IsCreationKey":false,"Key":6.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"a98c5de5-4d16-4f57-b456-ef1225e54944","IsCreationKey":false,"Key":7.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"5d43e6fe-7e95-486f-8263-a8289c543acd","IsCreationKey":false,"Key":8.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"69aeaeeb-f959-4064-a75b-c0bae2a8a8ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"42355dbb-212b-40b0-bebd-21530e2fa783","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"90297261-4eaa-4d25-a826-308e4e5e31f8","IsCreationKey":false,"Key":10.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"f2b25933-4999-4026-826e-25784a625769","IsCreationKey":false,"Key":11.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"6ba1e06a-ef6e-46c3-ab25-b4a119bd66ce","IsCreationKey":false,"Key":12.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"ff58b031-e3a5-4d1c-913f-930259b4bada","IsCreationKey":false,"Key":13.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"82df5ccb-69b1-4fe1-8a7b-a9df60a5bd39","IsCreationKey":false,"Key":14.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1e240158-bc5c-4162-85c8-a39ec678cea5","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"04a8b061-b249-427b-bf65-b350329c1cbb","IsCreationKey":false,"Key":15.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 64, +} \ No newline at end of file diff --git a/sprites/spr_gear_chap/spr_gear_chap.yy b/sprites/spr_gear_chap/spr_gear_chap.yy index b975573d92..abc429f070 100644 --- a/sprites/spr_gear_chap/spr_gear_chap.yy +++ b/sprites/spr_gear_chap/spr_gear_chap.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "decorations", - "path": "folders/Sprites/Marine Viewer/decorations.yy", + "name": "deprecated", + "path": "folders/Sprites/Marine Viewer/deprecated.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_gear_librarian/spr_gear_librarian.yy b/sprites/spr_gear_librarian/spr_gear_librarian.yy new file mode 100644 index 0000000000..6db9d33ed3 --- /dev/null +++ b/sprites/spr_gear_librarian/spr_gear_librarian.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_gear_librarian", + "bbox_bottom": 67, + "bbox_left": 17, + "bbox_right": 39, + "bbox_top": 44, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c686bbde-e480-472c-bb08-d523ecc16fd7",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"da293a72-4179-44b2-91ee-3d67ced4a24f","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "decorations", + "path": "folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_gear_librarian", + "autoRecord": true, + "backdropHeight": 1080, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1920, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 1.0, + "playbackSpeedType": 1, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian/spr_gear_librarian.yy",},},},"Disabled":false,"id":"77965c26-dffa-4b7c-baec-050b652956e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 11, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 167, +} \ No newline at end of file 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 new file mode 100644 index 0000000000..514bb1c2c2 --- /dev/null +++ b/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy @@ -0,0 +1,94 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_gothic_numbers_right_pauldron", + "bbox_bottom": 65, + "bbox_left": 0, + "bbox_right": 32, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"87e5fd39-f168-48c2-a276-31cf1b797199",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"154a4f6a-289b-47cb-8019-3f84d8764a8a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5033b836-0568-4d4c-b81a-99fe09e568a2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cab768a9-5d1c-4f18-8f20-53214419c9f8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"da9a8b66-05d9-4947-9787-cae8b9015321",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"666fe5ca-6935-4698-a369-b7b96ff5e47d",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1905f2ec-6f40-4b6e-8e20-d1f92b8587ef","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_gothic_numbers_right_pauldron", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 11.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"0e8f2da6-4c4a-4e13-821d-699b0e5f5e6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"87e5fd39-f168-48c2-a276-31cf1b797199","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"6aac9d83-a704-44dd-acc9-c66ceb93e2c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"d41ebca2-1e7a-4bfb-9ce1-0b68abced744","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"b14dbd68-c1b6-4987-8559-ea45895073a6","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5033b836-0568-4d4c-b81a-99fe09e568a2","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"d75f6766-3b0f-4a70-a35a-c9a7c72e1896","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"eec4d90e-c9c8-4bca-97ae-b61579e5d9ed","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"bc1805dc-a620-4133-b267-e9fb9480a8d7","IsCreationKey":false,"Key":6.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"86664de9-14af-4223-aa04-76d40612f5fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"de02452f-ee8f-49c4-8a45-db6793a11b9a","IsCreationKey":false,"Key":8.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"da9a8b66-05d9-4947-9787-cae8b9015321","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"94b419a4-05ae-413a-a175-9a6cdd69232b","IsCreationKey":false,"Key":9.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"97cf6ab4-2cb9-4a8e-9831-3ad6b5e8dfa8","IsCreationKey":false,"Key":10.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy new file mode 100644 index 0000000000..7e7f05e2c2 --- /dev/null +++ b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_indomitus_backpack_variants", + "bbox_bottom": 47, + "bbox_left": 0, + "bbox_right": 123, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f263cbc2-c596-4d91-bf6e-98df697e82d6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"26a48129-bbce-4502-98fa-bb1536100ae8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2",}, + ], + "gridX": 0, + "gridY": 0, + "height": 271, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"62b09ae3-d70e-4c96-a796-f9dc9b29190d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "indomitus_complex", + "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_indomitus_backpack_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 3.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},},},"Disabled":false,"id":"976d99d5-b8ca-4296-bfec-0428f709446a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"26a48129-bbce-4502-98fa-bb1536100ae8","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},},},"Disabled":false,"id":"e490a9e6-100a-4231-83ea-f81f970510d0","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},},},"Disabled":false,"id":"103b9ed3-895b-4aaa-853a-46c40325bda5","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 38, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy new file mode 100644 index 0000000000..f721550fbf --- /dev/null +++ b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_indomitus_chest_variants", + "bbox_bottom": 111, + "bbox_left": 0, + "bbox_right": 123, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0e60637-c555-4a00-8c01-76f1d0b98b07",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8df37974-a38e-49cb-a1ac-77820eeb1e35",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc",}, + ], + "gridX": 0, + "gridY": 0, + "height": 271, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"142bfdfd-9776-49b7-8608-bb52b3f6a736","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "indomitus_complex", + "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_indomitus_chest_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 3.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},},},"Disabled":false,"id":"27d4c94a-6c66-4f0c-a0bc-26b973bcf167","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},},},"Disabled":false,"id":"d4e60b7e-673d-4732-a579-27be19e0db5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},},},"Disabled":false,"id":"57d77f6f-9937-40c8-b693-bb5f79d81e9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 38, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_complex/spr_indomitus_complex.yy b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy new file mode 100644 index 0000000000..6ecb092dc7 --- /dev/null +++ b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_indomitus_complex", + "bbox_bottom": 185, + "bbox_left": 10, + "bbox_right": 172, + "bbox_top": 32, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7173924c-400c-4ee3-8b3d-0123aa659415",}, + ], + "gridX": 0, + "gridY": 0, + "height": 271, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"03d917a8-bff1-45d7-818b-f057c5540e44","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "indomitus_complex", + "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_indomitus_complex", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},},},"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 38, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy new file mode 100644 index 0000000000..e279085ae2 --- /dev/null +++ b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_indomitus_left_arm", + "bbox_bottom": 170, + "bbox_left": 132, + "bbox_right": 175, + "bbox_top": 89, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1",}, + ], + "gridX": 0, + "gridY": 0, + "height": 271, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"335e75b4-4e39-4ae9-8bee-91ddb651a8c6","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "indomitus_complex", + "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_indomitus_left_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},},},"Disabled":false,"id":"fe3823bf-9117-481b-bdf0-d43733cc0e54","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 38, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy new file mode 100644 index 0000000000..530a745355 --- /dev/null +++ b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_indomitus_leg_variants", + "bbox_bottom": 259, + "bbox_left": 11, + "bbox_right": 169, + "bbox_top": 171, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b1984530-db57-4951-bec4-a09cab003f1a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9f6f956f-88d9-4777-aac0-fb6508697fec",}, + ], + "gridX": 0, + "gridY": 0, + "height": 271, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "indomitus_complex", + "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_indomitus_leg_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 3.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},},"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},},"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9f6f956f-88d9-4777-aac0-fb6508697fec","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},},"Disabled":false,"id":"954756d1-b81d-41f0-b93b-7ee98524f568","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 38, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy new file mode 100644 index 0000000000..6a0db7bcae --- /dev/null +++ b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_indomitus_right_arm", + "bbox_bottom": 170, + "bbox_left": 5, + "bbox_right": 48, + "bbox_top": 89, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc",}, + ], + "gridX": 0, + "gridY": 0, + "height": 271, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"55de725b-7bbe-44d0-9ec6-a9c031920d39","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "indomitus_complex", + "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_indomitus_right_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},},},"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 38, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_mk3_complex/spr_mk3_complex.yy b/sprites/spr_mk3_complex/spr_mk3_complex.yy new file mode 100644 index 0000000000..0907ec8f7d --- /dev/null +++ b/sprites/spr_mk3_complex/spr_mk3_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_complex", + "bbox_bottom": 220, + "bbox_left": 11, + "bbox_right": 152, + "bbox_top": 13, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"358913f3-25cd-4411-aa3a-01c656c1166c",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_3_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk3_complex", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},},},"Disabled":false,"id":"ec45e7d5-2e29-4440-965b-2b5e148ec8a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy new file mode 100644 index 0000000000..4f1315c5e9 --- /dev/null +++ b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_complex_backpack", + "bbox_bottom": 36, + "bbox_left": 27, + "bbox_right": 136, + "bbox_top": 9, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9bf31ffc-9a0a-492f-89fb-b703fed172b9","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_3_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk3_complex_backpack", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},},},"Disabled":false,"id":"9e7c62a0-7429-45f3-88c0-0aa6dc2ae3a2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy new file mode 100644 index 0000000000..98469960be --- /dev/null +++ b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_head_variants", + "bbox_bottom": 50, + "bbox_left": 0, + "bbox_right": 99, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"52c73332-e685-4491-bf62-c232947cb455",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2faf2e83-0803-4ea4-945c-272a0a936425",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"11966306-2c72-4664-be9f-563bdc23de41","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_3_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk3_head_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"52c73332-e685-4491-bf62-c232947cb455","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},},},"Disabled":false,"id":"48d2ca1b-88b2-4c40-ba5c-401820340d6e","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},},},"Disabled":false,"id":"0c3cd28a-bfee-4d11-b993-d5f834a89eaf","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},},},"Disabled":false,"id":"3815daad-43a5-4bb4-bec9-9760cbddeaff","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2faf2e83-0803-4ea4-945c-272a0a936425","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},},},"Disabled":false,"id":"e9a1782f-20bd-4415-a3f4-4809a12ff845","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy new file mode 100644 index 0000000000..ecc054061e --- /dev/null +++ b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_left_arm", + "bbox_bottom": 125, + "bbox_left": 120, + "bbox_right": 147, + "bbox_top": 67, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"70832485-9952-435e-b897-efeee5506dc1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_3_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk3_left_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},},},"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy b/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy new file mode 100644 index 0000000000..e00785f64b --- /dev/null +++ b/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_left_trim", + "bbox_bottom": 81, + "bbox_left": 0, + "bbox_right": 153, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9ab63ae6-5124-4282-8187-d7e41deef9c6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4f23ada7-84e2-4746-8e5c-f69e283899ef",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0ae8965e-939c-4734-9723-cf456ec9ce45","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_3_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk3_left_trim", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},},},"Disabled":false,"id":"8d01d6cf-461d-456e-9332-abf118aaaad7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},},},"Disabled":false,"id":"319c9c02-ebc4-458c-aa5f-b95f2e64fb44","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},},},"Disabled":false,"id":"c1ca8578-2345-4f88-9c55-fdf39bfa917a","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},},},"Disabled":false,"id":"81050e27-d210-414e-a369-43b4bc7e99af","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy b/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy new file mode 100644 index 0000000000..fc7499c232 --- /dev/null +++ b/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_right_arm", + "bbox_bottom": 125, + "bbox_left": 15, + "bbox_right": 42, + "bbox_top": 67, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3ebc7391-4a9c-4a65-9f3e-ba9014e4f0c8","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_3_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk3_right_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},},},"Disabled":false,"id":"fb663579-f17d-4461-829e-36f5f9b87989","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy b/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy new file mode 100644 index 0000000000..d4d0efd10c --- /dev/null +++ b/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_right_trim", + "bbox_bottom": 81, + "bbox_left": 0, + "bbox_right": 60, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"42c93ebb-31a5-4529-add7-5c4ada48da57",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e8f2b623-db31-44d0-a510-ff212dd3f269",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3046bd80-d3fb-4878-b070-c42a135928aa",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ea344b80-4a28-4053-ab2a-6d7f5987b9ac","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_3_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk3_right_trim", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"42c93ebb-31a5-4529-add7-5c4ada48da57","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},},},"Disabled":false,"id":"6a1a6de8-928a-4b5a-9b92-1eaa80fc4171","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e8f2b623-db31-44d0-a510-ff212dd3f269","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},},},"Disabled":false,"id":"c7301961-da67-453e-a396-070fac8dfbe4","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3046bd80-d3fb-4878-b070-c42a135928aa","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},},},"Disabled":false,"id":"f71392e9-e16c-4d5b-836f-daa455a41de5","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},},},"Disabled":false,"id":"f4ab6e5b-4e60-4125-ad0e-f195ed660e71","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy new file mode 100644 index 0000000000..865c49bd8b --- /dev/null +++ b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_chest_variants", + "bbox_bottom": 88, + "bbox_left": 0, + "bbox_right": 115, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ab90c4f7-06a6-4afd-ad2c-1b4320ecded3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6ea6843d-5734-4b45-8dc0-32fe12108362",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c7953fd-068f-4680-952f-2bec1899eb37",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9aa905f2-3241-4fed-97e7-c3b765cc7075",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4700a804-be74-43bd-a3a1-5f2c62f33959","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_4_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk4_chest_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ab90c4f7-06a6-4afd-ad2c-1b4320ecded3","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"db69f799-0a80-4d76-be2e-c67a1af0bc99","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6ea6843d-5734-4b45-8dc0-32fe12108362","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"2c56b22e-be1b-43dc-a4e8-b9b63456872e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5c7953fd-068f-4680-952f-2bec1899eb37","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"16645fc4-679d-40d5-a7e0-808e9967dbb5","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9aa905f2-3241-4fed-97e7-c3b765cc7075","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"8d99fcf2-53d5-4445-99e5-51f9c2300330","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_complex/spr_mk4_complex.yy b/sprites/spr_mk4_complex/spr_mk4_complex.yy new file mode 100644 index 0000000000..f030bc8e99 --- /dev/null +++ b/sprites/spr_mk4_complex/spr_mk4_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_complex", + "bbox_bottom": 220, + "bbox_left": 11, + "bbox_right": 152, + "bbox_top": 11, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e7b69ad2-206a-4f32-ade6-1a7c0f38210f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_4_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk4_complex", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},},},"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy new file mode 100644 index 0000000000..6affe80416 --- /dev/null +++ b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_complex_backpack", + "bbox_bottom": 35, + "bbox_left": 34, + "bbox_right": 129, + "bbox_top": 14, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a43406eb-6236-415d-9902-e818a2185ba9",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"32295d2f-e43c-4d2b-a49d-2a445111c733","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_4_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk4_complex_backpack", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a43406eb-6236-415d-9902-e818a2185ba9","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},},},"Disabled":false,"id":"90dd7544-906e-477c-a0a3-0c94bc9aee40","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy b/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy new file mode 100644 index 0000000000..b535b0fa08 --- /dev/null +++ b/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_left_arm", + "bbox_bottom": 125, + "bbox_left": 117, + "bbox_right": 149, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d132fab6-39de-405e-b127-9f335cf85536",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9e4985a2-eba9-4463-900a-738d3e77f677","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_4_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk4_left_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d132fab6-39de-405e-b127-9f335cf85536","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},},},"Disabled":false,"id":"0853379d-62d4-401d-bdeb-8b64cac8fbfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy b/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy new file mode 100644 index 0000000000..cbab550f3c --- /dev/null +++ b/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy @@ -0,0 +1,82 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_left_trim", + "bbox_bottom": 81, + "bbox_left": 0, + "bbox_right": 153, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c9e92ecb-d3e8-4554-b608-47b47aa79876",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7d128442-bf77-4769-8d75-a63dd3942ff8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0f4435dc-8ba2-40a6-a643-d38318383c10",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ccdf7cd6-d258-4f76-9fd9-65b076861997",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f5e0817a-c222-4bd1-b7af-957a96c6334d",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1ef77cf7-889b-445d-a5f0-6d155c3f407d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_4_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk4_left_trim", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 5.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"baf60be2-46a1-4588-a03b-762baa867599","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7d128442-bf77-4769-8d75-a63dd3942ff8","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"0e63d2dd-b459-434d-93fd-4607df6dd69a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0f4435dc-8ba2-40a6-a643-d38318383c10","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"8dcb92ec-fd8d-4cc6-9285-dbb186051c10","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"b38845bb-5261-4b58-b135-a5718fb726f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"b8bd7e56-9dc2-4b90-a286-403f37e35f36","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy new file mode 100644 index 0000000000..48088d87b7 --- /dev/null +++ b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_leg_variants", + "bbox_bottom": 193, + "bbox_left": 0, + "bbox_right": 144, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f5551e24-09d8-40c0-888e-0e5818c0c403",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"79b13155-0f85-4e11-9fef-324bf6e87d15",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f953caa3-a25e-4eed-9a1e-73ea1a4b2900","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_4_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk4_leg_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f5551e24-09d8-40c0-888e-0e5818c0c403","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},},},"Disabled":false,"id":"f0d74eee-2fdc-4c64-89a0-eca5b14b32d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},},},"Disabled":false,"id":"ee26bab2-02cc-4e4d-a75a-00c04cf56d3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"79b13155-0f85-4e11-9fef-324bf6e87d15","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},},},"Disabled":false,"id":"6e5b82f0-b1e4-4462-9747-2831172b74a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},},},"Disabled":false,"id":"01846774-a3dd-4995-9497-fbee372af500","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy b/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy new file mode 100644 index 0000000000..57f6fa6121 --- /dev/null +++ b/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy @@ -0,0 +1,82 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_mouth_variants", + "bbox_bottom": 43, + "bbox_left": 0, + "bbox_right": 98, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7cb87107-55af-49a2-967f-fce654e6d0b2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f57e6879-ac68-40d0-900d-57fff9a35503",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8bbded9e-27de-49ca-b8fb-f0295b4f7b5f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_4_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk4_mouth_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 5.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"fdd2c8c8-f92b-409f-b185-8b6f7db1b8aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7cb87107-55af-49a2-967f-fce654e6d0b2","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"fc1900e1-e6ba-42d6-8d89-f59b501502a7","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f57e6879-ac68-40d0-900d-57fff9a35503","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"0c312846-f775-44d4-9710-5e49bda55667","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"b40c0e7a-d4dc-4bf6-91f0-72ce317e597d","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"8b4f09f8-23a8-455e-a154-20561e393423","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy b/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy new file mode 100644 index 0000000000..fb8ec069f4 --- /dev/null +++ b/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_right_arm", + "bbox_bottom": 125, + "bbox_left": 13, + "bbox_right": 45, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"691da313-acdf-4e3b-8a61-65b5199f6f21",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4e3aed97-c2a5-4f45-81e6-5a2755bb9a86","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_4_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk4_right_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"691da313-acdf-4e3b-8a61-65b5199f6f21","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},},},"Disabled":false,"id":"6246d1fe-0f1d-44a4-876f-79b2e85b226a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy b/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy new file mode 100644 index 0000000000..f41d41cfb3 --- /dev/null +++ b/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy @@ -0,0 +1,82 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_right_trim", + "bbox_bottom": 81, + "bbox_left": 0, + "bbox_right": 60, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9f939d89-30fc-4492-a4fe-b12fa412f437",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"14cec0b7-0039-4fb8-ac03-a6c7a7d02268","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_4_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk4_right_trim", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 5.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9f939d89-30fc-4492-a4fe-b12fa412f437","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"7ad3f6b6-0d9e-474b-accc-e820942fdad5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"1d3ed260-00ee-4573-9de6-a47b932a55aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"ce299549-2c09-47b2-b44d-2306b8c0c2b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"54242b24-25bc-4088-a2c4-fdf65553d805","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"a90700c3-30df-47fe-adcd-a32ef97a91b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk5_complex/spr_mk5_complex.yy b/sprites/spr_mk5_complex/spr_mk5_complex.yy new file mode 100644 index 0000000000..5a4ed7eac2 --- /dev/null +++ b/sprites/spr_mk5_complex/spr_mk5_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk5_complex", + "bbox_bottom": 220, + "bbox_left": 11, + "bbox_right": 152, + "bbox_top": 26, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"48f72680-cb96-4361-9276-5e8d8552ae9f",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"15124376-bb1d-4e68-995a-aae895608450","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_5_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk5_complex", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},},},"Disabled":false,"id":"efd749b6-b89e-48c1-99df-bde59481c13f","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy new file mode 100644 index 0000000000..f22a05b953 --- /dev/null +++ b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk5_complex_backpack", + "bbox_bottom": 35, + "bbox_left": 37, + "bbox_right": 126, + "bbox_top": 10, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9aa55975-2b4b-4679-8fd7-f6141f200e93",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"013833bd-91ce-4c08-a77d-d15ce3981f2f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_5_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk5_complex_backpack", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},},},"Disabled":false,"id":"d00609fa-9d93-4657-a437-e937e9cd46e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy new file mode 100644 index 0000000000..d07fc224d4 --- /dev/null +++ b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk5_head_variants", + "bbox_bottom": 46, + "bbox_left": 65, + "bbox_right": 98, + "bbox_top": 12, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6ae9cb2a-6253-4261-9f21-88688afd2163",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"601d0116-93f3-4880-8b2c-2b4edcf26d68","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_5_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk5_head_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6ae9cb2a-6253-4261-9f21-88688afd2163","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},},},"Disabled":false,"id":"a7a73431-ca07-41d9-b12f-d718a5984fc6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy b/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy new file mode 100644 index 0000000000..0513c29209 --- /dev/null +++ b/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk5_left_arm", + "bbox_bottom": 125, + "bbox_left": 117, + "bbox_right": 149, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b03de0e7-42de-4112-9568-659441788221",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bf2ce683-c886-4933-863b-ae923430afa0","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_5_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk5_left_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b03de0e7-42de-4112-9568-659441788221","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},},},"Disabled":false,"id":"cabe8ec7-e204-4d1a-a7bf-1450852659fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy b/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy new file mode 100644 index 0000000000..5d98fedb27 --- /dev/null +++ b/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk5_right_arm", + "bbox_bottom": 125, + "bbox_left": 13, + "bbox_right": 45, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"667e4008-fe43-4bbe-b40b-8411d9921596",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"157c5e68-e771-48ed-9354-4d24a6afcb78","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_5_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk5_right_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"667e4008-fe43-4bbe-b40b-8411d9921596","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},},},"Disabled":false,"id":"993de37b-fcef-4d76-92c0-6e447ba018c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk6_complex/spr_mk6_complex.yy b/sprites/spr_mk6_complex/spr_mk6_complex.yy new file mode 100644 index 0000000000..1747bbd51a --- /dev/null +++ b/sprites/spr_mk6_complex/spr_mk6_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk6_complex", + "bbox_bottom": 220, + "bbox_left": 11, + "bbox_right": 152, + "bbox_top": 13, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"78fed957-a769-4e64-9288-8be2bf39a5d4","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_6_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk6_complex", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},},},"Disabled":false,"id":"23021aeb-0c67-4243-bf92-73fe45924fe0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy b/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy new file mode 100644 index 0000000000..4146141f73 --- /dev/null +++ b/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk6_complex_backpack", + "bbox_bottom": 38, + "bbox_left": 35, + "bbox_right": 128, + "bbox_top": 10, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"557d0497-d213-4f3c-9acb-a261ca311b93",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7dd54480-bbb1-4af4-b670-96698734e764","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_6_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk6_complex_backpack", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"557d0497-d213-4f3c-9acb-a261ca311b93","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},},},"Disabled":false,"id":"a8ae85dd-0643-4118-a10b-348ff5c192da","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy b/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy new file mode 100644 index 0000000000..f3b3baac9c --- /dev/null +++ b/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk6_left_arm", + "bbox_bottom": 125, + "bbox_left": 117, + "bbox_right": 148, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"22cfde6e-f8bd-4528-8635-78300f040903",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0af620b6-54e8-4d28-9ec9-97129eb7cf0a","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_6_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk6_left_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"22cfde6e-f8bd-4528-8635-78300f040903","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},},},"Disabled":false,"id":"6a261d08-29c4-4b92-b017-d0cd9ed8f1ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy new file mode 100644 index 0000000000..36d5edb005 --- /dev/null +++ b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk6_right_arm", + "bbox_bottom": 125, + "bbox_left": 14, + "bbox_right": 45, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e575792d-42ea-419f-9fac-43c0dbc4a85c",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"801be536-1190-4762-9641-427427be9cd3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_6_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk6_right_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},},},"Disabled":false,"id":"8fea9cd1-fb34-40d9-a036-61a42fecb51b","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy new file mode 100644 index 0000000000..51dca77c74 --- /dev/null +++ b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy @@ -0,0 +1,82 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_chest_variants", + "bbox_bottom": 73, + "bbox_left": 0, + "bbox_right": 112, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d359bd56-6962-4c59-a10d-f16ae433baa8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bc5e2753-207d-403d-81c5-a4e7066de053",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ca44f968-4109-4468-901b-d07add46e880",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"611de98f-d588-479c-ab78-87486ae53a43",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0d02faaf-2101-406d-a94f-527d1c7834db",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_chest_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 5.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"8a5283cf-1b94-4acb-8e35-054b1b7e9647","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"3565a559-326d-41c5-a322-0539e7fd4db8","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"dff23688-54a3-4f58-9748-753ea26db022","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"611de98f-d588-479c-ab78-87486ae53a43","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"c278fcc1-f8bf-4761-8bf5-6d43fc81c253","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0d02faaf-2101-406d-a94f-527d1c7834db","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"80777f49-d979-4e45-aeb9-a51c76f52090","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_complex/spr_mk7_complex.yy b/sprites/spr_mk7_complex/spr_mk7_complex.yy new file mode 100644 index 0000000000..c56397e18a --- /dev/null +++ b/sprites/spr_mk7_complex/spr_mk7_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_complex", + "bbox_bottom": 220, + "bbox_left": 11, + "bbox_right": 152, + "bbox_top": 12, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_complex", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},},},"Disabled":false,"id":"0920e5f3-c5b3-46e7-9eb6-c9832e0b26b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy new file mode 100644 index 0000000000..ffdc59f134 --- /dev/null +++ b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_complex_backpack", + "bbox_bottom": 38, + "bbox_left": 33, + "bbox_right": 130, + "bbox_top": 14, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d759779c-a75b-4d79-b22b-410d27d6c6de",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"216ff805-fa19-4063-a04c-9a3542762bd3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_complex_backpack", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d759779c-a75b-4d79-b22b-410d27d6c6de","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},},},"Disabled":false,"id":"dfcc2188-1c25-4b83-b365-64f54b46e5f6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy b/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy new file mode 100644 index 0000000000..919595ab45 --- /dev/null +++ b/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_full_colour", + "bbox_bottom": 220, + "bbox_left": 10, + "bbox_right": 153, + "bbox_top": 12, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": true, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"274a8c7b-ca8c-4721-8340-7a38238347c7",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"26ca7d83-cd69-43c3-b87e-c17db7491c50",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0aeeb946-c601-44b7-b963-ded0243eb00e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "body_types", + "path": "folders/Sprites/Marine Viewer/body_types.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_full_colour", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},},"Disabled":false,"id":"bc1fc3c0-fa0f-45d3-8a1a-2ffa8d073dec","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},},"Disabled":false,"id":"d6e067f3-ad2b-4116-9e07-c3b86d62143c","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"274a8c7b-ca8c-4721-8340-7a38238347c7","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},},"Disabled":false,"id":"1530679f-5fa0-4e40-a97f-16971a179bd4","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},},"Disabled":false,"id":"8e2b4d81-03fe-4fb8-b4ec-dab2348651b5","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 100, + "yorigin": 70, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy b/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy new file mode 100644 index 0000000000..c816486f26 --- /dev/null +++ b/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_left_arm", + "bbox_bottom": 125, + "bbox_left": 117, + "bbox_right": 149, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5d794479-23e8-47a4-925d-8b51fe539cad",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"613dc364-ae23-4c7c-8034-86717f2d8bfe","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_left_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5d794479-23e8-47a4-925d-8b51fe539cad","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},},},"Disabled":false,"id":"0924d635-008c-493a-8c4b-3d347b7d6043","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy new file mode 100644 index 0000000000..8bc3bddcd0 --- /dev/null +++ b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_left_trim", + "bbox_bottom": 81, + "bbox_left": 0, + "bbox_right": 153, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5ce2cab8-595d-482d-80b5-14f9b7c098a4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"09035cbe-5b3d-4474-a920-751ccede1b22",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a76f6caa-6867-414d-aa5b-84de7a43785e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_left_trim", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},},},"Disabled":false,"id":"363746cf-6f85-469a-b176-f73ceba6559e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5ce2cab8-595d-482d-80b5-14f9b7c098a4","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},},},"Disabled":false,"id":"5dcf49b6-4ee5-4865-8981-7b0b9e1ec5d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},},},"Disabled":false,"id":"3a072026-bb8f-472a-8844-5f39c475684d","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy b/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy new file mode 100644 index 0000000000..0d628db4bf --- /dev/null +++ b/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_leg_variants", + "bbox_bottom": 220, + "bbox_left": 0, + "bbox_right": 151, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6481474b-6526-4bec-86dd-ba8cc60fe287",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9dfbc583-089d-4b8c-9012-405d17389b4b",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"10dc3cac-c9af-43fd-9995-5de673dd5408","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_leg_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 3.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6481474b-6526-4bec-86dd-ba8cc60fe287","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},},},"Disabled":false,"id":"989a10c5-a397-4446-9be1-267e74dc0585","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9dfbc583-089d-4b8c-9012-405d17389b4b","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},},},"Disabled":false,"id":"8c9a2904-eb56-452e-8890-9a68ec5d0217","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy b/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy new file mode 100644 index 0000000000..c2930bdb35 --- /dev/null +++ b/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_mouth_variants", + "bbox_bottom": 44, + "bbox_left": 0, + "bbox_right": 99, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"805b74c1-f681-48e7-abfd-6f5b223474c6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"68e458f5-8c1b-450b-be3f-67390cbf0b81",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f81f55ba-964f-4c22-bab2-2bea5d52d416",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"88c52eeb-ab41-42a9-b6fa-ef097f9c2854","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_mouth_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"805b74c1-f681-48e7-abfd-6f5b223474c6","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},},},"Disabled":false,"id":"90424d54-c018-4c65-bf40-761e34299d1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},},},"Disabled":false,"id":"94d1248d-c0c4-4e25-8dfc-560ddc824524","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},},},"Disabled":false,"id":"e284f5f0-bfd1-44e1-83c7-c26b0384c4ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},},},"Disabled":false,"id":"7b5b860f-4677-4acd-80cd-7c6676d57d40","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy b/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy new file mode 100644 index 0000000000..0c072a5a99 --- /dev/null +++ b/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_right_arm", + "bbox_bottom": 125, + "bbox_left": 13, + "bbox_right": 45, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e48ab20b-13c1-4591-b4c8-eaa1ab9bbc6c","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_right_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},},},"Disabled":false,"id":"b3d2383f-78e1-45a6-b6fb-577392a18352","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy new file mode 100644 index 0000000000..c90ca868bc --- /dev/null +++ b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_right_trim", + "bbox_bottom": 81, + "bbox_left": 0, + "bbox_right": 58, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c1164960-e7ef-4c62-8e37-c5528ff3c173",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"52e01ab3-7e5a-49ab-a48c-b6c5814b153d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cc916bec-a006-47b8-abad-fb2f23dd4877",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"10828a69-80c6-4f09-a771-8bcba3cd3460",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"738bd7dd-c70a-4987-a701-b254eab6743c","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_right_trim", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c1164960-e7ef-4c62-8e37-c5528ff3c173","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},},"Disabled":false,"id":"c727d3d1-13a1-4f40-89e9-fa21992c39d1","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"52e01ab3-7e5a-49ab-a48c-b6c5814b153d","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},},"Disabled":false,"id":"06baf3bb-c28b-400b-97fc-aca066405419","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cc916bec-a006-47b8-abad-fb2f23dd4877","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},},"Disabled":false,"id":"b2db1b93-0f97-4d01-ae37-13fc3e7d44c9","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"10828a69-80c6-4f09-a771-8bcba3cd3460","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},},"Disabled":false,"id":"4844e218-fbc4-469a-8eb5-b60134939592","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy new file mode 100644 index 0000000000..2b5546178d --- /dev/null +++ b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy @@ -0,0 +1,84 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_thorax_variants", + "bbox_bottom": 90, + "bbox_left": 0, + "bbox_right": 99, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d0338708-7e62-4549-91ae-e73b183dd2ef",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"44f5165b-6919-4a3a-9c58-452f3f588084",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"979ec1c1-5d04-49f0-bb6c-2260773073c8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"acc4026b-406b-4bc8-8580-0d5dfad0db54","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk7_thorax_variants", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 6.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d0338708-7e62-4549-91ae-e73b183dd2ef","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"df9c08ff-f06d-400b-80e7-bb59328f9199","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"ee5845f8-5f75-4dda-836e-fc135b26839e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"44f5165b-6919-4a3a-9c58-452f3f588084","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"db13cbd7-28ca-45ef-bbcc-e67390716428","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"ca73c5a3-17d3-45a9-b6c9-78cb538894d1","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"0fae1fd8-4aa0-442c-994c-edeef09a437b","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"ec56882c-5f46-4d97-b25b-d17bbef25348","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk8_complex/spr_mk8_complex.yy b/sprites/spr_mk8_complex/spr_mk8_complex.yy new file mode 100644 index 0000000000..fb4b0336f6 --- /dev/null +++ b/sprites/spr_mk8_complex/spr_mk8_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk8_complex", + "bbox_bottom": 220, + "bbox_left": 10, + "bbox_right": 153, + "bbox_top": 12, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"64129718-8943-408e-8011-70f160526bff","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_8_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk8_complex", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_complex/spr_mk8_complex.yy",},},},"Disabled":false,"id":"c99da876-5d95-46d7-9177-cd6d87a6c32e","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy b/sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy new file mode 100644 index 0000000000..25753b75bc --- /dev/null +++ b/sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk8_complex_backpack", + "bbox_bottom": 36, + "bbox_left": 33, + "bbox_right": 130, + "bbox_top": 12, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3f895a37-c07c-48fe-a00d-9bfb26d3b23f",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c9a18a36-a89c-4dda-a652-bffda92b312f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_8_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk8_complex_backpack", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3f895a37-c07c-48fe-a00d-9bfb26d3b23f","path":"sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy",},},},"Disabled":false,"id":"1356bf38-ea5e-45a3-beb4-13d49504e744","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy b/sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy new file mode 100644 index 0000000000..a98701bb4e --- /dev/null +++ b/sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk8_left_arm", + "bbox_bottom": 125, + "bbox_left": 117, + "bbox_right": 149, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f8cc2659-4e53-42fc-bb02-c5965a87c144",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3dc02faf-2d03-4290-a153-dfe87ca09155","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_8_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk8_left_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f8cc2659-4e53-42fc-bb02-c5965a87c144","path":"sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy",},},},"Disabled":false,"id":"1d7cc7e8-3cb3-4d96-9e6d-2efdce531aba","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy b/sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy new file mode 100644 index 0000000000..3ecd482be8 --- /dev/null +++ b/sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk8_right_arm", + "bbox_bottom": 125, + "bbox_left": 13, + "bbox_right": 45, + "bbox_top": 66, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cdfc6c85-bc4a-4590-835b-2c50c8ee650a",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"284b2f0c-1a6a-4b9a-85bc-25cfb1e4c795","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_8_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_mk8_right_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cdfc6c85-bc4a-4590-835b-2c50c8ee650a","path":"sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy",},},},"Disabled":false,"id":"2be51d36-b09a-4d68-b918-f522c0dcf7a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy b/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy new file mode 100644 index 0000000000..88552c670b --- /dev/null +++ b/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy @@ -0,0 +1,94 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_numeral_left_knee", + "bbox_bottom": 157, + "bbox_left": 0, + "bbox_right": 128, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"83d0a8ac-8f98-4424-958c-95b882ab0e67",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"29533519-c6e5-4bda-a613-b26007242bcb",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e4b15ce1-2cf7-4657-b4de-036b06455aad",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c4049b43-1809-4728-924c-5444da8719b5",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b31e1b68-39cf-44de-a333-be8f36a74d19","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "mk_7_complex", + "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_numeral_left_knee", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 11.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"09b95042-aae6-492f-b786-b74c8c6e9263","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"47ab4ac3-1121-425c-9979-42936e389541","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"36a71730-fbce-4be8-b54c-fd8eaf732dad","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"ec4374be-3bbd-4d09-aeda-dd7c2f4b6da2","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"ee25b373-1963-4f2e-9aa5-3532ed45cff6","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"af3546e5-fb3f-4506-9654-5aafa55e19fd","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"0cbf6635-ee09-47d2-a582-f271220c8676","IsCreationKey":false,"Key":6.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"29533519-c6e5-4bda-a613-b26007242bcb","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"de7ee4b9-7b88-45f6-965e-8c99fe6bd60a","IsCreationKey":false,"Key":7.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"f9729f53-ea1d-4a0d-adfe-4596f2e3bd5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"2c2462aa-f436-4f4a-97e8-831ed46702b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c4049b43-1809-4728-924c-5444da8719b5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"502ea72f-bafd-4719-b46e-178305e29cda","IsCreationKey":false,"Key":10.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": -2, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 164, +} \ No newline at end of file diff --git a/sprites/spr_pa_arms/spr_pa_arms.yy b/sprites/spr_pa_arms/spr_pa_arms.yy index 32136dd994..c229a41f34 100644 --- a/sprites/spr_pa_arms/spr_pa_arms.yy +++ b/sprites/spr_pa_arms/spr_pa_arms.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_pa_arms", - "bbox_bottom": 107, + "bbox_bottom": 126, "bbox_left": 17, "bbox_right": 47, "bbox_top": 74, @@ -21,6 +21,7 @@ "height": 232, "HTile": false, "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c8c30d86-b0e9-40f1-b1db-6ac4f9a54b8f","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"85d5740a-9be1-4a8b-9e97-c5301a94b6c3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": 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 3a3ae48808..b3a9bd0d47 100644 --- a/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy +++ b/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_pa_arms_ornate", - "bbox_bottom": 107, + "bbox_bottom": 126, "bbox_left": 17, "bbox_right": 47, "bbox_top": 74, @@ -21,6 +21,7 @@ "height": 232, "HTile": false, "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"635383c3-d034-4bca-9f8d-4d20b553a6fb","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5e950c83-9788-452d-917a-6cb6e2063b71","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, diff --git a/sprites/spr_pa_hands/spr_pa_hands.yy b/sprites/spr_pa_hands/spr_pa_hands.yy index 77852f01fb..0b66b2fb70 100644 --- a/sprites/spr_pa_hands/spr_pa_hands.yy +++ b/sprites/spr_pa_hands/spr_pa_hands.yy @@ -4,7 +4,7 @@ "name": "spr_pa_hands", "bbox_bottom": 126, "bbox_left": 0, - "bbox_right": 49, + "bbox_right": 46, "bbox_top": 0, "bboxMode": 0, "collisionKind": 1, @@ -31,7 +31,7 @@ "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"338834a4-901b-4352-9793-54779febde8d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"93f64352-b53f-4c51-9e4d-9bc00b19174b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, diff --git a/sprites/spr_pack_brazier2/spr_pack_brazier2.yy b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy new file mode 100644 index 0000000000..ce7d22537b --- /dev/null +++ b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_pack_brazier2", + "bbox_bottom": 97, + "bbox_left": 89, + "bbox_right": 195, + "bbox_top": 16, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3368318c-d87a-46c2-891b-f8d5cebbf275",}, + ], + "gridX": 0, + "gridY": 0, + "height": 282, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"98aca475-f03b-4cda-b4db-4409d657d963","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "packs", + "path": "folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_pack_brazier2", + "autoRecord": true, + "backdropHeight": 1080, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1920, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 1.0, + "playbackSpeedType": 1, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier2/spr_pack_brazier2.yy",},},},"Disabled":false,"id":"41a45b27-c017-44df-9857-968f0d783204","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 57, + "yorigin": 61, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 281, +} \ No newline at end of file diff --git a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy new file mode 100644 index 0000000000..e99a564b2e --- /dev/null +++ b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_pack_brazier3", + "bbox_bottom": 99, + "bbox_left": 92, + "bbox_right": 188, + "bbox_top": 38, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3368318c-d87a-46c2-891b-f8d5cebbf275",}, + ], + "gridX": 0, + "gridY": 0, + "height": 282, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"23f60daa-fe76-4e85-9875-adbeb4cce378","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "packs", + "path": "folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_pack_brazier3", + "autoRecord": true, + "backdropHeight": 1080, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1920, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 1.0, + "playbackSpeedType": 1, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},},},"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 57, + "yorigin": 61, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 281, +} \ No newline at end of file diff --git a/sprites/spr_pack_devastator/spr_pack_devastator.yy b/sprites/spr_pack_devastator/spr_pack_devastator.yy index 13e5cd200c..1baf74c936 100644 --- a/sprites/spr_pack_devastator/spr_pack_devastator.yy +++ b/sprites/spr_pack_devastator/spr_pack_devastator.yy @@ -13,8 +13,9 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e5637504-add9-474b-ae10-1e954d497810",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530",}, ], "gridX": 0, "gridY": 0, @@ -44,7 +45,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 3.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,8 +56,9 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 9626f503e7..eae53cada6 100644 --- a/sprites/spr_pack_jump/spr_pack_jump.yy +++ b/sprites/spr_pack_jump/spr_pack_jump.yy @@ -15,6 +15,7 @@ "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"777ae2eb-75f6-4a1f-8633-057327b9a258",}, ], "gridX": 0, "gridY": 0, @@ -44,7 +45,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 3.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -57,6 +58,7 @@ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},},},"Disabled":false,"id":"232f2f80-aef0-425c-91c6-b057a1e4eab0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},},},"Disabled":false,"id":"fb16272d-2add-47a5-895f-f9827024011d","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"777ae2eb-75f6-4a1f-8633-057327b9a258","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},},},"Disabled":false,"id":"02d8ecc3-ce99-4de6-a06b-f69ff1bfe13e","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, diff --git a/sprites/spr_scout_arms/spr_scout_arms.yy b/sprites/spr_scout_arms/spr_scout_arms.yy index 5c05b95781..9241f67532 100644 --- a/sprites/spr_scout_arms/spr_scout_arms.yy +++ b/sprites/spr_scout_arms/spr_scout_arms.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_scout_arms", - "bbox_bottom": 135, + "bbox_bottom": 148, "bbox_left": 26, "bbox_right": 49, - "bbox_top": 84, + "bbox_top": 97, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -24,7 +24,7 @@ {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6875771f-a0b5-4a59-8928-4f649aaa9035","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 0, + "origin": 9, "parent": { "name": "arms_hands", "path": "folders/Sprites/Marine Viewer/arms_hands.yy", @@ -62,7 +62,7 @@ "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 0, + "yorigin": 11, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_scout_colors2/spr_scout_colors2.yy b/sprites/spr_scout_colors2/spr_scout_colors2.yy index 6e811e563e..31e6958d54 100644 --- a/sprites/spr_scout_colors2/spr_scout_colors2.yy +++ b/sprites/spr_scout_colors2/spr_scout_colors2.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_scout_colors2", - "bbox_bottom": 218, + "bbox_bottom": 231, "bbox_left": 0, "bbox_right": 144, "bbox_top": 0, @@ -31,7 +31,7 @@ {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6875771f-a0b5-4a59-8928-4f649aaa9035","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 0, + "origin": 9, "parent": { "name": "body_types", "path": "folders/Sprites/Marine Viewer/body_types.yy", @@ -76,7 +76,7 @@ "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 0, + "yorigin": 11, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy new file mode 100644 index 0000000000..bb5a365e31 --- /dev/null +++ b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_tartaros_complex", + "bbox_bottom": 259, + "bbox_left": 10, + "bbox_right": 169, + "bbox_top": 32, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856",}, + ], + "gridX": 0, + "gridY": 0, + "height": 271, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bf13109d-149e-4439-b37b-544f85c80d9b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "tartaros_complex", + "path": "folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_tartaros_complex", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},},},"Disabled":false,"id":"200ce5df-a2aa-43be-8768-a74ae1023185","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 38, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy new file mode 100644 index 0000000000..f1a09411ef --- /dev/null +++ b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_tartaros_left_arm", + "bbox_bottom": 169, + "bbox_left": 128, + "bbox_right": 173, + "bbox_top": 89, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334",}, + ], + "gridX": 0, + "gridY": 0, + "height": 271, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a26136ce-dfd5-46ea-be9c-ce22049a9ebe","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "tartaros_complex", + "path": "folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_tartaros_left_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},},},"Disabled":false,"id":"b145eebe-c835-41cf-bd87-3c3bea207624","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 38, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy new file mode 100644 index 0000000000..ea502fa28d --- /dev/null +++ b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_tartaros_right_arm", + "bbox_bottom": 169, + "bbox_left": 6, + "bbox_right": 51, + "bbox_top": 89, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67",}, + ], + "gridX": 0, + "gridY": 0, + "height": 271, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c87e73e1-e866-4b39-8a1f-96167acb2eca","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "tartaros_complex", + "path": "folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_tartaros_right_arm", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},},},"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 38, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_terminator_arms/spr_terminator_arms.yy b/sprites/spr_terminator_arms/spr_terminator_arms.yy index 431338a06a..be4f04abb6 100644 --- a/sprites/spr_terminator_arms/spr_terminator_arms.yy +++ b/sprites/spr_terminator_arms/spr_terminator_arms.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_terminator_arms", - "bbox_bottom": 154, + "bbox_bottom": 170, "bbox_left": 5, "bbox_right": 49, "bbox_top": 87, @@ -17,13 +17,16 @@ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"26935846-dc87-49ea-95f0-8d93e784b6b3",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8e9f5065-f35e-4408-835f-e8fbfcd63878",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"213953e7-d335-4a83-a9b8-496335dda7be",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"daf2e325-3fef-4afd-8c05-47a593d56b46",}, ], "gridX": 0, "gridY": 0, "height": 262, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"70802338-4e62-40ea-9886-b28fe4ac671a","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fe74dd0c-ec84-46ac-bcbb-df531ec42d24","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"35a49b5e-7bad-4a28-be81-1e39d481638f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, @@ -46,7 +49,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 6.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -61,6 +64,8 @@ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"f758ccb5-a5a2-4ba8-826a-d935358c0750","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"97dafcc0-9581-43e8-9b5a-3b85dcce74b7","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"33ca7639-cb77-432a-983c-83471f91f6ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"7d6d9eef-0cb3-4ce9-b9be-cb53d0a55eac","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"daf2e325-3fef-4afd-8c05-47a593d56b46","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"8f618068-e910-457d-a3f3-bb9b274821f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 210c6fcdcb..9a00eca235 100644 --- a/sprites/spr_terminator_hands/spr_terminator_hands.yy +++ b/sprites/spr_terminator_hands/spr_terminator_hands.yy @@ -3,9 +3,9 @@ "resourceVersion": "1.0", "name": "spr_terminator_hands", "bbox_bottom": 170, - "bbox_left": 6, - "bbox_right": 48, - "bbox_top": 100, + "bbox_left": 0, + "bbox_right": 45, + "bbox_top": 0, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -31,7 +31,7 @@ "height": 262, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a047b9a5-3874-4501-8f73-cf60d7f82193","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"34b4cf34-da25-4f45-9f1a-8dc884db941e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, diff --git a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy index 4e503026ea..22b3b2bb38 100644 --- a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy +++ b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "heavy_ranged", + "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy new file mode 100644 index 0000000000..873754657d --- /dev/null +++ b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_weapon_autocannon2", + "bbox_bottom": 269, + "bbox_left": 11, + "bbox_right": 84, + "bbox_top": 18, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"49d770e0-45f5-4f6a-932b-88984416b02a",}, + ], + "gridX": 0, + "gridY": 0, + "height": 281, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ffb7d722-e661-4f7c-ba36-1c68966d36d1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "heavy_ranged", + "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_weapon_autocannon2", + "autoRecord": true, + "backdropHeight": 1080, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1920, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 1.0, + "playbackSpeedType": 1, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},},},"Disabled":false,"id":"55f330f1-2ff0-4f47-b37b-c68126f5ee37","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 50, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_bolter/spr_weapon_bolter.yy b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy index d0ec2b2637..5c17dda33b 100644 --- a/sprites/spr_weapon_bolter/spr_weapon_bolter.yy +++ b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_bolter", - "bbox_bottom": 192, - "bbox_left": 1, - "bbox_right": 165, - "bbox_top": 104, + "bbox_bottom": 186, + "bbox_left": 0, + "bbox_right": 64, + "bbox_top": 98, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -13,15 +13,14 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"72c933c4-937b-4aeb-958d-787de025c85a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ed54fad2-a39b-4f07-9737-5b8f916bee92",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7a5d4ba3-4ada-4267-8a4f-d821528d14bf","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dada24c3-99c0-418a-ae1c-6110173d70c2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": { "resourceType": "GMNineSliceData", @@ -49,8 +48,8 @@ }, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -67,7 +66,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -78,8 +77,7 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},},},"Disabled":false,"id":"c4e178c2-cc1f-496c-9314-0012314dddbd","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"72c933c4-937b-4aeb-958d-787de025c85a","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},},},"Disabled":false,"id":"af5512ec-25af-4206-8489-5c7dbf48ee9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},},},"Disabled":false,"id":"1f0fec53-317a-4842-bc53-a72fcbb31466","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 bb3077a426..4faab925b0 100644 --- a/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy +++ b/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_boltpis", - "bbox_bottom": 160, - "bbox_left": 8, - "bbox_right": 162, - "bbox_top": 100, + "bbox_bottom": 157, + "bbox_left": 10, + "bbox_right": 57, + "bbox_top": 97, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2fbe55b8-f37f-4d3b-b5a4-50db1f726aef",}, ], "gridX": 0, "gridY": 0, @@ -26,8 +25,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -56,7 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},},},"Disabled":false,"id":"0c722af6-a209-4472-8eb0-1060349ba7d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2fbe55b8-f37f-4d3b-b5a4-50db1f726aef","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},},},"Disabled":false,"id":"d4c844cf-5d71-4523-8aa0-4d5d9ea706f5","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 966ee23e98..7bb7e82e77 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 @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { 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 e2aef6ef1f..eaf2d41d12 100644 --- a/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy +++ b/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy index d93c4f90fb..8bdc19cb3f 100644 --- a/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy +++ b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_chaxe", - "bbox_bottom": 220, - "bbox_left": 0, - "bbox_right": 147, - "bbox_top": 0, + "bbox_bottom": 218, + "bbox_left": 13, + "bbox_right": 80, + "bbox_top": 78, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,22 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"53399b32-65ae-42fe-aeba-a917fde0dbe8",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a2e91ccb-6f66-4e6b-8f33-993182e175e9",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"56d140c8-b5ea-4a2c-bf86-15f365028fe2",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9f118e5e-f416-42b3-9416-37178dfbbb6c",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cb2aaba6-9f7e-48a7-866c-3c3b1ffb2a7e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"38658137-2ef2-45e9-81ef-4b006433d76e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -46,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -58,9 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},},},"Disabled":false,"id":"3c650843-7b9c-42f1-a8b5-86dfe07f4222","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a2e91ccb-6f66-4e6b-8f33-993182e175e9","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},},},"Disabled":false,"id":"0da3b43c-b07d-4ddc-8eca-6b408337f1a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"56d140c8-b5ea-4a2c-bf86-15f365028fe2","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},},},"Disabled":false,"id":"15f421b6-50d0-4d87-a6c1-b2e90174479d","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9f118e5e-f416-42b3-9416-37178dfbbb6c","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},},},"Disabled":false,"id":"a28837d2-7da1-4af2-a08a-90a17f9fa8bb","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 8372802d02..262aa29fea 100644 --- a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy +++ b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy @@ -4,8 +4,8 @@ "name": "spr_weapon_chsword", "bbox_bottom": 222, "bbox_left": 26, - "bbox_right": 140, - "bbox_top": 54, + "bbox_right": 52, + "bbox_top": 50, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,22 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bb73f108-427e-431c-b395-c87b481cb3d4",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dd0ca46f-7b3d-4195-b40d-a4f2d41a69ff",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"577f17b1-b3f8-48c7-960c-65be4a6c17fa",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8c23d817-6399-4aa1-bd75-e508de02c50b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"024d846f-72e0-44e2-890e-84ac065f8b62","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -46,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -58,9 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},},},"Disabled":false,"id":"877d958c-0ba3-4cf7-b6c6-61d21827c596","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"bb73f108-427e-431c-b395-c87b481cb3d4","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},},},"Disabled":false,"id":"cbce2ea4-8b20-43d5-be8d-e0e047fcb38d","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dd0ca46f-7b3d-4195-b40d-a4f2d41a69ff","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},},},"Disabled":false,"id":"13a3057f-de04-4ba8-8a89-8e0697df825e","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"577f17b1-b3f8-48c7-960c-65be4a6c17fa","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},},},"Disabled":false,"id":"91edfcf0-e9fd-4cd0-b962-3bc105a4b640","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 596b06aa77..3dc8742883 100644 --- a/sprites/spr_weapon_colors/spr_weapon_colors.yy +++ b/sprites/spr_weapon_colors/spr_weapon_colors.yy @@ -27,8 +27,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "deprecated", + "path": "folders/Sprites/Marine Viewer/deprecated.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy index 565986fca0..36b18c84b9 100644 --- a/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy +++ b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy @@ -2,9 +2,9 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_comflamer", - "bbox_bottom": 215, - "bbox_left": 5, - "bbox_right": 164, + "bbox_bottom": 214, + "bbox_left": 0, + "bbox_right": 64, "bbox_top": 98, "bboxMode": 0, "collisionKind": 1, @@ -14,20 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3c2840d8-d534-41df-881f-8816321e5dba",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f75272a6-abde-4d18-873a-81f60468f7bc","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b8b16883-0c3a-40d9-89ff-859919a05660","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,11 +43,11 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, - "playbackSpeed": 30.0, + "playbackSpeed": 1.0, "playbackSpeedType": 0, "showBackdrop": true, "showBackdropImage": false, @@ -56,7 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},},},"Disabled":false,"id":"7b484c45-0fb4-4a0e-9361-40cc333730bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3c2840d8-d534-41df-881f-8816321e5dba","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},},},"Disabled":false,"id":"7ec5822b-34a4-4dcc-8290-2fe94d732bff","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 new file mode 100644 index 0000000000..287cd8a592 --- /dev/null +++ b/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_weapon_comgrav", + "bbox_bottom": 190, + "bbox_left": 0, + "bbox_right": 64, + "bbox_top": 98, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0",}, + ], + "gridX": 0, + "gridY": 0, + "height": 231, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c40eeab8-c7cb-4516-b569-de154d054380","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_weapon_comgrav", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 1.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},},},"Disabled":false,"id":"fa3e98b7-e1af-483f-a0e2-4bb9b2eaa6a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_commelta/spr_weapon_commelta.yy b/sprites/spr_weapon_commelta/spr_weapon_commelta.yy new file mode 100644 index 0000000000..fd3097a1c8 --- /dev/null +++ b/sprites/spr_weapon_commelta/spr_weapon_commelta.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_weapon_commelta", + "bbox_bottom": 193, + "bbox_left": 0, + "bbox_right": 64, + "bbox_top": 98, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0",}, + ], + "gridX": 0, + "gridY": 0, + "height": 231, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ebef2178-5163-4f2b-8fd4-48c0c06604a6","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_weapon_commelta", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 1.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},},},"Disabled":false,"id":"46d36c12-1869-4661-9233-2359ea03459a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_complas/spr_weapon_complas.yy b/sprites/spr_weapon_complas/spr_weapon_complas.yy new file mode 100644 index 0000000000..abf529b471 --- /dev/null +++ b/sprites/spr_weapon_complas/spr_weapon_complas.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_weapon_complas", + "bbox_bottom": 188, + "bbox_left": 0, + "bbox_right": 64, + "bbox_top": 98, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0",}, + ], + "gridX": 0, + "gridY": 0, + "height": 231, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e0db97f1-dac5-4765-84d0-119b935d8cff","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_weapon_complas", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 1.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},},},"Disabled":false,"id":"0e5740de-eb74-4f25-9419-097f6d429f97","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy index 336d2b4663..7ec8101e88 100644 --- a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy +++ b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy index 4f0b2e2ae8..42956f389b 100644 --- a/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy +++ b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy index 86cf35e96a..53b96c1f61 100644 --- a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy +++ b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_flamer/spr_weapon_flamer.yy b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy index c8c06a4d6d..dfec06d047 100644 --- a/sprites/spr_weapon_flamer/spr_weapon_flamer.yy +++ b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_flamer", - "bbox_bottom": 205, - "bbox_left": 5, - "bbox_right": 164, - "bbox_top": 102, + "bbox_bottom": 217, + "bbox_left": 0, + "bbox_right": 65, + "bbox_top": 97, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,20 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"64e8679b-d5d0-4274-a174-32724ce1f8ec",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c39fe812-11a6-49c4-b761-7446972f9cae",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"79f4606e-569a-45f4-862f-5db5865cd612","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f5e88495-a58b-4e27-851f-e5e5c8d35c1f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 0, + "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -56,12 +55,11 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},},},"Disabled":false,"id":"51e2ff14-868a-47ef-a428-a84bd622c9df","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c39fe812-11a6-49c4-b761-7446972f9cae","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},},},"Disabled":false,"id":"20371c28-bc5a-464e-bb0c-e21691f87d83","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, - "xorigin": 0, + "xorigin": 2, "yorigin": 0, }, "swatchColours": null, diff --git a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy index 4160a3d658..d31ff6182b 100644 --- a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy +++ b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy @@ -4,7 +4,7 @@ "name": "spr_weapon_frcstaff", "bbox_bottom": 271, "bbox_left": 12, - "bbox_right": 154, + "bbox_right": 66, "bbox_top": 12, "bboxMode": 0, "collisionKind": 1, @@ -14,22 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"99e87bd3-b1a5-4770-8164-66f56c168fab",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b36167ca-7151-4d45-95a1-8742d54f0dd0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"35e213ab-19c2-4427-821b-b92eece94bb6",}, ], "gridX": 0, "gridY": 0, "height": 272, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c133d37b-9535-4016-b38f-64276a3cdf49","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"222d47bb-4335-4c82-ac67-efb8f255c0d2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -46,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -58,15 +55,12 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},},"Disabled":false,"id":"8bf4c274-3780-4000-a5da-baf166ccb705","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"99e87bd3-b1a5-4770-8164-66f56c168fab","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},},"Disabled":false,"id":"9cf71ebc-85fb-4b5d-b83c-cbf695772e57","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b36167ca-7151-4d45-95a1-8742d54f0dd0","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},},"Disabled":false,"id":"e029387f-c227-4f87-8cca-65c732909452","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"35e213ab-19c2-4427-821b-b92eece94bb6","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},},"Disabled":false,"id":"37a7abf4-2ccf-47ce-b6bd-316532ec756e","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 40, + "yorigin": 51, }, "swatchColours": null, "swfPrecision": 2.525, 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 cda4b3b973..d4a09ca6ef 100644 --- a/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy +++ b/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_grav_cannon", - "bbox_bottom": 184, - "bbox_left": 4, - "bbox_right": 202, - "bbox_top": 66, + "bbox_bottom": 173, + "bbox_left": 33, + "bbox_right": 226, + "bbox_top": 55, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,13 +14,13 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"24da9524-e605-4157-b256-95ed80b963f5",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0b66cc63-481b-442f-9d64-64e302ee91c4",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3a2b63b8-5da5-49d3-86ea-e72c46d62c14",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0b8f3cc3-3ce9-4378-ad72-939912fe0616",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"67fde332-4798-49cf-bb44-0ebd213419c6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be",}, ], "gridX": 0, "gridY": 0, - "height": 231, + "height": 232, "HTile": false, "layers": [ {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4c68dd2d-a1e6-4382-b7bf-d242a78c6b49","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "heavy_ranged", + "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -59,14 +59,14 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"dbc4ffb4-dc70-41fd-83b7-be3dc0ae50a0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"24da9524-e605-4157-b256-95ed80b963f5","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"002bd936-fe8e-42b0-85dc-08d3122f8cf0","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0b66cc63-481b-442f-9d64-64e302ee91c4","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"2e6744ac-e163-40d6-b6d8-74d988dc1198","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3a2b63b8-5da5-49d3-86ea-e72c46d62c14","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"66bb8085-ae32-4b75-9902-52326cda1681","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0b8f3cc3-3ce9-4378-ad72-939912fe0616","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"94013f91-770a-49c3-a40e-9a0ac97fbbc4","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"67fde332-4798-49cf-bb44-0ebd213419c6","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"249cb8fd-b259-483a-89be-edfb1756753d","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"ae74c7da-b7f7-4015-941e-562f4bc25c9a","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, - "xorigin": 40, + "xorigin": 45, "yorigin": 0, }, "swatchColours": null, @@ -77,5 +77,5 @@ }, "type": 0, "VTile": false, - "width": 207, + "width": 227, } \ No newline at end of file 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 64b3012424..350c2d5613 100644 --- a/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy +++ b/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_grav_gun", - "bbox_bottom": 219, + "bbox_bottom": 213, "bbox_left": 11, - "bbox_right": 155, - "bbox_top": 101, + "bbox_right": 64, + "bbox_top": 95, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"29b24457-ca6a-4c9d-82a6-613144e8fc4e",}, ], "gridX": 0, "gridY": 0, @@ -49,8 +48,8 @@ }, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -67,7 +66,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -79,7 +78,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},},},"Disabled":false,"id":"be6c4d78-c251-45e2-8172-2dc6160772eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"29b24457-ca6a-4c9d-82a6-613144e8fc4e","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},},},"Disabled":false,"id":"e1c6f313-60b3-4b73-9ef6-39d6bd21e16a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 0d5e39886f..ef3bbbaf97 100644 --- a/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy +++ b/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_grav_pistol", - "bbox_bottom": 178, + "bbox_bottom": 166, "bbox_left": 22, - "bbox_right": 144, - "bbox_top": 105, + "bbox_right": 57, + "bbox_top": 93, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dbd97fe8-875d-44bc-a7a7-888a212884db",}, ], "gridX": 0, "gridY": 0, @@ -49,8 +48,8 @@ }, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -67,7 +66,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -79,7 +78,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},},},"Disabled":false,"id":"020a30d9-3988-4c55-91ae-54f299601401","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dbd97fe8-875d-44bc-a7a7-888a212884db","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},},},"Disabled":false,"id":"2549fd8e-be82-41a8-aada-d34ccaf9d8b0","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 537d8f1f5f..69372e3256 100644 --- a/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy +++ b/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_hand_flamer", - "bbox_bottom": 184, + "bbox_bottom": 178, "bbox_left": 10, - "bbox_right": 156, - "bbox_top": 106, + "bbox_right": 59, + "bbox_top": 100, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a3f0b9f3-e415-442e-8e9c-74beff52199d",}, ], "gridX": 0, "gridY": 0, @@ -49,8 +48,8 @@ }, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -67,7 +66,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -79,7 +78,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},},},"Disabled":false,"id":"b33db15d-4ea7-4f57-85fd-d001d7688cfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a3f0b9f3-e415-442e-8e9c-74beff52199d","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},},},"Disabled":false,"id":"47f5fe4d-02a6-4cd3-a030-b1f7f5588900","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 9a5fa5708b..b2e2ced6ad 100644 --- a/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy +++ b/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "heavy_ranged", + "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy index cc365d2df5..eba1a1d904 100644 --- a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy +++ b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "heavy_ranged", + "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy index 3bbffbc221..909b83a4b9 100644 --- a/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy +++ b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_inferno/spr_weapon_inferno.yy b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy index ff2989457b..d6ea06eedd 100644 --- a/sprites/spr_weapon_inferno/spr_weapon_inferno.yy +++ b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_inferno", - "bbox_bottom": 168, - "bbox_left": 17, - "bbox_right": 148, - "bbox_top": 95, + "bbox_bottom": 172, + "bbox_left": 25, + "bbox_right": 58, + "bbox_top": 99, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f788d341-e281-426b-99a8-576cdbb660ce",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"562ffd17-d026-4c0e-bd09-8f8cc3c4ae77",}, ], "gridX": 0, "gridY": 0, @@ -26,8 +25,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,11 +43,11 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, - "playbackSpeed": 30.0, + "playbackSpeed": 1.0, "playbackSpeedType": 0, "showBackdrop": true, "showBackdropImage": false, @@ -56,7 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f788d341-e281-426b-99a8-576cdbb660ce","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},},},"Disabled":false,"id":"0f3ad698-f0ed-487e-b9f1-ad0c95f7d469","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"562ffd17-d026-4c0e-bd09-8f8cc3c4ae77","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},},},"Disabled":false,"id":"4c7e6a68-3724-49b8-b53f-d51bcf046004","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 e57c06fb76..c36b8965da 100644 --- a/sprites/spr_weapon_knife/spr_weapon_knife.yy +++ b/sprites/spr_weapon_knife/spr_weapon_knife.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_knife", - "bbox_bottom": 163, - "bbox_left": 24, - "bbox_right": 142, - "bbox_top": 60, + "bbox_bottom": 164, + "bbox_left": 33, + "bbox_right": 50, + "bbox_top": 61, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,22 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c5c496b3-8d87-42ea-9625-89bf253c33d0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6c3c12f9-7d4c-425a-86e5-984b2f7cd11a",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"474a32bf-3136-4129-b4e4-f3eee5568d72",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"90c1b0d9-e4bc-4456-99e4-7fda887f5129",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dd206ef0-a851-4423-9628-95c71a609915","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f2d036d3-3fd2-4d2b-ab43-81aa5a7ee3d3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -46,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -58,9 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},},},"Disabled":false,"id":"aa85f45a-777f-4198-a19d-33ec37678e1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6c3c12f9-7d4c-425a-86e5-984b2f7cd11a","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},},},"Disabled":false,"id":"555ae523-a7b2-466d-b267-ad7b1412f3a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"474a32bf-3136-4129-b4e4-f3eee5568d72","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},},},"Disabled":false,"id":"c4c4f6e5-14b5-4071-84ad-a395dad29834","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"90c1b0d9-e4bc-4456-99e4-7fda887f5129","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},},},"Disabled":false,"id":"5f7fb45e-7d83-4c2c-acf3-2ed23ad88b13","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 51ca2f2035..5a44185415 100644 --- a/sprites/spr_weapon_lasca/spr_weapon_lasca.yy +++ b/sprites/spr_weapon_lasca/spr_weapon_lasca.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "heavy_ranged", + "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy index c09d5a87cf..ade840d4b1 100644 --- a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy +++ b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { 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 new file mode 100644 index 0000000000..220d9228a8 --- /dev/null +++ b/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_weapon_mace_of_absolution", + "bbox_bottom": 261, + "bbox_left": 13, + "bbox_right": 75, + "bbox_top": 103, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"630e8d95-baaa-4950-8761-35b8ccf4848c",}, + ], + "gridX": 0, + "gridY": 0, + "height": 262, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_weapon_mace_of_absolution", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 1.0, + "playbackSpeedType": 1, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},},},"Disabled":false,"id":"03644e7c-f6ca-4447-91f5-b7c7c2d15ce1","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 30, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 181, +} \ No newline at end of file diff --git a/sprites/spr_weapon_melta/spr_weapon_melta.yy b/sprites/spr_weapon_melta/spr_weapon_melta.yy index c5840db0c8..1bcb5b204c 100644 --- a/sprites/spr_weapon_melta/spr_weapon_melta.yy +++ b/sprites/spr_weapon_melta/spr_weapon_melta.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_melta", - "bbox_bottom": 201, - "bbox_left": 6, - "bbox_right": 160, - "bbox_top": 87, + "bbox_bottom": 212, + "bbox_left": 4, + "bbox_right": 61, + "bbox_top": 101, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"881d2fb1-5056-4735-8d84-8ca6614caff0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"093cae00-ed42-49a5-84ff-7719eb3e004b",}, ], "gridX": 0, "gridY": 0, @@ -26,8 +25,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,11 +43,11 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, - "playbackSpeed": 30.0, + "playbackSpeed": 1.0, "playbackSpeedType": 0, "showBackdrop": true, "showBackdropImage": false, @@ -56,7 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"881d2fb1-5056-4735-8d84-8ca6614caff0","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},},},"Disabled":false,"id":"74cd6908-01ec-4465-b482-4435e04d4f02","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"093cae00-ed42-49a5-84ff-7719eb3e004b","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},},},"Disabled":false,"id":"7317b28e-625e-42a6-b11a-379a816490af","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 11e66c8920..8b048b734a 100644 --- a/sprites/spr_weapon_missile/spr_weapon_missile.yy +++ b/sprites/spr_weapon_missile/spr_weapon_missile.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_missile", - "bbox_bottom": 146, - "bbox_left": 12, - "bbox_right": 154, - "bbox_top": 15, + "bbox_bottom": 160, + "bbox_left": 25, + "bbox_right": 77, + "bbox_top": 0, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,20 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2250a315-f18a-45f1-956e-3e196b64c3b6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"51cfdf3d-88b2-412e-8acd-9689aa0521a5",}, ], "gridX": 0, "gridY": 0, - "height": 232, + "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8838feaa-48ab-47af-a4f1-054a9a7c9fb9","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5bccb04e-2893-4986-b824-b18637fb39ec","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -56,7 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2250a315-f18a-45f1-956e-3e196b64c3b6","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},},},"Disabled":false,"id":"c1cf7e78-050c-4d04-bbb5-967f84a51577","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"51cfdf3d-88b2-412e-8acd-9689aa0521a5","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},},},"Disabled":false,"id":"7ce425b9-a469-44dc-83ee-c45e3fba069e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 7d172092a0..4fccb6fef1 100644 --- a/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy +++ b/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "heavy_ranged", + "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_plasc/spr_weapon_plasc.yy b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy index 0a44486e0e..c286821bca 100644 --- a/sprites/spr_weapon_plasc/spr_weapon_plasc.yy +++ b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "heavy_ranged", + "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_plasg/spr_weapon_plasg.yy b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy index e217b2ed1e..17d66faa33 100644 --- a/sprites/spr_weapon_plasg/spr_weapon_plasg.yy +++ b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy @@ -4,7 +4,7 @@ "name": "spr_weapon_plasg", "bbox_bottom": 195, "bbox_left": 22, - "bbox_right": 144, + "bbox_right": 65, "bbox_top": 86, "bboxMode": 0, "collisionKind": 1, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a4883e21-05cf-4d8f-bed5-d89946e80145",}, ], "gridX": 0, "gridY": 0, @@ -26,8 +25,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -56,7 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},},},"Disabled":false,"id":"e8b5a45b-814c-49dc-9fc4-16d6bf9347bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a4883e21-05cf-4d8f-bed5-d89946e80145","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},},},"Disabled":false,"id":"b9d35f28-492c-48ce-bc59-00dd43378397","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 e34628d4cf..4c31f054a9 100644 --- a/sprites/spr_weapon_plasp/spr_weapon_plasp.yy +++ b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_plasp", - "bbox_bottom": 173, - "bbox_left": 23, - "bbox_right": 143, - "bbox_top": 102, + "bbox_bottom": 172, + "bbox_left": 22, + "bbox_right": 51, + "bbox_top": 101, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e9b93f86-ee4d-46dd-85b8-6a469057430e",}, ], "gridX": 0, "gridY": 0, @@ -26,8 +25,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -56,7 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},},},"Disabled":false,"id":"8333a6b3-f6e7-4458-ad54-3d025c953fdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e9b93f86-ee4d-46dd-85b8-6a469057430e","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},},},"Disabled":false,"id":"10cd094d-1c40-4cc9-a2e0-88563ed7917a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 207f83a9b5..d4fa508ff9 100644 --- a/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy +++ b/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_powaxe", - "bbox_bottom": 215, - "bbox_left": 0, - "bbox_right": 155, - "bbox_top": 0, + "bbox_bottom": 231, + "bbox_left": 16, + "bbox_right": 73, + "bbox_top": 82, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,22 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e9e43ac8-8872-4a91-b2c7-2aec646300b1",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a8431c20-507a-448c-9739-a6e71dd8371f",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"766125ba-d5c9-4cf8-8800-ac92eebde4e8",}, ], "gridX": 0, "gridY": 0, "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5ce4d2d0-cf56-446f-b39d-069bf71ec83d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"47b6aab9-0dc2-40bb-8df3-b32e803135d0","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 0, + "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -46,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -58,15 +55,12 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},},},"Disabled":false,"id":"90a9b82b-dd4a-488d-87a8-50b3fff5dc34","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e9e43ac8-8872-4a91-b2c7-2aec646300b1","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},},},"Disabled":false,"id":"55e563a8-14c2-40bf-a09a-53bbff789629","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a8431c20-507a-448c-9739-a6e71dd8371f","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},},},"Disabled":false,"id":"ec1c218c-2c76-4183-a49d-f46186e10a49","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"766125ba-d5c9-4cf8-8800-ac92eebde4e8","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},},},"Disabled":false,"id":"6d8590b0-fda9-4266-86cc-92678def8b77","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 0, + "yorigin": 11, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy index 9469019f24..8a915a2d1e 100644 --- a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy +++ b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy index b8a50ae60c..41de634544 100644 --- a/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy +++ b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy @@ -30,8 +30,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "deprecated", + "path": "folders/Sprites/Marine Viewer/deprecated.yy", }, "preMultiplyAlpha": false, "sequence": { 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 b97897f05c..7cdfa2950c 100644 --- a/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy +++ b/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "deprecated", + "path": "folders/Sprites/Marine Viewer/deprecated.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy index 2b81a94e51..7dea9b9893 100644 --- a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy +++ b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy @@ -3,8 +3,8 @@ "resourceVersion": "1.0", "name": "spr_weapon_powmace", "bbox_bottom": 261, - "bbox_left": 5, - "bbox_right": 175, + "bbox_left": 17, + "bbox_right": 70, "bbox_top": 107, "bboxMode": 0, "collisionKind": 1, @@ -13,23 +13,20 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"630e8d95-baaa-4950-8761-35b8ccf4848c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b35d9128-ba42-4e55-a9af-d7e0cc020880",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"23aa37db-0d4b-4e4c-a8a5-6b73dde07536",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3499703f-7d4c-4f28-8493-af031c87c0bb",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd",}, ], "gridX": 0, "gridY": 0, "height": 262, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3473fea1-f986-49e0-a74f-4e16f84ef3dc","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c10b9469-0355-40db-913d-37ad87c46d82","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, "parent": { - "name": "weapons_terminator", - "path": "folders/Sprites/Marine Viewer/weapons_terminator.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -46,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -57,16 +54,13 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"01500611-3d0f-4b4f-a003-0e640a9e8e9c","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b35d9128-ba42-4e55-a9af-d7e0cc020880","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"45b291dd-1c7a-4658-b2a1-eac9d2f9ef9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"23aa37db-0d4b-4e4c-a8a5-6b73dde07536","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"d3ff8350-d479-47c3-8761-544537a02055","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3499703f-7d4c-4f28-8493-af031c87c0bb","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"2f536ddb-0db5-402e-81c5-8af77d96f182","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"316e0e0f-a739-4bb0-b052-89d4b964924d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, "xorigin": 7, - "yorigin": 12, + "yorigin": 20, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy index 2263404f24..f2fd14d50c 100644 --- a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy +++ b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy @@ -3,9 +3,9 @@ "resourceVersion": "1.0", "name": "spr_weapon_powmaul", "bbox_bottom": 223, - "bbox_left": 29, - "bbox_right": 138, - "bbox_top": 57, + "bbox_left": 30, + "bbox_right": 50, + "bbox_top": 68, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,21 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0411c512-ab45-4528-8744-8f5cc93375d9",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"00c20a0b-8100-4cf3-86db-33bd0b8ac834",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"702eb9a2-705f-415f-a691-14aff59f08f6",}, ], "gridX": 0, "gridY": 0, "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fd84b4d2-be02-49e9-80ee-c61230d79677","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"14332b18-11a3-493b-827c-f96db0fe5de2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -45,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 3.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -57,8 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0411c512-ab45-4528-8744-8f5cc93375d9","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},},},"Disabled":false,"id":"562e79ed-f23d-4371-8a19-59b8c0541d4a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"00c20a0b-8100-4cf3-86db-33bd0b8ac834","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},},},"Disabled":false,"id":"4b24446f-3fb9-432e-ba3e-3234a69b24d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"702eb9a2-705f-415f-a691-14aff59f08f6","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},},},"Disabled":false,"id":"1fb9a7de-e900-43f2-b947-c7566d9a50dd","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 ab6762ed18..7a705b9340 100644 --- a/sprites/spr_weapon_powspear/spr_weapon_powspear.yy +++ b/sprites/spr_weapon_powspear/spr_weapon_powspear.yy @@ -3,8 +3,8 @@ "resourceVersion": "1.0", "name": "spr_weapon_powspear", "bbox_bottom": 275, - "bbox_left": 24, - "bbox_right": 142, + "bbox_left": 25, + "bbox_right": 44, "bbox_top": 17, "bboxMode": 0, "collisionKind": 1, @@ -14,22 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"49d770e0-45f5-4f6a-932b-88984416b02a",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"39acba31-1514-4d17-b51e-24001a11f230",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dc43142f-06af-40f2-b9c7-b5e855b50029",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7dfbc6f0-db07-4472-a526-cafd5d821e1c",}, ], "gridX": 0, "gridY": 0, "height": 281, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9f06783b-33fd-405c-accf-8508a6ebc1ae","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"737ddb0f-0768-4b00-b805-2515165a6313","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -46,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -58,9 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},},},"Disabled":false,"id":"b384452c-57a9-4471-867e-57707dc0e6f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"39acba31-1514-4d17-b51e-24001a11f230","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},},},"Disabled":false,"id":"008a2125-6976-468f-adf1-6bc4a20cee76","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dc43142f-06af-40f2-b9c7-b5e855b50029","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},},},"Disabled":false,"id":"b8207941-0d2a-40f9-92a1-e4f06df1ee2a","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7dfbc6f0-db07-4472-a526-cafd5d821e1c","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},},},"Disabled":false,"id":"2e6a41ea-17a5-4147-aa47-8d68373323fa","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 e7932852bc..d5d8d4c932 100644 --- a/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy +++ b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy @@ -30,8 +30,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "unused", + "path": "folders/Sprites/Marine Viewer/unused.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy index d492bc70bf..cf446311ca 100644 --- a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy +++ b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_powspear3", - "bbox_bottom": 275, + "bbox_bottom": 281, "bbox_left": 22, "bbox_right": 48, "bbox_top": 30, @@ -20,15 +20,15 @@ "height": 282, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"41b6b4ab-54d0-465a-abe2-ed4fff718dc7","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":false,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"017652a3-1080-42c6-8700-3cbe1f99bdb0","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":false,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"41b6b4ab-54d0-465a-abe2-ed4fff718dc7","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"017652a3-1080-42c6-8700-3cbe1f99bdb0","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"67824055-5997-42cf-9911-ba6b9c0b00e5","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "unused", + "path": "folders/Sprites/Marine Viewer/unused.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy index 5ee0cfb3aa..86255e582b 100644 --- a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy +++ b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy @@ -2,9 +2,9 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_powswo", - "bbox_bottom": 221, + "bbox_bottom": 220, "bbox_left": 20, - "bbox_right": 146, + "bbox_right": 59, "bbox_top": 59, "bboxMode": 0, "collisionKind": 1, @@ -14,22 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2d8c0f5d-9c67-4d9d-a923-668c83b5558b",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"68f57d1d-2321-4125-847a-e384e3922bdc",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3aa17fdc-2bf1-413b-a492-1613c3b88cfe",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ad2d62f0-ca5a-4c09-86c2-ee917caf8ec6","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -46,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -58,9 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},},},"Disabled":false,"id":"c90840de-d6cc-483e-a57c-af59544fddb7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2d8c0f5d-9c67-4d9d-a923-668c83b5558b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},},},"Disabled":false,"id":"e0186623-b117-4ead-83e6-8749ebdc1dac","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"68f57d1d-2321-4125-847a-e384e3922bdc","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},},},"Disabled":false,"id":"9f51f75b-3818-49cb-926f-6dac700c239f","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3aa17fdc-2bf1-413b-a492-1613c3b88cfe","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},},},"Disabled":false,"id":"5f957d71-882b-41c1-8c88-4a4408bb5b89","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 84f0fa2bf3..af60c15eed 100644 --- a/sprites/spr_weapon_relbla/spr_weapon_relbla.yy +++ b/sprites/spr_weapon_relbla/spr_weapon_relbla.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "deprecated", + "path": "folders/Sprites/Marine Viewer/deprecated.yy", }, "preMultiplyAlpha": false, "sequence": { 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 3288e5aaec..d03b3ef64d 100644 --- a/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy +++ b/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy index 350741ab8f..3cb7e16bd8 100644 --- a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy +++ b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_sbolter", - "bbox_bottom": 189, - "bbox_left": 5, - "bbox_right": 164, - "bbox_top": 109, + "bbox_bottom": 168, + "bbox_left": 3, + "bbox_right": 64, + "bbox_top": 88, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9e8743e4-54e1-4c35-b7e7-bb668123eb5f",}, ], "gridX": 0, "gridY": 0, @@ -26,8 +25,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -56,10 +55,9 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},},},"Disabled":false,"id":"6f46c285-35b1-4a8e-b996-6405ca743092","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9e8743e4-54e1-4c35-b7e7-bb668123eb5f","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},},},"Disabled":false,"id":"a67c52fb-67e4-4c22-b808-d2298d2b778b","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "volume": 1.0, "xorigin": 0, "yorigin": 0, @@ -72,5 +70,5 @@ }, "type": 0, "VTile": false, - "width": 180, + "width": 167, } \ No newline at end of file diff --git a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy index e08e7a44a0..59b85ea60d 100644 --- a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy +++ b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_sniper", - "bbox_bottom": 210, + "bbox_bottom": 230, "bbox_left": 27, - "bbox_right": 141, - "bbox_top": 29, + "bbox_right": 61, + "bbox_top": 49, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,22 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"09e772d4-7976-49cd-a2e3-9dce1939fed0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f7d01509-757f-4c4e-a51b-dcc361898e6e",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f1b26714-9ca5-403a-a3b5-4a22cb8b41a7",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d2013d9-4e68-4804-a99b-82cff87af25a",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"34745a3f-9a2b-4068-80b0-9cd500568408","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2b9111a5-a70d-4779-86f0-73de1ae3fb8e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 0, + "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -46,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -58,15 +55,12 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},},},"Disabled":false,"id":"a7fe76e7-cc09-48ac-9bb7-983d65dd2ac7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f7d01509-757f-4c4e-a51b-dcc361898e6e","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},},},"Disabled":false,"id":"d4dea5d2-c2ba-4c2e-8e3f-2bb5c7b0e2d6","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f1b26714-9ca5-403a-a3b5-4a22cb8b41a7","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},},},"Disabled":false,"id":"21052f2d-58a9-4742-a86b-902e511730a4","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d2013d9-4e68-4804-a99b-82cff87af25a","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},},},"Disabled":false,"id":"cf3eec8f-c6cc-4b48-bdcc-c61c47bd1eaa","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 0, + "yorigin": 10, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy index 54ff988f8d..544fb4cb1e 100644 --- a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy +++ b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_stalker", - "bbox_bottom": 220, - "bbox_left": 5, - "bbox_right": 161, - "bbox_top": 96, + "bbox_bottom": 222, + "bbox_left": 0, + "bbox_right": 71, + "bbox_top": 98, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,20 +14,19 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"14db339f-7395-4530-87dc-3a3aace86211",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7e8f3edd-ff77-4205-87a8-3319cc21c8df",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dcb709d2-2301-4c99-acab-76c6a482bdac","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a4cd5a4b-c267-449f-9b5f-c336e8f68c00","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "ranged", + "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -44,11 +43,11 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, - "playbackSpeed": 30.0, + "playbackSpeed": 1.0, "playbackSpeedType": 0, "showBackdrop": true, "showBackdropImage": false, @@ -56,7 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"14db339f-7395-4530-87dc-3a3aace86211","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},},},"Disabled":false,"id":"160c40ae-6978-467b-a08b-d4ae57c05d2b","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7e8f3edd-ff77-4205-87a8-3319cc21c8df","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},},},"Disabled":false,"id":"65a240e4-c608-4ea9-8edf-d3965fd5d49d","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 8bc4ea46ed..2622e550f3 100644 --- a/sprites/spr_weapon_standard/spr_weapon_standard.yy +++ b/sprites/spr_weapon_standard/spr_weapon_standard.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "deprecated", + "path": "folders/Sprites/Marine Viewer/deprecated.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy index 38f6872fa9..8c1bc452c9 100644 --- a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy +++ b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "weapons", - "path": "folders/Sprites/Marine Viewer/weapons.yy", + "name": "melee", + "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", }, "preMultiplyAlpha": false, "sequence": { 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 new file mode 100644 index 0000000000..400690dfc7 --- /dev/null +++ b/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_ws_mk3__pualdron_veteran", + "bbox_bottom": 121, + "bbox_left": 11, + "bbox_right": 60, + "bbox_top": 64, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"41a2cc3c-da75-4ae5-957f-4605884d3c33",}, + ], + "gridX": 0, + "gridY": 0, + "height": 272, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dd66fef4-fe3c-4559-81ee-9bc6e44d5624","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "white_scars_specials", + "path": "folders/Sprites/Marine Viewer/body_types/specialist/white_scars_specials.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_ws_mk3__pualdron_veteran", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},},},"Disabled":false,"id":"a6bfe4dd-ff75-4365-af6c-fadbb12914f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 167, +} \ No newline at end of file diff --git a/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy b/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy new file mode 100644 index 0000000000..36235f4918 --- /dev/null +++ b/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_ws_mk4_monovisor", + "bbox_bottom": 83, + "bbox_left": 73, + "bbox_right": 94, + "bbox_top": 69, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226",}, + ], + "gridX": 0, + "gridY": 0, + "height": 272, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2353db13-4d43-4b24-a599-a7eda0369bac","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "white_scars_specials", + "path": "folders/Sprites/Marine Viewer/body_types/specialist/white_scars_specials.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_ws_mk4_monovisor", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},},},"Disabled":false,"id":"2f7020a2-698f-4265-8a00-5d2988511edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 167, +} \ No newline at end of file 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 new file mode 100644 index 0000000000..df953a5373 --- /dev/null +++ b/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_ws_mk7_scar_of_the_ancients", + "bbox_bottom": 73, + "bbox_left": 68, + "bbox_right": 79, + "bbox_top": 59, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c43a742-205d-4a15-b030-7a635381bb2e",}, + ], + "gridX": 0, + "gridY": 0, + "height": 272, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"96444367-d43b-48f2-af6a-7071317401bd","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "white_scars_specials", + "path": "folders/Sprites/Marine Viewer/body_types/specialist/white_scars_specials.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_ws_mk7_scar_of_the_ancients", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5c43a742-205d-4a15-b030-7a635381bb2e","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},},},"Disabled":false,"id":"93fb0caf-9576-4f30-be2c-b8caebd494e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 167, +} \ No newline at end of file From 4c4d93742b8e67bc20a87a03433555a139d8ebf0 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 7 Dec 2024 11:57:56 +0000 Subject: [PATCH 2/3] Revert "fix index problem with refugess ships" This reverts commit 9ffaad94968ad0c079c1b6ba50b97d2bf3162b87. --- ChapterMaster.yyp | 125 +++++------------- fonts/fnt_menu/fnt_menu.old.png | Bin 28184 -> 28184 bytes fonts/fnt_menu/fnt_menu.old.yy | 2 +- fonts/fnt_menu/fnt_menu.png | Bin 28184 -> 28184 bytes objects/obj_drop_select/obj_drop_select.yy | 2 +- objects/obj_star_select/obj_star_select.yy | 4 +- rooms/Game/Game.yy | 1 - scripts/scr_PlanetData/scr_PlanetData.yy | 11 -- scripts/scr_apothecarium/scr_apothecarium.yy | 11 -- .../scr_complex_colour_kit.yy | 11 -- .../scr_drop_select_function.yy | 11 -- .../scr_equipment_struct.yy | 11 -- .../scr_get_item_names/scr_get_item_names.yy | 11 -- scripts/scr_livery_setup/scr_livery_setup.yy | 11 -- .../scr_ork_fleet_functions.gml | 25 ++-- .../scr_player_fleet_combat_functions.yy | 11 -- scripts/scr_roster/scr_roster.yy | 11 -- .../scr_specialist_point_handler.yy | 11 -- .../scr_specialist_points.yy | 11 -- .../scr_sprite_functions.yy | 11 -- .../scr_sprite_helpers/scr_sprite_helpers.yy | 11 -- scripts/scr_unit_traits/scr_unit_traits.yy | 11 -- .../full_livery_shader/full_livery_shader.yy | 10 -- sprites/Sprite544/Sprite544.yy | 74 ----------- sprites/spr_bionics_arm/spr_bionics_arm.yy | 3 +- .../spr_chaplain_skull_helm.yy | 10 +- sprites/spr_da_backpack/spr_da_backpack.yy | 4 +- .../spr_da_term_honor/spr_da_term_honor.yy | 2 +- .../spr_faction_icons/spr_faction_icons.yy | 104 --------------- sprites/spr_gear_chap/spr_gear_chap.yy | 4 +- .../spr_gear_librarian/spr_gear_librarian.yy | 74 ----------- .../spr_gothic_numbers_right_pauldron.yy | 94 ------------- .../spr_indomitus_backpack_variants.yy | 78 ----------- .../spr_indomitus_chest_variants.yy | 78 ----------- .../spr_indomitus_complex.yy | 74 ----------- .../spr_indomitus_left_arm.yy | 74 ----------- .../spr_indomitus_leg_variants.yy | 78 ----------- .../spr_indomitus_right_arm.yy | 74 ----------- sprites/spr_mk3_complex/spr_mk3_complex.yy | 74 ----------- .../spr_mk3_complex_backpack.yy | 74 ----------- .../spr_mk3_head_variants.yy | 80 ----------- sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy | 74 ----------- .../spr_mk3_left_trim/spr_mk3_left_trim.yy | 80 ----------- .../spr_mk3_right_arm/spr_mk3_right_arm.yy | 74 ----------- .../spr_mk3_right_trim/spr_mk3_right_trim.yy | 80 ----------- .../spr_mk4_chest_variants.yy | 80 ----------- sprites/spr_mk4_complex/spr_mk4_complex.yy | 74 ----------- .../spr_mk4_complex_backpack.yy | 74 ----------- sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy | 74 ----------- .../spr_mk4_left_trim/spr_mk4_left_trim.yy | 82 ------------ .../spr_mk4_leg_variants.yy | 80 ----------- .../spr_mk4_mouth_variants.yy | 82 ------------ .../spr_mk4_right_arm/spr_mk4_right_arm.yy | 74 ----------- .../spr_mk4_right_trim/spr_mk4_right_trim.yy | 82 ------------ sprites/spr_mk5_complex/spr_mk5_complex.yy | 74 ----------- .../spr_mk5_complex_backpack.yy | 74 ----------- .../spr_mk5_head_variants.yy | 74 ----------- sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy | 74 ----------- .../spr_mk5_right_arm/spr_mk5_right_arm.yy | 74 ----------- sprites/spr_mk6_complex/spr_mk6_complex.yy | 74 ----------- .../spr_mk6_complex_backpack.yy | 74 ----------- sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy | 74 ----------- .../spr_mk6_right_arm/spr_mk6_right_arm.yy | 74 ----------- .../spr_mk7_chest_variants.yy | 82 ------------ sprites/spr_mk7_complex/spr_mk7_complex.yy | 74 ----------- .../spr_mk7_complex_backpack.yy | 74 ----------- .../spr_mk7_full_colour.yy | 80 ----------- sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy | 74 ----------- .../spr_mk7_left_trim/spr_mk7_left_trim.yy | 80 ----------- .../spr_mk7_leg_variants.yy | 78 ----------- .../spr_mk7_mouth_variants.yy | 80 ----------- .../spr_mk7_right_arm/spr_mk7_right_arm.yy | 74 ----------- .../spr_mk7_right_trim/spr_mk7_right_trim.yy | 80 ----------- .../spr_mk7_thorax_variants.yy | 84 ------------ sprites/spr_mk8_complex/spr_mk8_complex.yy | 74 ----------- .../spr_mk8_complex_backpack.yy | 74 ----------- sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy | 74 ----------- .../spr_mk8_right_arm/spr_mk8_right_arm.yy | 74 ----------- .../spr_numeral_left_knee.yy | 94 ------------- sprites/spr_pa_arms/spr_pa_arms.yy | 3 +- .../spr_pa_arms_ornate/spr_pa_arms_ornate.yy | 3 +- sprites/spr_pa_hands/spr_pa_hands.yy | 4 +- .../spr_pack_brazier2/spr_pack_brazier2.yy | 74 ----------- .../spr_pack_brazier3/spr_pack_brazier3.yy | 74 ----------- .../spr_pack_devastator.yy | 10 +- sprites/spr_pack_jump/spr_pack_jump.yy | 4 +- sprites/spr_scout_arms/spr_scout_arms.yy | 8 +- .../spr_scout_colors2/spr_scout_colors2.yy | 6 +- .../spr_tartaros_complex.yy | 74 ----------- .../spr_tartaros_left_arm.yy | 74 ----------- .../spr_tartaros_right_arm.yy | 74 ----------- .../spr_terminator_arms.yy | 11 +- .../spr_terminator_hands.yy | 8 +- .../spr_weapon_autocannon.yy | 4 +- .../spr_weapon_autocannon2.yy | 74 ----------- .../spr_weapon_bolter/spr_weapon_bolter.yy | 22 +-- .../spr_weapon_boltpis/spr_weapon_boltpis.yy | 16 ++- .../spr_weapon_boltstorm_gauntlet_small.yy | 4 +- .../spr_weapon_chainfist_small.yy | 4 +- sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy | 22 +-- .../spr_weapon_chsword/spr_weapon_chsword.yy | 18 ++- .../spr_weapon_colors/spr_weapon_colors.yy | 4 +- .../spr_weapon_comflamer.yy | 18 +-- .../spr_weapon_comgrav/spr_weapon_comgrav.yy | 74 ----------- .../spr_weapon_commelta.yy | 74 ----------- .../spr_weapon_complas/spr_weapon_complas.yy | 74 ----------- .../spr_weapon_crozarc/spr_weapon_crozarc.yy | 4 +- .../spr_weapon_eldsword.yy | 4 +- sprites/spr_weapon_evisc/spr_weapon_evisc.yy | 4 +- .../spr_weapon_flamer/spr_weapon_flamer.yy | 22 +-- .../spr_weapon_frcstaff.yy | 18 ++- .../spr_weapon_grav_cannon.yy | 30 ++--- .../spr_weapon_grav_gun.yy | 14 +- .../spr_weapon_grav_pistol.yy | 14 +- .../spr_weapon_hand_flamer.yy | 14 +- sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy | 4 +- .../spr_weapon_hflamer/spr_weapon_hflamer.yy | 4 +- .../spr_weapon_hthhammer.yy | 4 +- .../spr_weapon_inferno/spr_weapon_inferno.yy | 18 +-- sprites/spr_weapon_knife/spr_weapon_knife.yy | 22 +-- sprites/spr_weapon_lasca/spr_weapon_lasca.yy | 4 +- .../spr_weapon_lightning1.yy | 4 +- .../spr_weapon_mace_of_absolution.yy | 74 ----------- sprites/spr_weapon_melta/spr_weapon_melta.yy | 18 +-- .../spr_weapon_missile/spr_weapon_missile.yy | 20 +-- .../spr_weapon_mmelta/spr_weapon_mmelta.yy | 4 +- sprites/spr_weapon_plasc/spr_weapon_plasc.yy | 4 +- sprites/spr_weapon_plasg/spr_weapon_plasg.yy | 10 +- sprites/spr_weapon_plasp/spr_weapon_plasp.yy | 16 ++- .../spr_weapon_powaxe/spr_weapon_powaxe.yy | 26 ++-- .../spr_weapon_powfist/spr_weapon_powfist.yy | 4 +- .../spr_weapon_powfist2.yy | 4 +- .../spr_weapon_powfist_old.yy | 4 +- .../spr_weapon_powmace/spr_weapon_powmace.yy | 24 ++-- .../spr_weapon_powmaul/spr_weapon_powmaul.yy | 18 ++- .../spr_weapon_powspear.yy | 18 ++- .../spr_weapon_powspear2.yy | 4 +- .../spr_weapon_powspear3.yy | 10 +- .../spr_weapon_powswo/spr_weapon_powswo.yy | 18 ++- .../spr_weapon_relbla/spr_weapon_relbla.yy | 4 +- .../spr_weapon_relic_blade.yy | 4 +- .../spr_weapon_sbolter/spr_weapon_sbolter.yy | 20 +-- .../spr_weapon_sniper/spr_weapon_sniper.yy | 24 ++-- .../spr_weapon_stalker/spr_weapon_stalker.yy | 20 +-- .../spr_weapon_standard.yy | 4 +- .../spr_weapon_thhammer.yy | 4 +- .../spr_ws_mk3__pualdron_veteran.yy | 74 ----------- .../spr_ws_mk4_monovisor.yy | 74 ----------- .../spr_ws_mk7_scar_of_the_ancients.yy | 74 ----------- 149 files changed, 413 insertions(+), 5486 deletions(-) delete mode 100644 scripts/scr_PlanetData/scr_PlanetData.yy delete mode 100644 scripts/scr_apothecarium/scr_apothecarium.yy delete mode 100644 scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy delete mode 100644 scripts/scr_drop_select_function/scr_drop_select_function.yy delete mode 100644 scripts/scr_equipment_struct/scr_equipment_struct.yy delete mode 100644 scripts/scr_get_item_names/scr_get_item_names.yy delete mode 100644 scripts/scr_livery_setup/scr_livery_setup.yy delete mode 100644 scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy delete mode 100644 scripts/scr_roster/scr_roster.yy delete mode 100644 scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy delete mode 100644 scripts/scr_specialist_points/scr_specialist_points.yy delete mode 100644 scripts/scr_sprite_functions/scr_sprite_functions.yy delete mode 100644 scripts/scr_sprite_helpers/scr_sprite_helpers.yy delete mode 100644 scripts/scr_unit_traits/scr_unit_traits.yy delete mode 100644 shaders/full_livery_shader/full_livery_shader.yy delete mode 100644 sprites/Sprite544/Sprite544.yy delete mode 100644 sprites/spr_faction_icons/spr_faction_icons.yy delete mode 100644 sprites/spr_gear_librarian/spr_gear_librarian.yy delete mode 100644 sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy delete mode 100644 sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy delete mode 100644 sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy delete mode 100644 sprites/spr_indomitus_complex/spr_indomitus_complex.yy delete mode 100644 sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy delete mode 100644 sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy delete mode 100644 sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy delete mode 100644 sprites/spr_mk3_complex/spr_mk3_complex.yy delete mode 100644 sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy delete mode 100644 sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy delete mode 100644 sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy delete mode 100644 sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy delete mode 100644 sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy delete mode 100644 sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy delete mode 100644 sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy delete mode 100644 sprites/spr_mk4_complex/spr_mk4_complex.yy delete mode 100644 sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy delete mode 100644 sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy delete mode 100644 sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy delete mode 100644 sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy delete mode 100644 sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy delete mode 100644 sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy delete mode 100644 sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy delete mode 100644 sprites/spr_mk5_complex/spr_mk5_complex.yy delete mode 100644 sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy delete mode 100644 sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy delete mode 100644 sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy delete mode 100644 sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy delete mode 100644 sprites/spr_mk6_complex/spr_mk6_complex.yy delete mode 100644 sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy delete mode 100644 sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy delete mode 100644 sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy delete mode 100644 sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy delete mode 100644 sprites/spr_mk7_complex/spr_mk7_complex.yy delete mode 100644 sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy delete mode 100644 sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy delete mode 100644 sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy delete mode 100644 sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy delete mode 100644 sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy delete mode 100644 sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy delete mode 100644 sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy delete mode 100644 sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy delete mode 100644 sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy delete mode 100644 sprites/spr_mk8_complex/spr_mk8_complex.yy delete mode 100644 sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy delete mode 100644 sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy delete mode 100644 sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy delete mode 100644 sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy delete mode 100644 sprites/spr_pack_brazier2/spr_pack_brazier2.yy delete mode 100644 sprites/spr_pack_brazier3/spr_pack_brazier3.yy delete mode 100644 sprites/spr_tartaros_complex/spr_tartaros_complex.yy delete mode 100644 sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy delete mode 100644 sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy delete mode 100644 sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy delete mode 100644 sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy delete mode 100644 sprites/spr_weapon_commelta/spr_weapon_commelta.yy delete mode 100644 sprites/spr_weapon_complas/spr_weapon_complas.yy delete mode 100644 sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy delete mode 100644 sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy delete mode 100644 sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy delete mode 100644 sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index d41af64106..0ab56fc326 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -61,17 +61,8 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"arms_hands","folderPath":"folders/Sprites/Marine Viewer/arms_hands.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"bionics","folderPath":"folders/Sprites/Marine Viewer/bionics.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"body_types","folderPath":"folders/Sprites/Marine Viewer/body_types.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"indomitus_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_3_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_4_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_5_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_6_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_7_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"mk_8_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"specialist","folderPath":"folders/Sprites/Marine Viewer/body_types/specialist.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"dark_angels_specials","folderPath":"folders/Sprites/Marine Viewer/body_types/specialist/dark_angels_specials.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"white_scars_specials","folderPath":"folders/Sprites/Marine Viewer/body_types/specialist/white_scars_specials.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"tartaros_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"decorations","folderPath":"folders/Sprites/Marine Viewer/decorations.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"deprecated","folderPath":"folders/Sprites/Marine Viewer/deprecated.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"dreadnought","folderPath":"folders/Sprites/Marine Viewer/dreadnought.yy",}, @@ -80,12 +71,8 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"helms","folderPath":"folders/Sprites/Marine Viewer/helms.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"dark_angels","folderPath":"folders/Sprites/Marine Viewer/helms/dark_angels.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"packs","folderPath":"folders/Sprites/Marine Viewer/packs.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"unused","folderPath":"folders/Sprites/Marine Viewer/unused.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"weapons_terminator","folderPath":"folders/Sprites/Marine Viewer/weapons_terminator.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"weapons","folderPath":"folders/Sprites/Marine Viewer/weapons.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"heavy_ranged","folderPath":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"melee","folderPath":"folders/Sprites/Marine Viewer/weapons/melee.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"ranged","folderPath":"folders/Sprites/Marine Viewer/weapons/ranged.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"New Ground","folderPath":"folders/Sprites/New Ground.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"New UI","folderPath":"folders/Sprites/New UI.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Ally Splash","folderPath":"folders/Sprites/New UI/Ally Splash.yy",}, @@ -107,7 +94,32 @@ ], "IncludedFiles": [ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"custom_icons_help.txt","CopyToMask":153157610357391598,"filePath":"datafiles/icons",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"creation_icons.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing1.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing2.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing3.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing4.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing5.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing7.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"existing8.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"instructions.txt","CopyToMask":9223372036854775807,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"lamenters_alternate.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main1.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main2.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main3.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main4.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main5.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main6.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main7.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main8.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"main9.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other1.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other3.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other5.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other6.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"other7.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"slate1.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"slate2.png","CopyToMask":-1,"filePath":"datafiles/images/creation",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"advisor1.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"advisor11.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"advisor12.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, @@ -324,7 +336,6 @@ {"id":{"name":"spr_creation_icon","path":"sprites/spr_creation_icon/spr_creation_icon.yy",},}, {"id":{"name":"spr_weapon_boltstorm_gauntlet","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},}, {"id":{"name":"spr_cm_specialty","path":"sprites/spr_cm_specialty/spr_cm_specialty.yy",},}, - {"id":{"name":"scr_drop_select_function","path":"scripts/scr_drop_select_function/scr_drop_select_function.yy",},}, {"id":{"name":"spr_planet_splash","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},}, {"id":{"name":"spr_creation_arrow","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},}, {"id":{"name":"spr_creation_check","path":"sprites/spr_creation_check/spr_creation_check.yy",},}, @@ -335,7 +346,6 @@ {"id":{"name":"spr_creation_other","path":"sprites/spr_creation_other/spr_creation_other.yy",},}, {"id":{"name":"spr_generic_sgt_mk4","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},}, {"id":{"name":"spr_creation_nosplash","path":"sprites/spr_creation_nosplash/spr_creation_nosplash.yy",},}, - {"id":{"name":"spr_mk5_complex_backpack","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},}, {"id":{"name":"spr_rg_mk6_helm","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},}, {"id":{"name":"spr_creation_slate","path":"sprites/spr_creation_slate/spr_creation_slate.yy",},}, {"id":{"name":"spr_gear_halo","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},}, @@ -378,9 +388,7 @@ {"id":{"name":"spr_termi_wep_fix","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},}, {"id":{"name":"spr_honor_helm","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},}, {"id":{"name":"spr_pack_brazier","path":"sprites/spr_pack_brazier/spr_pack_brazier.yy",},}, - {"id":{"name":"spr_mk7_left_trim","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},}, {"id":{"name":"spr_pack_arm","path":"sprites/spr_pack_arm/spr_pack_arm.yy",},}, - {"id":{"name":"spr_mk7_leg_variants","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},}, {"id":{"name":"spr_pack_arms","path":"sprites/spr_pack_arms/spr_pack_arms.yy",},}, {"id":{"name":"spr_pack_jump","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},}, {"id":{"name":"scr_forge_world_functions","path":"scripts/scr_forge_world_functions/scr_forge_world_functions.yy",},}, @@ -389,7 +397,6 @@ {"id":{"name":"spr_weapon_blank","path":"sprites/spr_weapon_blank/spr_weapon_blank.yy",},}, {"id":{"name":"scr_draw_rectangle","path":"scripts/scr_draw_rectangle/scr_draw_rectangle.yy",},}, {"id":{"name":"scr_buttons","path":"scripts/scr_buttons/scr_buttons.yy",},}, - {"id":{"name":"spr_mk6_complex","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},}, {"id":{"name":"spr_purity_s","path":"sprites/spr_purity_s/spr_purity_s.yy",},}, {"id":{"name":"spr_weapon_boltpis","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},}, {"id":{"name":"spr_weapon_bolter","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},}, @@ -402,7 +409,6 @@ {"id":{"name":"spr_weapon_hbolt","path":"sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy",},}, {"id":{"name":"spr_weapon_mmelta","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},}, {"id":{"name":"spr_weapon_assca","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},}, - {"id":{"name":"spr_mk6_complex_backpack","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},}, {"id":{"name":"spr_weapon_lasca","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},}, {"id":{"name":"spr_generic_sgt_mk7","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},}, {"id":{"name":"spr_weapon_plasg","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},}, @@ -420,7 +426,6 @@ {"id":{"name":"spr_weapon_thhammer","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},}, {"id":{"name":"spr_weapon_evisc","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},}, {"id":{"name":"spr_weapon_powaxe","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},}, - {"id":{"name":"spr_weapon_complas","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},}, {"id":{"name":"spr_weapon_chaxe","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},}, {"id":{"name":"spr_weapon_powswo","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},}, {"id":{"name":"spr_weapon_powspear","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},}, @@ -438,7 +443,6 @@ {"id":{"name":"scr_star_travel_algorithm","path":"scripts/scr_star_travel_algorithm/scr_star_travel_algorithm.yy",},}, {"id":{"name":"spr_weapon_inferno","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},}, {"id":{"name":"spr_cloth_tabbard","path":"sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy",},}, - {"id":{"name":"scr_equipment_struct","path":"scripts/scr_equipment_struct/scr_equipment_struct.yy",},}, {"id":{"name":"spr_weapon_relbla","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},}, {"id":{"name":"spr_weapon_storm","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},}, {"id":{"name":"spr_weapon_stalker","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},}, @@ -462,7 +466,6 @@ {"id":{"name":"spr_loadbar","path":"sprites/spr_loadbar/spr_loadbar.yy",},}, {"id":{"name":"scr_mission_functions","path":"scripts/scr_mission_functions/scr_mission_functions.yy",},}, {"id":{"name":"spr_loadbar_empty","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},}, - {"id":{"name":"spr_mk8_right_arm","path":"sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy",},}, {"id":{"name":"spr_loadbar_cover","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},}, {"id":{"name":"scr_ground_ai_helpers","path":"scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.yy",},}, {"id":{"name":"spr_load_text","path":"sprites/spr_load_text/spr_load_text.yy",},}, @@ -472,17 +475,16 @@ {"id":{"name":"scr_load_controller","path":"scripts/scr_load_controller/scr_load_controller.yy",},}, {"id":{"name":"spr_formation_arrow","path":"sprites/spr_formation_arrow/spr_formation_arrow.yy",},}, {"id":{"name":"scr_player_fleet_functions","path":"scripts/scr_player_fleet_functions/scr_player_fleet_functions.yy",},}, - {"id":{"name":"spr_mk6_right_arm","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},}, {"id":{"name":"spr_formation_splash","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},}, {"id":{"name":"spr_purge_panel","path":"sprites/spr_purge_panel/spr_purge_panel.yy",},}, {"id":{"name":"spr_purge_buttons","path":"sprites/spr_purge_buttons/spr_purge_buttons.yy",},}, {"id":{"name":"spr_mm_butts","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},}, + {"id":{"name":"scr_colour_modifiers","path":"scripts/scr_colour_modifiers/scr_colour_modifiers.yy",},}, {"id":{"name":"spr_mm_glowold","path":"sprites/spr_mm_glowold/spr_mm_glowold.yy",},}, {"id":{"name":"spr_new_ui","path":"sprites/spr_new_ui/spr_new_ui.yy",},}, {"id":{"name":"spr_new_resource","path":"sprites/spr_new_resource/spr_new_resource.yy",},}, {"id":{"name":"spr_warp_level_icon","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},}, {"id":{"name":"spr_new_banner","path":"sprites/spr_new_banner/spr_new_banner.yy",},}, - {"id":{"name":"spr_mk6_left_arm","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},}, {"id":{"name":"spr_new_ui_cover","path":"sprites/spr_new_ui_cover/spr_new_ui_cover.yy",},}, {"id":{"name":"scr_unit_spawn_functions","path":"scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.yy",},}, {"id":{"name":"spr_ui_but_1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},}, @@ -491,10 +493,8 @@ {"id":{"name":"spr_ui_but_4","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},}, {"id":{"name":"spr_ui_hov_1","path":"sprites/spr_ui_hov_1/spr_ui_hov_1.yy",},}, {"id":{"name":"spr_ui_hov_2","path":"sprites/spr_ui_hov_2/spr_ui_hov_2.yy",},}, - {"id":{"name":"spr_mk7_left_arm","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},}, {"id":{"name":"spr_ui_hov_3","path":"sprites/spr_ui_hov_3/spr_ui_hov_3.yy",},}, {"id":{"name":"spr_pa_hands","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},}, - {"id":{"name":"spr_mk7_complex","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},}, {"id":{"name":"scr_image","path":"scripts/scr_image/scr_image.yy",},}, {"id":{"name":"spr_ui_hov_4","path":"sprites/spr_ui_hov_4/spr_ui_hov_4.yy",},}, {"id":{"name":"spr_settings_button","path":"sprites/spr_settings_button/spr_settings_button.yy",},}, @@ -532,10 +532,8 @@ {"id":{"name":"dsgsdgsdg","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},}, {"id":{"name":"spr_loading","path":"sprites/spr_loading/spr_loading.yy",},}, {"id":{"name":"spr_loading2","path":"sprites/spr_loading2/spr_loading2.yy",},}, - {"id":{"name":"spr_mk4_left_trim","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},}, {"id":{"name":"spr_penitent_ui","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},}, {"id":{"name":"sprite230","path":"sprites/sprite230/sprite230.yy",},}, - {"id":{"name":"spr_mk3_left_arm","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},}, {"id":{"name":"spr_fast_forward","path":"sprites/spr_fast_forward/spr_fast_forward.yy",},}, {"id":{"name":"spr_psy_hood","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},}, {"id":{"name":"spr_view_small","path":"sprites/spr_view_small/spr_view_small.yy",},}, @@ -552,10 +550,8 @@ {"id":{"name":"spr_star_screen","path":"sprites/spr_star_screen/spr_star_screen.yy",},}, {"id":{"name":"spr_planet_screen","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},}, {"id":{"name":"spr_red_button","path":"sprites/spr_red_button/spr_red_button.yy",},}, - {"id":{"name":"spr_pack_brazier2","path":"sprites/spr_pack_brazier2/spr_pack_brazier2.yy",},}, {"id":{"name":"spr_popup","path":"sprites/spr_popup/spr_popup.yy",},}, {"id":{"name":"spr_attacked","path":"sprites/spr_attacked/spr_attacked.yy",},}, - {"id":{"name":"scr_unit_traits","path":"scripts/scr_unit_traits/scr_unit_traits.yy",},}, {"id":{"name":"scr_marine_struct","path":"scripts/scr_marine_struct/scr_marine_struct.yy",},}, {"id":{"name":"spr_raid","path":"sprites/spr_raid/spr_raid.yy",},}, {"id":{"name":"spr_purge_1","path":"sprites/spr_purge_1/spr_purge_1.yy",},}, @@ -565,11 +561,8 @@ {"id":{"name":"spr_advisors","path":"sprites/spr_advisors/spr_advisors.yy",},}, {"id":{"name":"spr_diplomacy","path":"sprites/spr_diplomacy/spr_diplomacy.yy",},}, {"id":{"name":"spr_maximus_colors2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},}, - {"id":{"name":"spr_indomitus_leg_variants","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},}, {"id":{"name":"spr_diplomacy_dae","path":"sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy",},}, {"id":{"name":"sprite267","path":"sprites/sprite267/sprite267.yy",},}, - {"id":{"name":"spr_mk4_left_arm","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},}, - {"id":{"name":"scr_sprite_functions","path":"scripts/scr_sprite_functions/scr_sprite_functions.yy",},}, {"id":{"name":"spr_master_splash","path":"sprites/spr_master_splash/spr_master_splash.yy",},}, {"id":{"name":"spr_saveload","path":"sprites/spr_saveload/spr_saveload.yy",},}, {"id":{"name":"spr_sw_mk5_helm","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},}, @@ -577,9 +570,7 @@ {"id":{"name":"spr_diplomacy_med","path":"sprites/spr_diplomacy_med/spr_diplomacy_med.yy",},}, {"id":{"name":"spr_diplomacy_defeated","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},}, {"id":{"name":"sprite266","path":"sprites/sprite266/sprite266.yy",},}, - {"id":{"name":"spr_mk3_complex_backpack","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},}, {"id":{"name":"spr_ship_song","path":"sprites/spr_ship_song/spr_ship_song.yy",},}, - {"id":{"name":"spr_tartaros_left_arm","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},}, {"id":{"name":"sprite235","path":"sprites/sprite235/sprite235.yy",},}, {"id":{"name":"spr_bionics_leg_2","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},}, {"id":{"name":"spr_ship_bb","path":"sprites/spr_ship_bb/spr_ship_bb.yy",},}, @@ -591,7 +582,6 @@ {"id":{"name":"scr_draw_unit_stat_data","path":"scripts/scr_draw_unit_stat_data/scr_draw_unit_stat_data.yy",},}, {"id":{"name":"spr_ship_glad","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},}, {"id":{"name":"spr_ship_hunt","path":"sprites/spr_ship_hunt/spr_ship_hunt.yy",},}, - {"id":{"name":"spr_numeral_left_knee","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},}, {"id":{"name":"spr_luck_icon","path":"sprites/spr_luck_icon/spr_luck_icon.yy",},}, {"id":{"name":"spr_ship_apoc","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},}, {"id":{"name":"spr_ship_nem","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},}, @@ -609,13 +599,10 @@ {"id":{"name":"spr_ship_craftworld","path":"sprites/spr_ship_craftworld/spr_ship_craftworld.yy",},}, {"id":{"name":"spr_binders_robes","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},}, {"id":{"name":"spr_helm_decorations","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},}, - {"id":{"name":"spr_ws_mk7_scar_of_the_ancients","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},}, {"id":{"name":"spr_ship_ammer","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},}, - {"id":{"name":"spr_weapon_autocannon2","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},}, {"id":{"name":"scr_diplomacy_helpers","path":"scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.yy",},}, {"id":{"name":"spr_dread_iron_clad","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},}, {"id":{"name":"scr_has_adv","path":"scripts/scr_has_adv/scr_has_adv.yy",},}, - {"id":{"name":"spr_mk3_right_trim","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},}, {"id":{"name":"spr_ship_deth","path":"sprites/spr_ship_deth/spr_ship_deth.yy",},}, {"id":{"name":"spr_ship_gorbag","path":"sprites/spr_ship_gorbag/spr_ship_gorbag.yy",},}, {"id":{"name":"spr_ship_kroozer","path":"sprites/spr_ship_kroozer/spr_ship_kroozer.yy",},}, @@ -624,21 +611,17 @@ {"id":{"name":"spr_ih_mk6_helm","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},}, {"id":{"name":"spr_mk5_colors","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},}, {"id":{"name":"spr_ship_slam","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},}, - {"id":{"name":"spr_mk7_right_trim","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},}, {"id":{"name":"spr_ship_hulk","path":"sprites/spr_ship_hulk/spr_ship_hulk.yy",},}, {"id":{"name":"spr_fighta","path":"sprites/spr_fighta/spr_fighta.yy",},}, - {"id":{"name":"spr_weapon_comgrav","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},}, {"id":{"name":"spr_weapon_hand_flamer","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},}, {"id":{"name":"spr_ship_void","path":"sprites/spr_ship_void/spr_ship_void.yy",},}, {"id":{"name":"spr_faith_icon","path":"sprites/spr_faith_icon/spr_faith_icon.yy",},}, {"id":{"name":"spr_mk7_colors","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},}, {"id":{"name":"spr_mk4_colors","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},}, {"id":{"name":"spr_ship_shadow","path":"sprites/spr_ship_shadow/spr_ship_shadow.yy",},}, - {"id":{"name":"spr_mk4_complex_backpack","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},}, {"id":{"name":"spr_ws_mk5_helm","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},}, {"id":{"name":"spr_ship_aconite","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},}, {"id":{"name":"spr_ship_hellebore","path":"sprites/spr_ship_hellebore/spr_ship_hellebore.yy",},}, - {"id":{"name":"spr_mk5_right_arm","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},}, {"id":{"name":"spr_darkstar","path":"sprites/spr_darkstar/spr_darkstar.yy",},}, {"id":{"name":"sprite221","path":"sprites/sprite221/sprite221.yy",},}, {"id":{"name":"spr_ship_custodian","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},}, @@ -650,9 +633,7 @@ {"id":{"name":"spr_ship_castellan","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},}, {"id":{"name":"spr_manta","path":"sprites/spr_manta/spr_manta.yy",},}, {"id":{"name":"spr_ship_leviathan","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},}, - {"id":{"name":"spr_mk8_complex","path":"sprites/spr_mk8_complex/spr_mk8_complex.yy",},}, {"id":{"name":"spr_ship_razorfiend","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},}, - {"id":{"name":"spr_mk7_right_arm","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},}, {"id":{"name":"scr_wait_and_execute","path":"scripts/scr_wait_and_execute/scr_wait_and_execute.yy",},}, {"id":{"name":"spr_ship_stalker","path":"sprites/spr_ship_stalker/spr_ship_stalker.yy",},}, {"id":{"name":"spr_weapon_plasc","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},}, @@ -691,9 +672,7 @@ {"id":{"name":"spr_battle_block2","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},}, {"id":{"name":"spr_weapon_storm2","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},}, {"id":{"name":"spr_rg_mk7_helm","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},}, - {"id":{"name":"scr_apothecarium","path":"scripts/scr_apothecarium/scr_apothecarium.yy",},}, {"id":{"name":"spr_pa_arms","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},}, - {"id":{"name":"scr_complex_colour_kit","path":"scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy",},}, {"id":{"name":"spr_ws_mk6_helm","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},}, {"id":{"name":"spr_postbattle","path":"sprites/spr_postbattle/spr_postbattle.yy",},}, {"id":{"name":"spr_postbattle_space","path":"sprites/spr_postbattle_space/spr_postbattle_space.yy",},}, @@ -706,17 +685,14 @@ {"id":{"name":"spr_melta","path":"sprites/spr_melta/spr_melta.yy",},}, {"id":{"name":"spr_carrion_breath","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},}, {"id":{"name":"spr_bullet","path":"sprites/spr_bullet/spr_bullet.yy",},}, - {"id":{"name":"Sprite544","path":"sprites/Sprite544/Sprite544.yy",},}, {"id":{"name":"spr_tech_area_pad","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},}, {"id":{"name":"spr_bolt","path":"sprites/spr_bolt/spr_bolt.yy",},}, {"id":{"name":"spr_pulse","path":"sprites/spr_pulse/spr_pulse.yy",},}, {"id":{"name":"spr_railgun","path":"sprites/spr_railgun/spr_railgun.yy",},}, - {"id":{"name":"spr_mk7_full_colour","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},}, {"id":{"name":"spr_ground_las","path":"sprites/spr_ground_las/spr_ground_las.yy",},}, {"id":{"name":"spr_weapon_standard2","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},}, {"id":{"name":"spr_green_las","path":"sprites/spr_green_las/spr_green_las.yy",},}, {"id":{"name":"spr_ground_conv","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},}, - {"id":{"name":"spr_mk4_right_trim","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},}, {"id":{"name":"spr_ground_plasma","path":"sprites/spr_ground_plasma/spr_ground_plasma.yy",},}, {"id":{"name":"spr_glob","path":"sprites/spr_glob/spr_glob.yy",},}, {"id":{"name":"spr_cannon","path":"sprites/spr_cannon/spr_cannon.yy",},}, @@ -729,12 +705,10 @@ {"id":{"name":"UIComponents","path":"scripts/UIComponents/UIComponents.yy",},}, {"id":{"name":"spr_mahreen_gun","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},}, {"id":{"name":"spr_star","path":"sprites/spr_star/spr_star.yy",},}, - {"id":{"name":"spr_mk3_right_arm","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},}, {"id":{"name":"spr_da_mk5","path":"sprites/spr_da_mk5/spr_da_mk5.yy",},}, {"id":{"name":"spr_dexterity_icon","path":"sprites/spr_dexterity_icon/spr_dexterity_icon.yy",},}, {"id":{"name":"spr_star_hulk","path":"sprites/spr_star_hulk/spr_star_hulk.yy",},}, {"id":{"name":"spr_warp_storm","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},}, - {"id":{"name":"spr_mk4_right_arm","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},}, {"id":{"name":"sprite205","path":"sprites/sprite205/sprite205.yy",},}, {"id":{"name":"spr_happenings_green","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},}, {"id":{"name":"spr_happenings_red","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},}, @@ -750,7 +724,6 @@ {"id":{"name":"spr_ih_mk5_helm","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},}, {"id":{"name":"spr_fleet_imperial","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},}, {"id":{"name":"light_dark_shader","path":"shaders/light_dark_shader/light_dark_shader.yy",},}, - {"id":{"name":"spr_indomitus_chest_variants","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},}, {"id":{"name":"spr_fleet_mechanicus","path":"sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy",},}, {"id":{"name":"spr_mm_glow","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},}, {"id":{"name":"spr_fleet_inquisition","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},}, @@ -765,12 +738,10 @@ {"id":{"name":"spr_ork_target","path":"sprites/spr_ork_target/spr_ork_target.yy",},}, {"id":{"name":"sprite269","path":"sprites/sprite269/sprite269.yy",},}, {"id":{"name":"spr_mar_fire_body1","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},}, - {"id":{"name":"spr_tartaros_complex","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},}, {"id":{"name":"spr_mar_fire_body2","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},}, {"id":{"name":"spr_mar_fire_body3","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},}, {"id":{"name":"spr_mar_fire_pauldron1","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},}, {"id":{"name":"spr_mar_fire_pauldron2","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},}, - {"id":{"name":"spr_mk7_complex_backpack","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},}, {"id":{"name":"spr_mar_walk_body1","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},}, {"id":{"name":"spr_mar_walk_body2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},}, {"id":{"name":"spr_mar_walk_body3","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},}, @@ -799,7 +770,6 @@ {"id":{"name":"snd_postbattle","path":"sounds/snd_postbattle/snd_postbattle.yy",},}, {"id":{"name":"snd_defeat","path":"sounds/snd_defeat/snd_defeat.yy",},}, {"id":{"name":"snd_buzz","path":"sounds/snd_buzz/snd_buzz.yy",},}, - {"id":{"name":"spr_indomitus_right_arm","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},}, {"id":{"name":"scr_unit_quick_find_pane","path":"scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.yy",},}, {"id":{"name":"snd_redownload","path":"sounds/snd_redownload/snd_redownload.yy",},}, {"id":{"name":"snd_click","path":"sounds/snd_click/snd_click.yy",},}, @@ -839,15 +809,12 @@ {"id":{"name":"scr_json_functions","path":"scripts/scr_json_functions/scr_json_functions.yy",},}, {"id":{"name":"scr_colors_initialize","path":"scripts/scr_colors_initialize/scr_colors_initialize.yy",},}, {"id":{"name":"scr_shader_initialize","path":"scripts/scr_shader_initialize/scr_shader_initialize.yy",},}, - {"id":{"name":"spr_indomitus_complex","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},}, {"id":{"name":"spr_sal_mk6_helm","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},}, - {"id":{"name":"spr_mk4_chest_variants","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},}, {"id":{"name":"spr_weapon_boarding","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},}, {"id":{"name":"spr_bionics_hand","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},}, {"id":{"name":"explode_script","path":"scripts/explode_script/explode_script.yy",},}, {"id":{"name":"relative_direction","path":"scripts/relative_direction/relative_direction.yy",},}, {"id":{"name":"draw_line_dashed","path":"scripts/draw_line_dashed/draw_line_dashed.yy",},}, - {"id":{"name":"spr_mk7_mouth_variants","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},}, {"id":{"name":"turn_towards_point","path":"scripts/turn_towards_point/turn_towards_point.yy",},}, {"id":{"name":"spr_forge_points_icon","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},}, {"id":{"name":"scr_display_number","path":"scripts/scr_display_number/scr_display_number.yy",},}, @@ -860,6 +827,8 @@ {"id":{"name":"scr_lines_increase","path":"scripts/scr_lines_increase/scr_lines_increase.yy",},}, {"id":{"name":"scr_save","path":"scripts/scr_save/scr_save.yy",},}, {"id":{"name":"scr_load","path":"scripts/scr_load/scr_load.yy",},}, + {"id":{"name":"file_encrypt","path":"scripts/file_encrypt/file_encrypt.yy",},}, + {"id":{"name":"file_decrypt","path":"scripts/file_decrypt/file_decrypt.yy",},}, {"id":{"name":"spr_charisma_icon","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},}, {"id":{"name":"spr_weapon_hflamer","path":"sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy",},}, {"id":{"name":"spr_mk8_colors","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},}, @@ -873,20 +842,15 @@ {"id":{"name":"spr_servo_arm","path":"sprites/spr_servo_arm/spr_servo_arm.yy",},}, {"id":{"name":"scr_battle_roster","path":"scripts/scr_battle_roster/scr_battle_roster.yy",},}, {"id":{"name":"scr_civil_roster","path":"scripts/scr_civil_roster/scr_civil_roster.yy",},}, - {"id":{"name":"scr_specialist_points","path":"scripts/scr_specialist_points/scr_specialist_points.yy",},}, {"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},}, {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},}, - {"id":{"name":"spr_mk8_left_arm","path":"sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy",},}, {"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},}, {"id":{"name":"spr_um_mk6_helm","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},}, {"id":{"name":"scr_count_forces","path":"scripts/scr_count_forces/scr_count_forces.yy",},}, {"id":{"name":"spr_weapon_powmace","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},}, {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},}, - {"id":{"name":"spr_ws_mk3__pualdron_veteran","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},}, - {"id":{"name":"scr_specialist_point_handler","path":"scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy",},}, {"id":{"name":"scr_ini_ship_cleanup","path":"scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.yy",},}, {"id":{"name":"spr_ultra_honor_guard","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},}, - {"id":{"name":"spr_mk4_mouth_variants","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},}, {"id":{"name":"scr_punit_combat_heplers","path":"scripts/scr_punit_combat_heplers/scr_punit_combat_heplers.yy",},}, {"id":{"name":"spr_weapon_powspear3","path":"sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy",},}, {"id":{"name":"scr_drop_fiddle","path":"scripts/scr_drop_fiddle/scr_drop_fiddle.yy",},}, @@ -904,11 +868,11 @@ {"id":{"name":"scr_weapon","path":"scripts/scr_weapon/scr_weapon.yy",},}, {"id":{"name":"UINodeScripts","path":"scripts/UINodeScripts/UINodeScripts.yy",},}, {"id":{"name":"scr_move_unit_info","path":"scripts/scr_move_unit_info/scr_move_unit_info.yy",},}, - {"id":{"name":"spr_indomitus_backpack_variants","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},}, {"id":{"name":"scr_en_weapon","path":"scripts/scr_en_weapon/scr_en_weapon.yy",},}, + {"id":{"name":"scr_special_weapon","path":"scripts/scr_special_weapon/scr_special_weapon.yy",},}, {"id":{"name":"spr_narthecium_2","path":"sprites/spr_narthecium_2/spr_narthecium_2.yy",},}, {"id":{"name":"scr_vehicle_weapon","path":"scripts/scr_vehicle_weapon/scr_vehicle_weapon.yy",},}, - {"id":{"name":"scr_sprite_helpers","path":"scripts/scr_sprite_helpers/scr_sprite_helpers.yy",},}, + {"id":{"name":"scr_wep_abbreviate","path":"scripts/scr_wep_abbreviate/scr_wep_abbreviate.yy",},}, {"id":{"name":"scr_scrollbar","path":"scripts/scr_scrollbar/scr_scrollbar.yy",},}, {"id":{"name":"scr_thought","path":"scripts/scr_thought/scr_thought.yy",},}, {"id":{"name":"scr_ui_refresh","path":"scripts/scr_ui_refresh/scr_ui_refresh.yy",},}, @@ -927,14 +891,13 @@ {"id":{"name":"scr_ui_diplomacy","path":"scripts/scr_ui_diplomacy/scr_ui_diplomacy.yy",},}, {"id":{"name":"scr_ui_popup","path":"scripts/scr_ui_popup/scr_ui_popup.yy",},}, {"id":{"name":"spr_weapon_plasma_cannon_term","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},}, - {"id":{"name":"spr_weapon_commelta","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},}, {"id":{"name":"scr_ui_formation_bars","path":"scripts/scr_ui_formation_bars/scr_ui_formation_bars.yy",},}, {"id":{"name":"scr_ui_settings","path":"scripts/scr_ui_settings/scr_ui_settings.yy",},}, {"id":{"name":"scr_arti_descr","path":"scripts/scr_arti_descr/scr_arti_descr.yy",},}, {"id":{"name":"spr_terminator_chap","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},}, {"id":{"name":"spr_sal_mk7_helm","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},}, {"id":{"name":"scr_draw_rainbow","path":"scripts/scr_draw_rainbow/scr_draw_rainbow.yy",},}, - {"id":{"name":"scr_get_item_names","path":"scripts/scr_get_item_names/scr_get_item_names.yy",},}, + {"id":{"name":"scr_weapons_equip","path":"scripts/scr_weapons_equip/scr_weapons_equip.yy",},}, {"id":{"name":"spr_chap_area_pad","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},}, {"id":{"name":"scr_master_loc","path":"scripts/scr_master_loc/scr_master_loc.yy",},}, {"id":{"name":"scr_creation","path":"scripts/scr_creation/scr_creation.yy",},}, @@ -945,7 +908,6 @@ {"id":{"name":"spr_dreadnought_chasis_colors","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},}, {"id":{"name":"scr_vehicle_count","path":"scripts/scr_vehicle_count/scr_vehicle_count.yy",},}, {"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},}, - {"id":{"name":"spr_mk8_complex_backpack","path":"sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.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":"spr_leopard_sprite","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},}, @@ -977,7 +939,6 @@ {"id":{"name":"scr_string_functions","path":"scripts/scr_string_functions/scr_string_functions.yy",},}, {"id":{"name":"scr_income","path":"scripts/scr_income/scr_income.yy",},}, {"id":{"name":"scr_apothecary_ship","path":"scripts/scr_apothecary_ship/scr_apothecary_ship.yy",},}, - {"id":{"name":"spr_mk3_complex","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},}, {"id":{"name":"scr_apothecary_ground","path":"scripts/scr_apothecary_ground/scr_apothecary_ground.yy",},}, {"id":{"name":"scr_mission_eta","path":"scripts/scr_mission_eta/scr_mission_eta.yy",},}, {"id":{"name":"obj_garbage_collector","path":"objects/obj_garbage_collector/obj_garbage_collector.yy",},}, @@ -986,11 +947,8 @@ {"id":{"name":"scr_random_event","path":"scripts/scr_random_event/scr_random_event.yy",},}, {"id":{"name":"obj_planet_map","path":"objects/obj_planet_map/obj_planet_map.yy",},}, {"id":{"name":"scr_khornate_fleet_functions","path":"scripts/scr_khornate_fleet_functions/scr_khornate_fleet_functions.yy",},}, - {"id":{"name":"spr_faction_icons","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},}, {"id":{"name":"scr_random_find","path":"scripts/scr_random_find/scr_random_find.yy",},}, {"id":{"name":"scr_max_marine","path":"scripts/scr_max_marine/scr_max_marine.yy",},}, - {"id":{"name":"spr_mk3_left_trim","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},}, - {"id":{"name":"spr_mk5_left_arm","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},}, {"id":{"name":"scr_random_marine","path":"scripts/scr_random_marine/scr_random_marine.yy",},}, {"id":{"name":"scr_roman","path":"scripts/scr_roman/scr_roman.yy",},}, {"id":{"name":"scr_draw_management_unit","path":"scripts/scr_draw_management_unit/scr_draw_management_unit.yy",},}, @@ -1010,13 +968,13 @@ {"id":{"name":"spr_dread_heavy_bolter","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},}, {"id":{"name":"spr_purity_seal","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},}, {"id":{"name":"scr_zoom","path":"scripts/scr_zoom/scr_zoom.yy",},}, + {"id":{"name":"scr_chapter","path":"scripts/scr_chapter/scr_chapter.yy",},}, {"id":{"name":"scr_map_and_warp_functions","path":"scripts/scr_map_and_warp_functions/scr_map_and_warp_functions.yy",},}, - {"id":{"name":"spr_ws_mk4_monovisor","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},}, {"id":{"name":"scr_chapter_new","path":"scripts/scr_chapter_new/scr_chapter_new.yy",},}, {"id":{"name":"scr_chapter_random","path":"scripts/scr_chapter_random/scr_chapter_random.yy",},}, - {"id":{"name":"spr_gear_librarian","path":"sprites/spr_gear_librarian/spr_gear_librarian.yy",},}, {"id":{"name":"scr_vehicle_order","path":"scripts/scr_vehicle_order/scr_vehicle_order.yy",},}, {"id":{"name":"scr_icon","path":"scripts/scr_icon/scr_icon.yy",},}, + {"id":{"name":"scr_squad_names","path":"scripts/scr_squad_names/scr_squad_names.yy",},}, {"id":{"name":"scr_initialize_custom","path":"scripts/scr_initialize_custom/scr_initialize_custom.yy",},}, {"id":{"name":"scr_roman_numerals","path":"scripts/scr_roman_numerals/scr_roman_numerals.yy",},}, {"id":{"name":"scr_restart_variables","path":"scripts/scr_restart_variables/scr_restart_variables.yy",},}, @@ -1048,13 +1006,11 @@ {"id":{"name":"spr_medicine_icon","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},}, {"id":{"name":"spr_ship_back_black","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},}, {"id":{"name":"action_kill_object","path":"scripts/action_kill_object/action_kill_object.yy",},}, - {"id":{"name":"spr_tartaros_right_arm","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},}, {"id":{"name":"action_restart_game","path":"scripts/action_restart_game/action_restart_game.yy",},}, {"id":{"name":"action_set_alarm","path":"scripts/action_set_alarm/action_set_alarm.yy",},}, {"id":{"name":"action_set_relative","path":"scripts/action_set_relative/action_set_relative.yy",},}, {"id":{"name":"__init_action","path":"scripts/__init_action/__init_action.yy",},}, {"id":{"name":"d3d_set_fog","path":"scripts/d3d_set_fog/d3d_set_fog.yy",},}, - {"id":{"name":"scr_PlanetData","path":"scripts/scr_PlanetData/scr_PlanetData.yy",},}, {"id":{"name":"__init_d3d","path":"scripts/__init_d3d/__init_d3d.yy",},}, {"id":{"name":"draw_set_blend_mode","path":"scripts/draw_set_blend_mode/draw_set_blend_mode.yy",},}, {"id":{"name":"instance_create","path":"scripts/instance_create/instance_create.yy",},}, @@ -1069,11 +1025,9 @@ {"id":{"name":"sReplaceColor","path":"shaders/sReplaceColor/sReplaceColor.yy",},}, {"id":{"name":"fnt_cul_14","path":"fonts/fnt_cul_14/fnt_cul_14.yy",},}, {"id":{"name":"fnt_cul_18","path":"fonts/fnt_cul_18/fnt_cul_18.yy",},}, - {"id":{"name":"spr_mk4_leg_variants","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},}, {"id":{"name":"fnt_40k_10","path":"fonts/fnt_40k_10/fnt_40k_10.yy",},}, {"id":{"name":"fnt_40k_12","path":"fonts/fnt_40k_12/fnt_40k_12.yy",},}, {"id":{"name":"fnt_40k_12i","path":"fonts/fnt_40k_12i/fnt_40k_12i.yy",},}, - {"id":{"name":"spr_indomitus_left_arm","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},}, {"id":{"name":"spr_dread_autocannon","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},}, {"id":{"name":"fnt_40k_14","path":"fonts/fnt_40k_14/fnt_40k_14.yy",},}, {"id":{"name":"fnt_40k_14i","path":"fonts/fnt_40k_14i/fnt_40k_14i.yy",},}, @@ -1089,7 +1043,6 @@ {"id":{"name":"fnt_fancy","path":"fonts/fnt_fancy/fnt_fancy.yy",},}, {"id":{"name":"fnt_menu","path":"fonts/fnt_menu/fnt_menu.yy",},}, {"id":{"name":"spr_dreadnought_decorations","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},}, - {"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},}, {"id":{"name":"fnt_info","path":"fonts/fnt_info/fnt_info.yy",},}, {"id":{"name":"fnt_tiny","path":"fonts/fnt_tiny/fnt_tiny.yy",},}, {"id":{"name":"scr_necron_tombs","path":"scripts/scr_necron_tombs/scr_necron_tombs.yy",},}, @@ -1097,7 +1050,6 @@ {"id":{"name":"fnt_legal","path":"fonts/fnt_legal/fnt_legal.yy",},}, {"id":{"name":"obj_fleet","path":"objects/obj_fleet/obj_fleet.yy",},}, {"id":{"name":"obj_circular","path":"objects/obj_circular/obj_circular.yy",},}, - {"id":{"name":"spr_mk4_complex","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},}, {"id":{"name":"obj_fleet_spawner","path":"objects/obj_fleet_spawner/obj_fleet_spawner.yy",},}, {"id":{"name":"obj_fleet_controller","path":"objects/obj_fleet_controller/obj_fleet_controller.yy",},}, {"id":{"name":"obj_p_ship","path":"objects/obj_p_ship/obj_p_ship.yy",},}, @@ -1125,9 +1077,7 @@ {"id":{"name":"scr_system_search_helpers","path":"scripts/scr_system_search_helpers/scr_system_search_helpers.yy",},}, {"id":{"name":"obj_p_round","path":"objects/obj_p_round/obj_p_round.yy",},}, {"id":{"name":"spr_slate_2","path":"sprites/spr_slate_2/spr_slate_2.yy",},}, - {"id":{"name":"spr_mk7_chest_variants","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},}, {"id":{"name":"obj_en_round","path":"objects/obj_en_round/obj_en_round.yy",},}, - {"id":{"name":"spr_gothic_numbers_right_pauldron","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},}, {"id":{"name":"obj_al_round","path":"objects/obj_al_round/obj_al_round.yy",},}, {"id":{"name":"scr_keyboard_helpers","path":"scripts/scr_keyboard_helpers/scr_keyboard_helpers.yy",},}, {"id":{"name":"obj_en_pulse","path":"objects/obj_en_pulse/obj_en_pulse.yy",},}, @@ -1141,7 +1091,6 @@ {"id":{"name":"obj_enunit","path":"objects/obj_enunit/obj_enunit.yy",},}, {"id":{"name":"scr_log","path":"scripts/scr_log/scr_log.yy",},}, {"id":{"name":"obj_nfort","path":"objects/obj_nfort/obj_nfort.yy",},}, - {"id":{"name":"scr_livery_setup","path":"scripts/scr_livery_setup/scr_livery_setup.yy",},}, {"id":{"name":"obj_temp1","path":"objects/obj_temp1/obj_temp1.yy",},}, {"id":{"name":"obj_temp2","path":"objects/obj_temp2/obj_temp2.yy",},}, {"id":{"name":"obj_temp3","path":"objects/obj_temp3/obj_temp3.yy",},}, @@ -1166,7 +1115,6 @@ {"id":{"name":"obj_restart_vars","path":"objects/obj_restart_vars/obj_restart_vars.yy",},}, {"id":{"name":"obj_formation_bar","path":"objects/obj_formation_bar/obj_formation_bar.yy",},}, {"id":{"name":"obj_dropdown_sel","path":"objects/obj_dropdown_sel/obj_dropdown_sel.yy",},}, - {"id":{"name":"spr_pack_brazier3","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},}, {"id":{"name":"obj_enemy_leftest","path":"objects/obj_enemy_leftest/obj_enemy_leftest.yy",},}, {"id":{"name":"scr_distributions","path":"scripts/scr_distributions/scr_distributions.yy",},}, {"id":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},}, @@ -1175,7 +1123,6 @@ {"id":{"name":"obj_p1_bullet","path":"objects/obj_p1_bullet/obj_p1_bullet.yy",},}, {"id":{"name":"obj_p1_bullet_miss","path":"objects/obj_p1_bullet_miss/obj_p1_bullet_miss.yy",},}, {"id":{"name":"obj_main_menu","path":"objects/obj_main_menu/obj_main_menu.yy",},}, - {"id":{"name":"spr_mk5_complex","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},}, {"id":{"name":"obj_cuicons","path":"objects/obj_cuicons/obj_cuicons.yy",},}, {"id":{"name":"obj_img","path":"objects/obj_img/obj_img.yy",},}, {"id":{"name":"scr_manage_task_selector","path":"scripts/scr_manage_task_selector/scr_manage_task_selector.yy",},}, @@ -1184,12 +1131,9 @@ {"id":{"name":"obj_fade","path":"objects/obj_fade/obj_fade.yy",},}, {"id":{"name":"obj_defeat","path":"objects/obj_defeat/obj_defeat.yy",},}, {"id":{"name":"spr_marine_head","path":"sprites/spr_marine_head/spr_marine_head.yy",},}, - {"id":{"name":"scr_player_fleet_combat_functions","path":"scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy",},}, - {"id":{"name":"spr_mk5_head_variants","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},}, {"id":{"name":"obj_ini","path":"objects/obj_ini/obj_ini.yy",},}, {"id":{"name":"spr_weapon_hthhammer","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},}, {"id":{"name":"obj_controller","path":"objects/obj_controller/obj_controller.yy",},}, - {"id":{"name":"spr_mk7_thorax_variants","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},}, {"id":{"name":"obj_mass_equip","path":"objects/obj_mass_equip/obj_mass_equip.yy",},}, {"id":{"name":"obj_turn_end","path":"objects/obj_turn_end/obj_turn_end.yy",},}, {"id":{"name":"obj_saveload","path":"objects/obj_saveload/obj_saveload.yy",},}, @@ -1207,7 +1151,6 @@ {"id":{"name":"obj_popup","path":"objects/obj_popup/obj_popup.yy",},}, {"id":{"name":"obj_popup_dialogue","path":"objects/obj_popup_dialogue/obj_popup_dialogue.yy",},}, {"id":{"name":"obj_event","path":"objects/obj_event/obj_event.yy",},}, - {"id":{"name":"scr_roster","path":"scripts/scr_roster/scr_roster.yy",},}, {"id":{"name":"obj_event_log","path":"objects/obj_event_log/obj_event_log.yy",},}, {"id":{"name":"scr_get_diag_string","path":"scripts/scr_get_diag_string/scr_get_diag_string.yy",},}, {"id":{"name":"spr_apoth_area_pad","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},}, @@ -1218,7 +1161,6 @@ {"id":{"name":"obj_crusade","path":"objects/obj_crusade/obj_crusade.yy",},}, {"id":{"name":"obj_star","path":"objects/obj_star/obj_star.yy",},}, {"id":{"name":"spr_rack_and_pinion","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},}, - {"id":{"name":"full_livery_shader","path":"shaders/full_livery_shader/full_livery_shader.yy",},}, {"id":{"name":"obj_star_event","path":"objects/obj_star_event/obj_star_event.yy",},}, {"id":{"name":"spr_cog_pinion","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},}, {"id":{"name":"obj_tooltip","path":"objects/obj_tooltip/obj_tooltip.yy",},}, @@ -1229,7 +1171,6 @@ {"id":{"name":"Creation","path":"rooms/Creation/Creation.yy",},}, {"id":{"name":"Game","path":"rooms/Game/Game.yy",},}, {"id":{"name":"Tutorial","path":"rooms/Tutorial/Tutorial.yy",},}, - {"id":{"name":"spr_mk3_head_variants","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},}, {"id":{"name":"scr_draw_text","path":"scripts/scr_draw_text/scr_draw_text.yy",},}, {"id":{"name":"spr_data_slate_border","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},}, {"id":{"name":"spr_terminator_arms","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},}, diff --git a/fonts/fnt_menu/fnt_menu.old.png b/fonts/fnt_menu/fnt_menu.old.png index 50ebc1c7c34de3ebcefc2a7651a789c48c8a50e2..c4702d90280dfdf06d54726909eb359814d39b65 100644 GIT binary patch delta 122 zcmbPnhjGRo#tjp4Jxp{B3_}bJt&B{pj19C646Fe9TWtFkWy{P8605puj)78&qol`;+0Kk1B(EtDd diff --git a/fonts/fnt_menu/fnt_menu.old.yy b/fonts/fnt_menu/fnt_menu.old.yy index d0b4764bba..eaa95f71e6 100644 --- a/fonts/fnt_menu/fnt_menu.old.yy +++ b/fonts/fnt_menu/fnt_menu.old.yy @@ -221,7 +221,7 @@ "ranges": [ {"lower":32,"upper":255,}, ], - "regenerateBitmap": false, + "regenerateBitmap": true, "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: â–¯ (9647)", "sdfSpread": 4, "size": 12.0, diff --git a/fonts/fnt_menu/fnt_menu.png b/fonts/fnt_menu/fnt_menu.png index a9f0b20ede459a49849ec4e4ddfe25565d8c6619..50ebc1c7c34de3ebcefc2a7651a789c48c8a50e2 100644 GIT binary patch delta 124 zcmbPnhjGRo#tr?so(7h>#s(pV=2j+_R>sEK1_o9J2Iq_?Zf0O$P%UwdC`m~yNwvz& sPsvQHWH2%?GSS7RVSk<`|KuCFGAh_4UsQ8k0Gh_&>FVdQ&MBb@0Q)T?F#rGn delta 124 zcmbPnhjGRo#tr?so`y!c2Ie7#hE}E~Rz@b;1_o9J21XI;QyCZ-R7+eVN>UO_Qmu0H sQ!>*k8H@~!OmwknaAuvaIr&Dej0!eM5rKW*fTl5cy85}Sb4q9e0DbKtRsaA1 diff --git a/objects/obj_drop_select/obj_drop_select.yy b/objects/obj_drop_select/obj_drop_select.yy index 0bfdfdf18d..c0da15312a 100644 --- a/objects/obj_drop_select/obj_drop_select.yy +++ b/objects/obj_drop_select/obj_drop_select.yy @@ -13,8 +13,8 @@ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":56,"eventType":6,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":50,"eventType":6,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":68,"eventType":9,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], diff --git a/objects/obj_star_select/obj_star_select.yy b/objects/obj_star_select/obj_star_select.yy index 66306352e0..6b0465d84f 100644 --- a/objects/obj_star_select/obj_star_select.yy +++ b/objects/obj_star_select/obj_star_select.yy @@ -30,8 +30,8 @@ "physicsSensor": false, "physicsShape": 0, "physicsShapePoints": [ - {"x":4.0,"y":16.0,}, - {"x":96.0,"y":96.0,}, + {"x":4,"y":16,}, + {"x":96,"y":96,}, ], "physicsStartAwake": true, "properties": [], diff --git a/rooms/Game/Game.yy b/rooms/Game/Game.yy index f441d671e9..7761dea204 100644 --- a/rooms/Game/Game.yy +++ b/rooms/Game/Game.yy @@ -15,7 +15,6 @@ {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Compatibility_Instances_Depth_-60000","depth":-60000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_794579B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,}, ],"layers":[],"properties":[],"userdefinedDepth":true,"visible":true,}, - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances_1","depth":-59900,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":false,}, {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Compatibility_Instances_Depth_-1000","depth":-1000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_8494E946","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_controller","path":"objects/obj_controller/obj_controller.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, ],"layers":[],"properties":[],"userdefinedDepth":true,"visible":true,}, diff --git a/scripts/scr_PlanetData/scr_PlanetData.yy b/scripts/scr_PlanetData/scr_PlanetData.yy deleted file mode 100644 index 820201a8b9..0000000000 --- a/scripts/scr_PlanetData/scr_PlanetData.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_PlanetData", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_apothecarium/scr_apothecarium.yy b/scripts/scr_apothecarium/scr_apothecarium.yy deleted file mode 100644 index de196db027..0000000000 --- a/scripts/scr_apothecarium/scr_apothecarium.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_apothecarium", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy deleted file mode 100644 index 7b472b3083..0000000000 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_complex_colour_kit", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_drop_select_function/scr_drop_select_function.yy b/scripts/scr_drop_select_function/scr_drop_select_function.yy deleted file mode 100644 index d0402e12a2..0000000000 --- a/scripts/scr_drop_select_function/scr_drop_select_function.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_drop_select_function", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_equipment_struct/scr_equipment_struct.yy b/scripts/scr_equipment_struct/scr_equipment_struct.yy deleted file mode 100644 index e7b079433d..0000000000 --- a/scripts/scr_equipment_struct/scr_equipment_struct.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_equipment_struct", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_get_item_names/scr_get_item_names.yy b/scripts/scr_get_item_names/scr_get_item_names.yy deleted file mode 100644 index d2f72f9ee8..0000000000 --- a/scripts/scr_get_item_names/scr_get_item_names.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_get_item_names", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Interface Help", - "path": "folders/Scripts/Interface Help.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_livery_setup/scr_livery_setup.yy b/scripts/scr_livery_setup/scr_livery_setup.yy deleted file mode 100644 index ea65ef99ae..0000000000 --- a/scripts/scr_livery_setup/scr_livery_setup.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_livery_setup", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file 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 3ceafbc4b9..f74c641caf 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -15,12 +15,11 @@ function build_new_ork_ships_to_fleet(star, planet){ // Increase ship number for this object? var rando=irandom(101); if (obj_controller.known[eFACTION.Ork]>0) then rando-=10; - var _planet_type = star.p_type[planet]; - if (_planet_type=="Forge"){ + if (star.p_type[planet]=="Forge"){ rando-=20; - } else if (_planet_type=="Hive"){ + } else if (star.p_type[planet]=="Hive"){ rando-=10; - }else if (_planet_type=="Shrine" || _planet_type=="Temperate"){ + }else if (star.p_type[planet]=="Shrine" || star.p_type[planet]=="Temperate"){ rando-=5; } if (rando<=15){// was 25 @@ -94,23 +93,21 @@ function ork_fleet_arrive_target(){ var _imperial_ship = scr_orbiting_fleet([eFACTION.Player, eFACTION.Imperium]); if (_imperial_ship == "none" && _ork_fleet!="none" && planets>0){ - var _allow_landing=true,ork_attack_planet=0,l=0; + var _allow_landing=true,t1=0,l=0; repeat(planets){ l+=1; - if (ork_attack_planet=0) and (p_tyranids[l]>0) then ork_attack_planet=l; + if (t1=0) and (p_tyranids[l]>0) then t1=l; } - if (ork_attack_planet>0) then p_tyranids[ork_attack_planet]-=_ork_fleet.capital_number+(_ork_fleet.frigate_number/2); - - if (p_tyranids[ork_attack_planet]<=0){ - if (planet_feature_bool(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult)){ - delete_features(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult); - adjust_influence(eFACTION.Tyranids, -25, ork_attack_planet); + if (t1>0) then p_tyranids[t1]-=_ork_fleet.capital_number+(_ork_fleet.frigate_number/2); + if (p_tyranids[t1]<=0){ + if (planet_feature_bool(p_feature[t1], P_features.Gene_Stealer_Cult)){ + delete_features(p_feature[t1], P_features.Gene_Stealer_Cult); + adjust_influence(eFACTION.Tyranids, -25, t1); var nearest_imperial = nearest_star_with_ownership(x,y,eFACTION.Imperium, self.id); if (nearest_imperial != "none"){ var targ_planet = scr_get_planet_with_owner(nearest_imperial,eFACTION.Imperium); - if (targ_planet==-1) then targ_planet = irandom_range(1, nearest_imperial.planets); - new_colony_fleet(self.id, ork_attack_planet, nearest_imperial.id, targ_planet, "refugee"); + new_colony_fleet(self.id, t1, nearest_imperial.id, targ_planet, "refugee"); } } } diff --git a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy b/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy deleted file mode 100644 index e093381324..0000000000 --- a/scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_player_fleet_combat_functions", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_roster/scr_roster.yy b/scripts/scr_roster/scr_roster.yy deleted file mode 100644 index 583c5d4590..0000000000 --- a/scripts/scr_roster/scr_roster.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_roster", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy b/scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy deleted file mode 100644 index 2cde7a8b95..0000000000 --- a/scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_specialist_point_handler", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_specialist_points/scr_specialist_points.yy b/scripts/scr_specialist_points/scr_specialist_points.yy deleted file mode 100644 index cd0de95096..0000000000 --- a/scripts/scr_specialist_points/scr_specialist_points.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_specialist_points", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_sprite_functions/scr_sprite_functions.yy b/scripts/scr_sprite_functions/scr_sprite_functions.yy deleted file mode 100644 index eec3246e5d..0000000000 --- a/scripts/scr_sprite_functions/scr_sprite_functions.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_sprite_functions", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_sprite_helpers/scr_sprite_helpers.yy b/scripts/scr_sprite_helpers/scr_sprite_helpers.yy deleted file mode 100644 index f4e2932640..0000000000 --- a/scripts/scr_sprite_helpers/scr_sprite_helpers.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_sprite_helpers", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Helpers", - "path": "folders/Scripts/Helpers.yy", - }, -} \ No newline at end of file diff --git a/scripts/scr_unit_traits/scr_unit_traits.yy b/scripts/scr_unit_traits/scr_unit_traits.yy deleted file mode 100644 index 7fa766a7d9..0000000000 --- a/scripts/scr_unit_traits/scr_unit_traits.yy +++ /dev/null @@ -1,11 +0,0 @@ -{ - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "scr_unit_traits", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, -} \ No newline at end of file diff --git a/shaders/full_livery_shader/full_livery_shader.yy b/shaders/full_livery_shader/full_livery_shader.yy deleted file mode 100644 index c255be8327..0000000000 --- a/shaders/full_livery_shader/full_livery_shader.yy +++ /dev/null @@ -1,10 +0,0 @@ -{ - "resourceType": "GMShader", - "resourceVersion": "1.0", - "name": "full_livery_shader", - "parent": { - "name": "Shaders", - "path": "folders/Shaders.yy", - }, - "type": 1, -} \ No newline at end of file diff --git a/sprites/Sprite544/Sprite544.yy b/sprites/Sprite544/Sprite544.yy deleted file mode 100644 index 7c99bb1a8d..0000000000 --- a/sprites/Sprite544/Sprite544.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "Sprite544", - "bbox_bottom": 0, - "bbox_left": 0, - "bbox_right": 0, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1132b02e-7adf-47d6-ae57-ba65d8120062",}, - ], - "gridX": 0, - "gridY": 0, - "height": 64, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3c99ce96-378e-4d09-9ec1-821e81e7ad78","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "UI", - "path": "folders/Sprites/UI.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "Sprite544", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1132b02e-7adf-47d6-ae57-ba65d8120062","path":"sprites/Sprite544/Sprite544.yy",},},},"Disabled":false,"id":"fdc6d240-127c-4364-9fb6-649444dd8487","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 64, -} \ No newline at end of file diff --git a/sprites/spr_bionics_arm/spr_bionics_arm.yy b/sprites/spr_bionics_arm/spr_bionics_arm.yy index 4595a9446e..a3f0ad23ad 100644 --- a/sprites/spr_bionics_arm/spr_bionics_arm.yy +++ b/sprites/spr_bionics_arm/spr_bionics_arm.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_bionics_arm", - "bbox_bottom": 125, + "bbox_bottom": 105, "bbox_left": 17, "bbox_right": 47, "bbox_top": 74, @@ -23,7 +23,6 @@ "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"54b9c784-108c-4807-834f-2b0291f26540","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9b0962d1-9e03-4c2d-a749-3e90ee6c8cf2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, diff --git a/sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy b/sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy index 382c788ad0..b2ad54333c 100644 --- a/sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy +++ b/sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_chaplain_skull_helm", - "bbox_bottom": 44, + "bbox_bottom": 40, "bbox_left": 63, "bbox_right": 101, - "bbox_top": 12, + "bbox_top": 13, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,14 +14,13 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"da41be00-1d23-4fe3-8ae9-f9c5f26d0ab0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"86934807-ea9a-4216-8308-41baa548c8fa",}, ], "gridX": 0, "gridY": 0, "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ae0c933d-af58-4bf7-b86c-2e064499e4ff","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0ec8b8ce-26b7-4897-ab90-3a4cc9b46459","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, @@ -44,7 +43,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 1.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -56,7 +55,6 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"da41be00-1d23-4fe3-8ae9-f9c5f26d0ab0","path":"sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy",},},},"Disabled":false,"id":"46d5fc8b-24b4-4f1f-bb74-95468a5371d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"86934807-ea9a-4216-8308-41baa548c8fa","path":"sprites/spr_chaplain_skull_helm/spr_chaplain_skull_helm.yy",},},},"Disabled":false,"id":"2b341050-df0d-4c0f-b9ea-378f61546574","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, diff --git a/sprites/spr_da_backpack/spr_da_backpack.yy b/sprites/spr_da_backpack/spr_da_backpack.yy index 15448b217a..0d3238df30 100644 --- a/sprites/spr_da_backpack/spr_da_backpack.yy +++ b/sprites/spr_da_backpack/spr_da_backpack.yy @@ -26,8 +26,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "packs", - "path": "folders/Sprites/Marine Viewer/packs.yy", + "name": "dark_angels_specials", + "path": "folders/Sprites/Marine Viewer/body_types/specialist/dark_angels_specials.yy", }, "preMultiplyAlpha": false, "sequence": { 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 5c80cb87f0..b055c26586 100644 --- a/sprites/spr_da_term_honor/spr_da_term_honor.yy +++ b/sprites/spr_da_term_honor/spr_da_term_honor.yy @@ -60,7 +60,7 @@ "visibleRange": null, "volume": 1.0, "xorigin": 7, - "yorigin": 38, + "yorigin": 30, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_faction_icons/spr_faction_icons.yy b/sprites/spr_faction_icons/spr_faction_icons.yy deleted file mode 100644 index 0de239627b..0000000000 --- a/sprites/spr_faction_icons/spr_faction_icons.yy +++ /dev/null @@ -1,104 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_faction_icons", - "bbox_bottom": 57, - "bbox_left": 7, - "bbox_right": 56, - "bbox_top": 2, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"da1147b4-25e5-43ff-9cb6-1b9630a91188",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4a5a2538-7f5a-4ef5-809d-3efb68056895",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fbd273df-a4ac-45f0-9567-d25b0554cae3",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"641ce88d-47a2-4ef5-a453-26c175c3fa47",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"458ae16e-c6e8-45b5-b056-9c021caa006d",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f13a3c9b-197b-483a-bf2b-7e73d0652796",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"42355dbb-212b-40b0-bebd-21530e2fa783",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1e240158-bc5c-4162-85c8-a39ec678cea5",}, - ], - "gridX": 0, - "gridY": 0, - "height": 64, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c741583e-dc86-4eed-b69d-339ccd9b2d98","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "UI", - "path": "folders/Sprites/UI.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_faction_icons", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 16.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"d70ecb5d-690b-460c-8ca5-89d5cfba7807","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"44cd17a1-e6c0-4ede-9f27-59cd285845e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"2de99ab3-2c6e-4ff1-92a0-84baaab0a45f","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"2b0c9adc-db88-4f02-8ca9-61a9f1bdbde7","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"3601bbbe-f76d-4c96-a08a-26c7d2ef5caa","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"458ae16e-c6e8-45b5-b056-9c021caa006d","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"b392962f-07ba-432b-abfa-1dec5bd977a7","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"c4d8139e-197d-4160-a6b5-347132c816f9","IsCreationKey":false,"Key":6.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"a98c5de5-4d16-4f57-b456-ef1225e54944","IsCreationKey":false,"Key":7.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"5d43e6fe-7e95-486f-8263-a8289c543acd","IsCreationKey":false,"Key":8.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"69aeaeeb-f959-4064-a75b-c0bae2a8a8ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"42355dbb-212b-40b0-bebd-21530e2fa783","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"90297261-4eaa-4d25-a826-308e4e5e31f8","IsCreationKey":false,"Key":10.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"f2b25933-4999-4026-826e-25784a625769","IsCreationKey":false,"Key":11.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"6ba1e06a-ef6e-46c3-ab25-b4a119bd66ce","IsCreationKey":false,"Key":12.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"ff58b031-e3a5-4d1c-913f-930259b4bada","IsCreationKey":false,"Key":13.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"82df5ccb-69b1-4fe1-8a7b-a9df60a5bd39","IsCreationKey":false,"Key":14.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1e240158-bc5c-4162-85c8-a39ec678cea5","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},},},"Disabled":false,"id":"04a8b061-b249-427b-bf65-b350329c1cbb","IsCreationKey":false,"Key":15.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 64, -} \ No newline at end of file diff --git a/sprites/spr_gear_chap/spr_gear_chap.yy b/sprites/spr_gear_chap/spr_gear_chap.yy index abc429f070..b975573d92 100644 --- a/sprites/spr_gear_chap/spr_gear_chap.yy +++ b/sprites/spr_gear_chap/spr_gear_chap.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "deprecated", - "path": "folders/Sprites/Marine Viewer/deprecated.yy", + "name": "decorations", + "path": "folders/Sprites/Marine Viewer/decorations.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_gear_librarian/spr_gear_librarian.yy b/sprites/spr_gear_librarian/spr_gear_librarian.yy deleted file mode 100644 index 6db9d33ed3..0000000000 --- a/sprites/spr_gear_librarian/spr_gear_librarian.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_gear_librarian", - "bbox_bottom": 67, - "bbox_left": 17, - "bbox_right": 39, - "bbox_top": 44, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c686bbde-e480-472c-bb08-d523ecc16fd7",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"da293a72-4179-44b2-91ee-3d67ced4a24f","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "decorations", - "path": "folders/Sprites/Marine Viewer/decorations.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_gear_librarian", - "autoRecord": true, - "backdropHeight": 1080, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1920, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian/spr_gear_librarian.yy",},},},"Disabled":false,"id":"77965c26-dffa-4b7c-baec-050b652956e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 11, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 167, -} \ No newline at end of file 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 deleted file mode 100644 index 514bb1c2c2..0000000000 --- a/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy +++ /dev/null @@ -1,94 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_gothic_numbers_right_pauldron", - "bbox_bottom": 65, - "bbox_left": 0, - "bbox_right": 32, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"87e5fd39-f168-48c2-a276-31cf1b797199",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"154a4f6a-289b-47cb-8019-3f84d8764a8a",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5033b836-0568-4d4c-b81a-99fe09e568a2",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cab768a9-5d1c-4f18-8f20-53214419c9f8",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"da9a8b66-05d9-4947-9787-cae8b9015321",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"666fe5ca-6935-4698-a369-b7b96ff5e47d",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1905f2ec-6f40-4b6e-8e20-d1f92b8587ef","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_gothic_numbers_right_pauldron", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 11.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"0e8f2da6-4c4a-4e13-821d-699b0e5f5e6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"87e5fd39-f168-48c2-a276-31cf1b797199","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"6aac9d83-a704-44dd-acc9-c66ceb93e2c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"d41ebca2-1e7a-4bfb-9ce1-0b68abced744","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"b14dbd68-c1b6-4987-8559-ea45895073a6","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5033b836-0568-4d4c-b81a-99fe09e568a2","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"d75f6766-3b0f-4a70-a35a-c9a7c72e1896","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"eec4d90e-c9c8-4bca-97ae-b61579e5d9ed","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"bc1805dc-a620-4133-b267-e9fb9480a8d7","IsCreationKey":false,"Key":6.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"86664de9-14af-4223-aa04-76d40612f5fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"de02452f-ee8f-49c4-8a45-db6793a11b9a","IsCreationKey":false,"Key":8.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"da9a8b66-05d9-4947-9787-cae8b9015321","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"94b419a4-05ae-413a-a175-9a6cdd69232b","IsCreationKey":false,"Key":9.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},},},"Disabled":false,"id":"97cf6ab4-2cb9-4a8e-9831-3ad6b5e8dfa8","IsCreationKey":false,"Key":10.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy deleted file mode 100644 index 7e7f05e2c2..0000000000 --- a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy +++ /dev/null @@ -1,78 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_indomitus_backpack_variants", - "bbox_bottom": 47, - "bbox_left": 0, - "bbox_right": 123, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f263cbc2-c596-4d91-bf6e-98df697e82d6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"26a48129-bbce-4502-98fa-bb1536100ae8",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2",}, - ], - "gridX": 0, - "gridY": 0, - "height": 271, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"62b09ae3-d70e-4c96-a796-f9dc9b29190d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "indomitus_complex", - "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_indomitus_backpack_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 3.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},},},"Disabled":false,"id":"976d99d5-b8ca-4296-bfec-0428f709446a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"26a48129-bbce-4502-98fa-bb1536100ae8","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},},},"Disabled":false,"id":"e490a9e6-100a-4231-83ea-f81f970510d0","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},},},"Disabled":false,"id":"103b9ed3-895b-4aaa-853a-46c40325bda5","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 38, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy deleted file mode 100644 index f721550fbf..0000000000 --- a/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy +++ /dev/null @@ -1,78 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_indomitus_chest_variants", - "bbox_bottom": 111, - "bbox_left": 0, - "bbox_right": 123, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0e60637-c555-4a00-8c01-76f1d0b98b07",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8df37974-a38e-49cb-a1ac-77820eeb1e35",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc",}, - ], - "gridX": 0, - "gridY": 0, - "height": 271, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"142bfdfd-9776-49b7-8608-bb52b3f6a736","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "indomitus_complex", - "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_indomitus_chest_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 3.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},},},"Disabled":false,"id":"27d4c94a-6c66-4f0c-a0bc-26b973bcf167","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},},},"Disabled":false,"id":"d4e60b7e-673d-4732-a579-27be19e0db5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},},},"Disabled":false,"id":"57d77f6f-9937-40c8-b693-bb5f79d81e9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 38, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_indomitus_complex/spr_indomitus_complex.yy b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy deleted file mode 100644 index 6ecb092dc7..0000000000 --- a/sprites/spr_indomitus_complex/spr_indomitus_complex.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_indomitus_complex", - "bbox_bottom": 185, - "bbox_left": 10, - "bbox_right": 172, - "bbox_top": 32, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7173924c-400c-4ee3-8b3d-0123aa659415",}, - ], - "gridX": 0, - "gridY": 0, - "height": 271, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"03d917a8-bff1-45d7-818b-f057c5540e44","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "indomitus_complex", - "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_indomitus_complex", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},},},"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 38, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy deleted file mode 100644 index e279085ae2..0000000000 --- a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_indomitus_left_arm", - "bbox_bottom": 170, - "bbox_left": 132, - "bbox_right": 175, - "bbox_top": 89, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1",}, - ], - "gridX": 0, - "gridY": 0, - "height": 271, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"335e75b4-4e39-4ae9-8bee-91ddb651a8c6","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "indomitus_complex", - "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_indomitus_left_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},},},"Disabled":false,"id":"fe3823bf-9117-481b-bdf0-d43733cc0e54","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 38, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy deleted file mode 100644 index 530a745355..0000000000 --- a/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy +++ /dev/null @@ -1,78 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_indomitus_leg_variants", - "bbox_bottom": 259, - "bbox_left": 11, - "bbox_right": 169, - "bbox_top": 171, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b1984530-db57-4951-bec4-a09cab003f1a",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9f6f956f-88d9-4777-aac0-fb6508697fec",}, - ], - "gridX": 0, - "gridY": 0, - "height": 271, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "indomitus_complex", - "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_indomitus_leg_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 3.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},},"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},},"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9f6f956f-88d9-4777-aac0-fb6508697fec","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},},"Disabled":false,"id":"954756d1-b81d-41f0-b93b-7ee98524f568","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 38, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy deleted file mode 100644 index 6a0db7bcae..0000000000 --- a/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_indomitus_right_arm", - "bbox_bottom": 170, - "bbox_left": 5, - "bbox_right": 48, - "bbox_top": 89, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc",}, - ], - "gridX": 0, - "gridY": 0, - "height": 271, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"55de725b-7bbe-44d0-9ec6-a9c031920d39","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "indomitus_complex", - "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_indomitus_right_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},},},"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 38, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_mk3_complex/spr_mk3_complex.yy b/sprites/spr_mk3_complex/spr_mk3_complex.yy deleted file mode 100644 index 0907ec8f7d..0000000000 --- a/sprites/spr_mk3_complex/spr_mk3_complex.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk3_complex", - "bbox_bottom": 220, - "bbox_left": 11, - "bbox_right": 152, - "bbox_top": 13, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"358913f3-25cd-4411-aa3a-01c656c1166c",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_3_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk3_complex", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_complex/spr_mk3_complex.yy",},},},"Disabled":false,"id":"ec45e7d5-2e29-4440-965b-2b5e148ec8a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy deleted file mode 100644 index 4f1315c5e9..0000000000 --- a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk3_complex_backpack", - "bbox_bottom": 36, - "bbox_left": 27, - "bbox_right": 136, - "bbox_top": 9, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9bf31ffc-9a0a-492f-89fb-b703fed172b9","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_3_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk3_complex_backpack", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","path":"sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy",},},},"Disabled":false,"id":"9e7c62a0-7429-45f3-88c0-0aa6dc2ae3a2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy deleted file mode 100644 index 98469960be..0000000000 --- a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk3_head_variants", - "bbox_bottom": 50, - "bbox_left": 0, - "bbox_right": 99, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"52c73332-e685-4491-bf62-c232947cb455",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2faf2e83-0803-4ea4-945c-272a0a936425",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"11966306-2c72-4664-be9f-563bdc23de41","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_3_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk3_head_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 4.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"52c73332-e685-4491-bf62-c232947cb455","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},},},"Disabled":false,"id":"48d2ca1b-88b2-4c40-ba5c-401820340d6e","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},},},"Disabled":false,"id":"0c3cd28a-bfee-4d11-b993-d5f834a89eaf","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},},},"Disabled":false,"id":"3815daad-43a5-4bb4-bec9-9760cbddeaff","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2faf2e83-0803-4ea4-945c-272a0a936425","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},},},"Disabled":false,"id":"e9a1782f-20bd-4415-a3f4-4809a12ff845","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy deleted file mode 100644 index ecc054061e..0000000000 --- a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk3_left_arm", - "bbox_bottom": 125, - "bbox_left": 120, - "bbox_right": 147, - "bbox_top": 67, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"70832485-9952-435e-b897-efeee5506dc1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_3_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk3_left_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},},},"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy b/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy deleted file mode 100644 index e00785f64b..0000000000 --- a/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk3_left_trim", - "bbox_bottom": 81, - "bbox_left": 0, - "bbox_right": 153, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9ab63ae6-5124-4282-8187-d7e41deef9c6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4f23ada7-84e2-4746-8e5c-f69e283899ef",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0ae8965e-939c-4734-9723-cf456ec9ce45","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_3_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk3_left_trim", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 4.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},},},"Disabled":false,"id":"8d01d6cf-461d-456e-9332-abf118aaaad7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},},},"Disabled":false,"id":"319c9c02-ebc4-458c-aa5f-b95f2e64fb44","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},},},"Disabled":false,"id":"c1ca8578-2345-4f88-9c55-fdf39bfa917a","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},},},"Disabled":false,"id":"81050e27-d210-414e-a369-43b4bc7e99af","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy b/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy deleted file mode 100644 index fc7499c232..0000000000 --- a/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk3_right_arm", - "bbox_bottom": 125, - "bbox_left": 15, - "bbox_right": 42, - "bbox_top": 67, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3ebc7391-4a9c-4a65-9f3e-ba9014e4f0c8","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_3_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk3_right_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},},},"Disabled":false,"id":"fb663579-f17d-4461-829e-36f5f9b87989","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy b/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy deleted file mode 100644 index d4d0efd10c..0000000000 --- a/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk3_right_trim", - "bbox_bottom": 81, - "bbox_left": 0, - "bbox_right": 60, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"42c93ebb-31a5-4529-add7-5c4ada48da57",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e8f2b623-db31-44d0-a510-ff212dd3f269",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3046bd80-d3fb-4878-b070-c42a135928aa",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ea344b80-4a28-4053-ab2a-6d7f5987b9ac","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_3_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk3_right_trim", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 4.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"42c93ebb-31a5-4529-add7-5c4ada48da57","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},},},"Disabled":false,"id":"6a1a6de8-928a-4b5a-9b92-1eaa80fc4171","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e8f2b623-db31-44d0-a510-ff212dd3f269","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},},},"Disabled":false,"id":"c7301961-da67-453e-a396-070fac8dfbe4","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3046bd80-d3fb-4878-b070-c42a135928aa","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},},},"Disabled":false,"id":"f71392e9-e16c-4d5b-836f-daa455a41de5","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},},},"Disabled":false,"id":"f4ab6e5b-4e60-4125-ad0e-f195ed660e71","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy deleted file mode 100644 index 865c49bd8b..0000000000 --- a/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk4_chest_variants", - "bbox_bottom": 88, - "bbox_left": 0, - "bbox_right": 115, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ab90c4f7-06a6-4afd-ad2c-1b4320ecded3",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6ea6843d-5734-4b45-8dc0-32fe12108362",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c7953fd-068f-4680-952f-2bec1899eb37",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9aa905f2-3241-4fed-97e7-c3b765cc7075",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4700a804-be74-43bd-a3a1-5f2c62f33959","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_4_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk4_chest_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 4.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ab90c4f7-06a6-4afd-ad2c-1b4320ecded3","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"db69f799-0a80-4d76-be2e-c67a1af0bc99","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6ea6843d-5734-4b45-8dc0-32fe12108362","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"2c56b22e-be1b-43dc-a4e8-b9b63456872e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5c7953fd-068f-4680-952f-2bec1899eb37","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"16645fc4-679d-40d5-a7e0-808e9967dbb5","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9aa905f2-3241-4fed-97e7-c3b765cc7075","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"8d99fcf2-53d5-4445-99e5-51f9c2300330","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk4_complex/spr_mk4_complex.yy b/sprites/spr_mk4_complex/spr_mk4_complex.yy deleted file mode 100644 index f030bc8e99..0000000000 --- a/sprites/spr_mk4_complex/spr_mk4_complex.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk4_complex", - "bbox_bottom": 220, - "bbox_left": 11, - "bbox_right": 152, - "bbox_top": 11, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e7b69ad2-206a-4f32-ade6-1a7c0f38210f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_4_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk4_complex", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},},},"Disabled":false,"id":"1ea2a7fc-3120-42db-b605-8fb780ff8b5d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy deleted file mode 100644 index 6affe80416..0000000000 --- a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk4_complex_backpack", - "bbox_bottom": 35, - "bbox_left": 34, - "bbox_right": 129, - "bbox_top": 14, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a43406eb-6236-415d-9902-e818a2185ba9",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"32295d2f-e43c-4d2b-a49d-2a445111c733","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_4_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk4_complex_backpack", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a43406eb-6236-415d-9902-e818a2185ba9","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},},},"Disabled":false,"id":"90dd7544-906e-477c-a0a3-0c94bc9aee40","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy b/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy deleted file mode 100644 index b535b0fa08..0000000000 --- a/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk4_left_arm", - "bbox_bottom": 125, - "bbox_left": 117, - "bbox_right": 149, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d132fab6-39de-405e-b127-9f335cf85536",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9e4985a2-eba9-4463-900a-738d3e77f677","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_4_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk4_left_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d132fab6-39de-405e-b127-9f335cf85536","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},},},"Disabled":false,"id":"0853379d-62d4-401d-bdeb-8b64cac8fbfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy b/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy deleted file mode 100644 index cbab550f3c..0000000000 --- a/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy +++ /dev/null @@ -1,82 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk4_left_trim", - "bbox_bottom": 81, - "bbox_left": 0, - "bbox_right": 153, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c9e92ecb-d3e8-4554-b608-47b47aa79876",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7d128442-bf77-4769-8d75-a63dd3942ff8",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0f4435dc-8ba2-40a6-a643-d38318383c10",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ccdf7cd6-d258-4f76-9fd9-65b076861997",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f5e0817a-c222-4bd1-b7af-957a96c6334d",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1ef77cf7-889b-445d-a5f0-6d155c3f407d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_4_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk4_left_trim", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 5.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"baf60be2-46a1-4588-a03b-762baa867599","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7d128442-bf77-4769-8d75-a63dd3942ff8","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"0e63d2dd-b459-434d-93fd-4607df6dd69a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0f4435dc-8ba2-40a6-a643-d38318383c10","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"8dcb92ec-fd8d-4cc6-9285-dbb186051c10","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"b38845bb-5261-4b58-b135-a5718fb726f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},},},"Disabled":false,"id":"b8bd7e56-9dc2-4b90-a286-403f37e35f36","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy deleted file mode 100644 index 48088d87b7..0000000000 --- a/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk4_leg_variants", - "bbox_bottom": 193, - "bbox_left": 0, - "bbox_right": 144, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f5551e24-09d8-40c0-888e-0e5818c0c403",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"79b13155-0f85-4e11-9fef-324bf6e87d15",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f953caa3-a25e-4eed-9a1e-73ea1a4b2900","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_4_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk4_leg_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 4.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f5551e24-09d8-40c0-888e-0e5818c0c403","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},},},"Disabled":false,"id":"f0d74eee-2fdc-4c64-89a0-eca5b14b32d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},},},"Disabled":false,"id":"ee26bab2-02cc-4e4d-a75a-00c04cf56d3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"79b13155-0f85-4e11-9fef-324bf6e87d15","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},},},"Disabled":false,"id":"6e5b82f0-b1e4-4462-9747-2831172b74a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},},},"Disabled":false,"id":"01846774-a3dd-4995-9497-fbee372af500","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy b/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy deleted file mode 100644 index 57f6fa6121..0000000000 --- a/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy +++ /dev/null @@ -1,82 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk4_mouth_variants", - "bbox_bottom": 43, - "bbox_left": 0, - "bbox_right": 98, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7cb87107-55af-49a2-967f-fce654e6d0b2",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f57e6879-ac68-40d0-900d-57fff9a35503",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8bbded9e-27de-49ca-b8fb-f0295b4f7b5f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_4_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk4_mouth_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 5.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"fdd2c8c8-f92b-409f-b185-8b6f7db1b8aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7cb87107-55af-49a2-967f-fce654e6d0b2","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"fc1900e1-e6ba-42d6-8d89-f59b501502a7","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f57e6879-ac68-40d0-900d-57fff9a35503","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"0c312846-f775-44d4-9710-5e49bda55667","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"b40c0e7a-d4dc-4bf6-91f0-72ce317e597d","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},},"Disabled":false,"id":"8b4f09f8-23a8-455e-a154-20561e393423","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy b/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy deleted file mode 100644 index fb8ec069f4..0000000000 --- a/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk4_right_arm", - "bbox_bottom": 125, - "bbox_left": 13, - "bbox_right": 45, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"691da313-acdf-4e3b-8a61-65b5199f6f21",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4e3aed97-c2a5-4f45-81e6-5a2755bb9a86","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_4_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk4_right_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"691da313-acdf-4e3b-8a61-65b5199f6f21","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},},},"Disabled":false,"id":"6246d1fe-0f1d-44a4-876f-79b2e85b226a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy b/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy deleted file mode 100644 index f41d41cfb3..0000000000 --- a/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy +++ /dev/null @@ -1,82 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk4_right_trim", - "bbox_bottom": 81, - "bbox_left": 0, - "bbox_right": 60, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9f939d89-30fc-4492-a4fe-b12fa412f437",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"14cec0b7-0039-4fb8-ac03-a6c7a7d02268","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_4_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk4_right_trim", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 5.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9f939d89-30fc-4492-a4fe-b12fa412f437","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"7ad3f6b6-0d9e-474b-accc-e820942fdad5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"1d3ed260-00ee-4573-9de6-a47b932a55aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"ce299549-2c09-47b2-b44d-2306b8c0c2b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"54242b24-25bc-4088-a2c4-fdf65553d805","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},},"Disabled":false,"id":"a90700c3-30df-47fe-adcd-a32ef97a91b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk5_complex/spr_mk5_complex.yy b/sprites/spr_mk5_complex/spr_mk5_complex.yy deleted file mode 100644 index 5a4ed7eac2..0000000000 --- a/sprites/spr_mk5_complex/spr_mk5_complex.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk5_complex", - "bbox_bottom": 220, - "bbox_left": 11, - "bbox_right": 152, - "bbox_top": 26, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"48f72680-cb96-4361-9276-5e8d8552ae9f",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"15124376-bb1d-4e68-995a-aae895608450","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_5_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk5_complex", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},},},"Disabled":false,"id":"efd749b6-b89e-48c1-99df-bde59481c13f","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy deleted file mode 100644 index f22a05b953..0000000000 --- a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk5_complex_backpack", - "bbox_bottom": 35, - "bbox_left": 37, - "bbox_right": 126, - "bbox_top": 10, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9aa55975-2b4b-4679-8fd7-f6141f200e93",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"013833bd-91ce-4c08-a77d-d15ce3981f2f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_5_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk5_complex_backpack", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","path":"sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy",},},},"Disabled":false,"id":"d00609fa-9d93-4657-a437-e937e9cd46e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy deleted file mode 100644 index d07fc224d4..0000000000 --- a/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk5_head_variants", - "bbox_bottom": 46, - "bbox_left": 65, - "bbox_right": 98, - "bbox_top": 12, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6ae9cb2a-6253-4261-9f21-88688afd2163",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"601d0116-93f3-4880-8b2c-2b4edcf26d68","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_5_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk5_head_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6ae9cb2a-6253-4261-9f21-88688afd2163","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},},},"Disabled":false,"id":"a7a73431-ca07-41d9-b12f-d718a5984fc6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy b/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy deleted file mode 100644 index 0513c29209..0000000000 --- a/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk5_left_arm", - "bbox_bottom": 125, - "bbox_left": 117, - "bbox_right": 149, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b03de0e7-42de-4112-9568-659441788221",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bf2ce683-c886-4933-863b-ae923430afa0","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_5_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk5_left_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b03de0e7-42de-4112-9568-659441788221","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},},},"Disabled":false,"id":"cabe8ec7-e204-4d1a-a7bf-1450852659fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy b/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy deleted file mode 100644 index 5d98fedb27..0000000000 --- a/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk5_right_arm", - "bbox_bottom": 125, - "bbox_left": 13, - "bbox_right": 45, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"667e4008-fe43-4bbe-b40b-8411d9921596",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"157c5e68-e771-48ed-9354-4d24a6afcb78","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_5_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk5_right_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"667e4008-fe43-4bbe-b40b-8411d9921596","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},},},"Disabled":false,"id":"993de37b-fcef-4d76-92c0-6e447ba018c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk6_complex/spr_mk6_complex.yy b/sprites/spr_mk6_complex/spr_mk6_complex.yy deleted file mode 100644 index 1747bbd51a..0000000000 --- a/sprites/spr_mk6_complex/spr_mk6_complex.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk6_complex", - "bbox_bottom": 220, - "bbox_left": 11, - "bbox_right": 152, - "bbox_top": 13, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"78fed957-a769-4e64-9288-8be2bf39a5d4","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_6_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk6_complex", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},},},"Disabled":false,"id":"23021aeb-0c67-4243-bf92-73fe45924fe0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy b/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy deleted file mode 100644 index 4146141f73..0000000000 --- a/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk6_complex_backpack", - "bbox_bottom": 38, - "bbox_left": 35, - "bbox_right": 128, - "bbox_top": 10, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"557d0497-d213-4f3c-9acb-a261ca311b93",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7dd54480-bbb1-4af4-b670-96698734e764","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_6_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk6_complex_backpack", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"557d0497-d213-4f3c-9acb-a261ca311b93","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},},},"Disabled":false,"id":"a8ae85dd-0643-4118-a10b-348ff5c192da","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy b/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy deleted file mode 100644 index f3b3baac9c..0000000000 --- a/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk6_left_arm", - "bbox_bottom": 125, - "bbox_left": 117, - "bbox_right": 148, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"22cfde6e-f8bd-4528-8635-78300f040903",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0af620b6-54e8-4d28-9ec9-97129eb7cf0a","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_6_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk6_left_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"22cfde6e-f8bd-4528-8635-78300f040903","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},},},"Disabled":false,"id":"6a261d08-29c4-4b92-b017-d0cd9ed8f1ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy deleted file mode 100644 index 36d5edb005..0000000000 --- a/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk6_right_arm", - "bbox_bottom": 125, - "bbox_left": 14, - "bbox_right": 45, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e575792d-42ea-419f-9fac-43c0dbc4a85c",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"801be536-1190-4762-9641-427427be9cd3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_6_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_6_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk6_right_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},},},"Disabled":false,"id":"8fea9cd1-fb34-40d9-a036-61a42fecb51b","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy deleted file mode 100644 index 51dca77c74..0000000000 --- a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy +++ /dev/null @@ -1,82 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_chest_variants", - "bbox_bottom": 73, - "bbox_left": 0, - "bbox_right": 112, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d359bd56-6962-4c59-a10d-f16ae433baa8",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bc5e2753-207d-403d-81c5-a4e7066de053",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ca44f968-4109-4468-901b-d07add46e880",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"611de98f-d588-479c-ab78-87486ae53a43",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0d02faaf-2101-406d-a94f-527d1c7834db",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_chest_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 5.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"8a5283cf-1b94-4acb-8e35-054b1b7e9647","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"3565a559-326d-41c5-a322-0539e7fd4db8","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"dff23688-54a3-4f58-9748-753ea26db022","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"611de98f-d588-479c-ab78-87486ae53a43","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"c278fcc1-f8bf-4761-8bf5-6d43fc81c253","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0d02faaf-2101-406d-a94f-527d1c7834db","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"80777f49-d979-4e45-aeb9-a51c76f52090","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_complex/spr_mk7_complex.yy b/sprites/spr_mk7_complex/spr_mk7_complex.yy deleted file mode 100644 index c56397e18a..0000000000 --- a/sprites/spr_mk7_complex/spr_mk7_complex.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_complex", - "bbox_bottom": 220, - "bbox_left": 11, - "bbox_right": 152, - "bbox_top": 12, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_complex", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},},},"Disabled":false,"id":"0920e5f3-c5b3-46e7-9eb6-c9832e0b26b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy deleted file mode 100644 index ffdc59f134..0000000000 --- a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_complex_backpack", - "bbox_bottom": 38, - "bbox_left": 33, - "bbox_right": 130, - "bbox_top": 14, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d759779c-a75b-4d79-b22b-410d27d6c6de",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"216ff805-fa19-4063-a04c-9a3542762bd3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_complex_backpack", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d759779c-a75b-4d79-b22b-410d27d6c6de","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},},},"Disabled":false,"id":"dfcc2188-1c25-4b83-b365-64f54b46e5f6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy b/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy deleted file mode 100644 index 919595ab45..0000000000 --- a/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_full_colour", - "bbox_bottom": 220, - "bbox_left": 10, - "bbox_right": 153, - "bbox_top": 12, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": true, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"274a8c7b-ca8c-4721-8340-7a38238347c7",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"26ca7d83-cd69-43c3-b87e-c17db7491c50",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0aeeb946-c601-44b7-b963-ded0243eb00e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "body_types", - "path": "folders/Sprites/Marine Viewer/body_types.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_full_colour", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 4.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},},"Disabled":false,"id":"bc1fc3c0-fa0f-45d3-8a1a-2ffa8d073dec","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},},"Disabled":false,"id":"d6e067f3-ad2b-4116-9e07-c3b86d62143c","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"274a8c7b-ca8c-4721-8340-7a38238347c7","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},},"Disabled":false,"id":"1530679f-5fa0-4e40-a97f-16971a179bd4","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},},"Disabled":false,"id":"8e2b4d81-03fe-4fb8-b4ec-dab2348651b5","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 100, - "yorigin": 70, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy b/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy deleted file mode 100644 index c816486f26..0000000000 --- a/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_left_arm", - "bbox_bottom": 125, - "bbox_left": 117, - "bbox_right": 149, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5d794479-23e8-47a4-925d-8b51fe539cad",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"613dc364-ae23-4c7c-8034-86717f2d8bfe","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_left_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5d794479-23e8-47a4-925d-8b51fe539cad","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},},},"Disabled":false,"id":"0924d635-008c-493a-8c4b-3d347b7d6043","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy deleted file mode 100644 index 8bc3bddcd0..0000000000 --- a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_left_trim", - "bbox_bottom": 81, - "bbox_left": 0, - "bbox_right": 153, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5ce2cab8-595d-482d-80b5-14f9b7c098a4",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"09035cbe-5b3d-4474-a920-751ccede1b22",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a76f6caa-6867-414d-aa5b-84de7a43785e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_left_trim", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 4.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},},},"Disabled":false,"id":"363746cf-6f85-469a-b176-f73ceba6559e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5ce2cab8-595d-482d-80b5-14f9b7c098a4","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},},},"Disabled":false,"id":"5dcf49b6-4ee5-4865-8981-7b0b9e1ec5d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},},},"Disabled":false,"id":"3a072026-bb8f-472a-8844-5f39c475684d","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy b/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy deleted file mode 100644 index 0d628db4bf..0000000000 --- a/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy +++ /dev/null @@ -1,78 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_leg_variants", - "bbox_bottom": 220, - "bbox_left": 0, - "bbox_right": 151, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6481474b-6526-4bec-86dd-ba8cc60fe287",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9dfbc583-089d-4b8c-9012-405d17389b4b",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"10dc3cac-c9af-43fd-9995-5de673dd5408","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_leg_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 3.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6481474b-6526-4bec-86dd-ba8cc60fe287","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},},},"Disabled":false,"id":"989a10c5-a397-4446-9be1-267e74dc0585","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9dfbc583-089d-4b8c-9012-405d17389b4b","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},},},"Disabled":false,"id":"8c9a2904-eb56-452e-8890-9a68ec5d0217","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy b/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy deleted file mode 100644 index c2930bdb35..0000000000 --- a/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_mouth_variants", - "bbox_bottom": 44, - "bbox_left": 0, - "bbox_right": 99, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"805b74c1-f681-48e7-abfd-6f5b223474c6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"68e458f5-8c1b-450b-be3f-67390cbf0b81",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f81f55ba-964f-4c22-bab2-2bea5d52d416",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"88c52eeb-ab41-42a9-b6fa-ef097f9c2854","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_mouth_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 4.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"805b74c1-f681-48e7-abfd-6f5b223474c6","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},},},"Disabled":false,"id":"90424d54-c018-4c65-bf40-761e34299d1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},},},"Disabled":false,"id":"94d1248d-c0c4-4e25-8dfc-560ddc824524","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},},},"Disabled":false,"id":"e284f5f0-bfd1-44e1-83c7-c26b0384c4ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},},},"Disabled":false,"id":"7b5b860f-4677-4acd-80cd-7c6676d57d40","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy b/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy deleted file mode 100644 index 0c072a5a99..0000000000 --- a/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_right_arm", - "bbox_bottom": 125, - "bbox_left": 13, - "bbox_right": 45, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e48ab20b-13c1-4591-b4c8-eaa1ab9bbc6c","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_right_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},},},"Disabled":false,"id":"b3d2383f-78e1-45a6-b6fb-577392a18352","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy deleted file mode 100644 index c90ca868bc..0000000000 --- a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_right_trim", - "bbox_bottom": 81, - "bbox_left": 0, - "bbox_right": 58, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c1164960-e7ef-4c62-8e37-c5528ff3c173",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"52e01ab3-7e5a-49ab-a48c-b6c5814b153d",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cc916bec-a006-47b8-abad-fb2f23dd4877",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"10828a69-80c6-4f09-a771-8bcba3cd3460",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"738bd7dd-c70a-4987-a701-b254eab6743c","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_right_trim", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 4.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c1164960-e7ef-4c62-8e37-c5528ff3c173","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},},"Disabled":false,"id":"c727d3d1-13a1-4f40-89e9-fa21992c39d1","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"52e01ab3-7e5a-49ab-a48c-b6c5814b153d","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},},"Disabled":false,"id":"06baf3bb-c28b-400b-97fc-aca066405419","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cc916bec-a006-47b8-abad-fb2f23dd4877","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},},"Disabled":false,"id":"b2db1b93-0f97-4d01-ae37-13fc3e7d44c9","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"10828a69-80c6-4f09-a771-8bcba3cd3460","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},},"Disabled":false,"id":"4844e218-fbc4-469a-8eb5-b60134939592","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy deleted file mode 100644 index 2b5546178d..0000000000 --- a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy +++ /dev/null @@ -1,84 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk7_thorax_variants", - "bbox_bottom": 90, - "bbox_left": 0, - "bbox_right": 99, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d0338708-7e62-4549-91ae-e73b183dd2ef",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"44f5165b-6919-4a3a-9c58-452f3f588084",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"979ec1c1-5d04-49f0-bb6c-2260773073c8",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"acc4026b-406b-4bc8-8580-0d5dfad0db54","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk7_thorax_variants", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 6.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d0338708-7e62-4549-91ae-e73b183dd2ef","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"df9c08ff-f06d-400b-80e7-bb59328f9199","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"ee5845f8-5f75-4dda-836e-fc135b26839e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"44f5165b-6919-4a3a-9c58-452f3f588084","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"db13cbd7-28ca-45ef-bbcc-e67390716428","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"ca73c5a3-17d3-45a9-b6c9-78cb538894d1","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"0fae1fd8-4aa0-442c-994c-edeef09a437b","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},},},"Disabled":false,"id":"ec56882c-5f46-4d97-b25b-d17bbef25348","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk8_complex/spr_mk8_complex.yy b/sprites/spr_mk8_complex/spr_mk8_complex.yy deleted file mode 100644 index fb4b0336f6..0000000000 --- a/sprites/spr_mk8_complex/spr_mk8_complex.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk8_complex", - "bbox_bottom": 220, - "bbox_left": 10, - "bbox_right": 153, - "bbox_top": 12, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"64129718-8943-408e-8011-70f160526bff","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_8_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk8_complex", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_complex/spr_mk8_complex.yy",},},},"Disabled":false,"id":"c99da876-5d95-46d7-9177-cd6d87a6c32e","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy b/sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy deleted file mode 100644 index 25753b75bc..0000000000 --- a/sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk8_complex_backpack", - "bbox_bottom": 36, - "bbox_left": 33, - "bbox_right": 130, - "bbox_top": 12, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3f895a37-c07c-48fe-a00d-9bfb26d3b23f",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c9a18a36-a89c-4dda-a652-bffda92b312f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_8_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk8_complex_backpack", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3f895a37-c07c-48fe-a00d-9bfb26d3b23f","path":"sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy",},},},"Disabled":false,"id":"1356bf38-ea5e-45a3-beb4-13d49504e744","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy b/sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy deleted file mode 100644 index a98701bb4e..0000000000 --- a/sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk8_left_arm", - "bbox_bottom": 125, - "bbox_left": 117, - "bbox_right": 149, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f8cc2659-4e53-42fc-bb02-c5965a87c144",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3dc02faf-2d03-4290-a153-dfe87ca09155","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_8_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk8_left_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f8cc2659-4e53-42fc-bb02-c5965a87c144","path":"sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy",},},},"Disabled":false,"id":"1d7cc7e8-3cb3-4d96-9e6d-2efdce531aba","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy b/sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy deleted file mode 100644 index 3ecd482be8..0000000000 --- a/sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk8_right_arm", - "bbox_bottom": 125, - "bbox_left": 13, - "bbox_right": 45, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cdfc6c85-bc4a-4590-835b-2c50c8ee650a",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"284b2f0c-1a6a-4b9a-85bc-25cfb1e4c795","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_8_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk8_right_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cdfc6c85-bc4a-4590-835b-2c50c8ee650a","path":"sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy",},},},"Disabled":false,"id":"2be51d36-b09a-4d68-b918-f522c0dcf7a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy b/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy deleted file mode 100644 index 88552c670b..0000000000 --- a/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy +++ /dev/null @@ -1,94 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_numeral_left_knee", - "bbox_bottom": 157, - "bbox_left": 0, - "bbox_right": 128, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"83d0a8ac-8f98-4424-958c-95b882ab0e67",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"29533519-c6e5-4bda-a613-b26007242bcb",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e4b15ce1-2cf7-4657-b4de-036b06455aad",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c4049b43-1809-4728-924c-5444da8719b5",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b31e1b68-39cf-44de-a333-be8f36a74d19","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_7_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_numeral_left_knee", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 11.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"09b95042-aae6-492f-b786-b74c8c6e9263","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"47ab4ac3-1121-425c-9979-42936e389541","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"36a71730-fbce-4be8-b54c-fd8eaf732dad","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"ec4374be-3bbd-4d09-aeda-dd7c2f4b6da2","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"ee25b373-1963-4f2e-9aa5-3532ed45cff6","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"af3546e5-fb3f-4506-9654-5aafa55e19fd","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"0cbf6635-ee09-47d2-a582-f271220c8676","IsCreationKey":false,"Key":6.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"29533519-c6e5-4bda-a613-b26007242bcb","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"de7ee4b9-7b88-45f6-965e-8c99fe6bd60a","IsCreationKey":false,"Key":7.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"f9729f53-ea1d-4a0d-adfe-4596f2e3bd5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"2c2462aa-f436-4f4a-97e8-831ed46702b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c4049b43-1809-4728-924c-5444da8719b5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},},},"Disabled":false,"id":"502ea72f-bafd-4719-b46e-178305e29cda","IsCreationKey":false,"Key":10.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_pa_arms/spr_pa_arms.yy b/sprites/spr_pa_arms/spr_pa_arms.yy index c229a41f34..32136dd994 100644 --- a/sprites/spr_pa_arms/spr_pa_arms.yy +++ b/sprites/spr_pa_arms/spr_pa_arms.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_pa_arms", - "bbox_bottom": 126, + "bbox_bottom": 107, "bbox_left": 17, "bbox_right": 47, "bbox_top": 74, @@ -21,7 +21,6 @@ "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c8c30d86-b0e9-40f1-b1db-6ac4f9a54b8f","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"85d5740a-9be1-4a8b-9e97-c5301a94b6c3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": 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 b3a9bd0d47..3a3ae48808 100644 --- a/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy +++ b/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_pa_arms_ornate", - "bbox_bottom": 126, + "bbox_bottom": 107, "bbox_left": 17, "bbox_right": 47, "bbox_top": 74, @@ -21,7 +21,6 @@ "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"635383c3-d034-4bca-9f8d-4d20b553a6fb","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5e950c83-9788-452d-917a-6cb6e2063b71","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, diff --git a/sprites/spr_pa_hands/spr_pa_hands.yy b/sprites/spr_pa_hands/spr_pa_hands.yy index 0b66b2fb70..77852f01fb 100644 --- a/sprites/spr_pa_hands/spr_pa_hands.yy +++ b/sprites/spr_pa_hands/spr_pa_hands.yy @@ -4,7 +4,7 @@ "name": "spr_pa_hands", "bbox_bottom": 126, "bbox_left": 0, - "bbox_right": 46, + "bbox_right": 49, "bbox_top": 0, "bboxMode": 0, "collisionKind": 1, @@ -31,7 +31,7 @@ "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"93f64352-b53f-4c51-9e4d-9bc00b19174b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"338834a4-901b-4352-9793-54779febde8d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, diff --git a/sprites/spr_pack_brazier2/spr_pack_brazier2.yy b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy deleted file mode 100644 index ce7d22537b..0000000000 --- a/sprites/spr_pack_brazier2/spr_pack_brazier2.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_pack_brazier2", - "bbox_bottom": 97, - "bbox_left": 89, - "bbox_right": 195, - "bbox_top": 16, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3368318c-d87a-46c2-891b-f8d5cebbf275",}, - ], - "gridX": 0, - "gridY": 0, - "height": 282, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"98aca475-f03b-4cda-b4db-4409d657d963","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "packs", - "path": "folders/Sprites/Marine Viewer/packs.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_pack_brazier2", - "autoRecord": true, - "backdropHeight": 1080, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1920, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier2/spr_pack_brazier2.yy",},},},"Disabled":false,"id":"41a45b27-c017-44df-9857-968f0d783204","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 57, - "yorigin": 61, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 281, -} \ No newline at end of file diff --git a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy deleted file mode 100644 index e99a564b2e..0000000000 --- a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_pack_brazier3", - "bbox_bottom": 99, - "bbox_left": 92, - "bbox_right": 188, - "bbox_top": 38, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3368318c-d87a-46c2-891b-f8d5cebbf275",}, - ], - "gridX": 0, - "gridY": 0, - "height": 282, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"23f60daa-fe76-4e85-9875-adbeb4cce378","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "packs", - "path": "folders/Sprites/Marine Viewer/packs.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_pack_brazier3", - "autoRecord": true, - "backdropHeight": 1080, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1920, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},},},"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 57, - "yorigin": 61, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 281, -} \ No newline at end of file diff --git a/sprites/spr_pack_devastator/spr_pack_devastator.yy b/sprites/spr_pack_devastator/spr_pack_devastator.yy index 1baf74c936..13e5cd200c 100644 --- a/sprites/spr_pack_devastator/spr_pack_devastator.yy +++ b/sprites/spr_pack_devastator/spr_pack_devastator.yy @@ -13,9 +13,8 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e5637504-add9-474b-ae10-1e954d497810",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e5637504-add9-474b-ae10-1e954d497810",}, ], "gridX": 0, "gridY": 0, @@ -45,7 +44,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 3.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -56,9 +55,8 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"a2d952f8-77b2-4fde-92ee-dce364d06519","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"25804a20-d9f7-4f58-aede-581f282f1199","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},},"Disabled":false,"id":"6ab86151-8a87-45d0-9c06-4741f1b23ffd","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 eae53cada6..9626f503e7 100644 --- a/sprites/spr_pack_jump/spr_pack_jump.yy +++ b/sprites/spr_pack_jump/spr_pack_jump.yy @@ -15,7 +15,6 @@ "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"777ae2eb-75f6-4a1f-8633-057327b9a258",}, ], "gridX": 0, "gridY": 0, @@ -45,7 +44,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 3.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -58,7 +57,6 @@ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},},},"Disabled":false,"id":"232f2f80-aef0-425c-91c6-b057a1e4eab0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},},},"Disabled":false,"id":"fb16272d-2add-47a5-895f-f9827024011d","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"777ae2eb-75f6-4a1f-8633-057327b9a258","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},},},"Disabled":false,"id":"02d8ecc3-ce99-4de6-a06b-f69ff1bfe13e","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, diff --git a/sprites/spr_scout_arms/spr_scout_arms.yy b/sprites/spr_scout_arms/spr_scout_arms.yy index 9241f67532..5c05b95781 100644 --- a/sprites/spr_scout_arms/spr_scout_arms.yy +++ b/sprites/spr_scout_arms/spr_scout_arms.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_scout_arms", - "bbox_bottom": 148, + "bbox_bottom": 135, "bbox_left": 26, "bbox_right": 49, - "bbox_top": 97, + "bbox_top": 84, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -24,7 +24,7 @@ {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6875771f-a0b5-4a59-8928-4f649aaa9035","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 9, + "origin": 0, "parent": { "name": "arms_hands", "path": "folders/Sprites/Marine Viewer/arms_hands.yy", @@ -62,7 +62,7 @@ "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 11, + "yorigin": 0, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_scout_colors2/spr_scout_colors2.yy b/sprites/spr_scout_colors2/spr_scout_colors2.yy index 31e6958d54..6e811e563e 100644 --- a/sprites/spr_scout_colors2/spr_scout_colors2.yy +++ b/sprites/spr_scout_colors2/spr_scout_colors2.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_scout_colors2", - "bbox_bottom": 231, + "bbox_bottom": 218, "bbox_left": 0, "bbox_right": 144, "bbox_top": 0, @@ -31,7 +31,7 @@ {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6875771f-a0b5-4a59-8928-4f649aaa9035","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 9, + "origin": 0, "parent": { "name": "body_types", "path": "folders/Sprites/Marine Viewer/body_types.yy", @@ -76,7 +76,7 @@ "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 11, + "yorigin": 0, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy deleted file mode 100644 index bb5a365e31..0000000000 --- a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_tartaros_complex", - "bbox_bottom": 259, - "bbox_left": 10, - "bbox_right": 169, - "bbox_top": 32, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856",}, - ], - "gridX": 0, - "gridY": 0, - "height": 271, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bf13109d-149e-4439-b37b-544f85c80d9b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "tartaros_complex", - "path": "folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_tartaros_complex", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},},},"Disabled":false,"id":"200ce5df-a2aa-43be-8768-a74ae1023185","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 38, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy deleted file mode 100644 index f1a09411ef..0000000000 --- a/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_tartaros_left_arm", - "bbox_bottom": 169, - "bbox_left": 128, - "bbox_right": 173, - "bbox_top": 89, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334",}, - ], - "gridX": 0, - "gridY": 0, - "height": 271, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a26136ce-dfd5-46ea-be9c-ce22049a9ebe","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "tartaros_complex", - "path": "folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_tartaros_left_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},},},"Disabled":false,"id":"b145eebe-c835-41cf-bd87-3c3bea207624","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 38, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy deleted file mode 100644 index ea502fa28d..0000000000 --- a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_tartaros_right_arm", - "bbox_bottom": 169, - "bbox_left": 6, - "bbox_right": 51, - "bbox_top": 89, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67",}, - ], - "gridX": 0, - "gridY": 0, - "height": 271, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c87e73e1-e866-4b39-8a1f-96167acb2eca","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "tartaros_complex", - "path": "folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_tartaros_right_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},},},"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 38, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_terminator_arms/spr_terminator_arms.yy b/sprites/spr_terminator_arms/spr_terminator_arms.yy index be4f04abb6..431338a06a 100644 --- a/sprites/spr_terminator_arms/spr_terminator_arms.yy +++ b/sprites/spr_terminator_arms/spr_terminator_arms.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_terminator_arms", - "bbox_bottom": 170, + "bbox_bottom": 154, "bbox_left": 5, "bbox_right": 49, "bbox_top": 87, @@ -17,16 +17,13 @@ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"26935846-dc87-49ea-95f0-8d93e784b6b3",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8e9f5065-f35e-4408-835f-e8fbfcd63878",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"213953e7-d335-4a83-a9b8-496335dda7be",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"daf2e325-3fef-4afd-8c05-47a593d56b46",}, ], "gridX": 0, "gridY": 0, "height": 262, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fe74dd0c-ec84-46ac-bcbb-df531ec42d24","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"35a49b5e-7bad-4a28-be81-1e39d481638f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"70802338-4e62-40ea-9886-b28fe4ac671a","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, @@ -49,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 6.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -64,8 +61,6 @@ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"f758ccb5-a5a2-4ba8-826a-d935358c0750","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"97dafcc0-9581-43e8-9b5a-3b85dcce74b7","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"33ca7639-cb77-432a-983c-83471f91f6ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"7d6d9eef-0cb3-4ce9-b9be-cb53d0a55eac","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"daf2e325-3fef-4afd-8c05-47a593d56b46","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},},},"Disabled":false,"id":"8f618068-e910-457d-a3f3-bb9b274821f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 9a00eca235..210c6fcdcb 100644 --- a/sprites/spr_terminator_hands/spr_terminator_hands.yy +++ b/sprites/spr_terminator_hands/spr_terminator_hands.yy @@ -3,9 +3,9 @@ "resourceVersion": "1.0", "name": "spr_terminator_hands", "bbox_bottom": 170, - "bbox_left": 0, - "bbox_right": 45, - "bbox_top": 0, + "bbox_left": 6, + "bbox_right": 48, + "bbox_top": 100, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -31,7 +31,7 @@ "height": 262, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"34b4cf34-da25-4f45-9f1a-8dc884db941e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a047b9a5-3874-4501-8f73-cf60d7f82193","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, diff --git a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy index 22b3b2bb38..4e503026ea 100644 --- a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy +++ b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "heavy_ranged", - "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy deleted file mode 100644 index 873754657d..0000000000 --- a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_weapon_autocannon2", - "bbox_bottom": 269, - "bbox_left": 11, - "bbox_right": 84, - "bbox_top": 18, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"49d770e0-45f5-4f6a-932b-88984416b02a",}, - ], - "gridX": 0, - "gridY": 0, - "height": 281, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ffb7d722-e661-4f7c-ba36-1c68966d36d1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "heavy_ranged", - "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_weapon_autocannon2", - "autoRecord": true, - "backdropHeight": 1080, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1920, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},},},"Disabled":false,"id":"55f330f1-2ff0-4f47-b37b-c68126f5ee37","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 50, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 167, -} \ No newline at end of file diff --git a/sprites/spr_weapon_bolter/spr_weapon_bolter.yy b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy index 5c17dda33b..d0ec2b2637 100644 --- a/sprites/spr_weapon_bolter/spr_weapon_bolter.yy +++ b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_bolter", - "bbox_bottom": 186, - "bbox_left": 0, - "bbox_right": 64, - "bbox_top": 98, + "bbox_bottom": 192, + "bbox_left": 1, + "bbox_right": 165, + "bbox_top": 104, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -13,14 +13,15 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ed54fad2-a39b-4f07-9737-5b8f916bee92",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"72c933c4-937b-4aeb-958d-787de025c85a",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dada24c3-99c0-418a-ae1c-6110173d70c2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7a5d4ba3-4ada-4267-8a4f-d821528d14bf","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": { "resourceType": "GMNineSliceData", @@ -48,8 +49,8 @@ }, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -66,7 +67,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -77,7 +78,8 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},},},"Disabled":false,"id":"1f0fec53-317a-4842-bc53-a72fcbb31466","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},},},"Disabled":false,"id":"c4e178c2-cc1f-496c-9314-0012314dddbd","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"72c933c4-937b-4aeb-958d-787de025c85a","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},},},"Disabled":false,"id":"af5512ec-25af-4206-8489-5c7dbf48ee9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 4faab925b0..bb3077a426 100644 --- a/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy +++ b/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_boltpis", - "bbox_bottom": 157, - "bbox_left": 10, - "bbox_right": 57, - "bbox_top": 97, + "bbox_bottom": 160, + "bbox_left": 8, + "bbox_right": 162, + "bbox_top": 100, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,6 +14,7 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2fbe55b8-f37f-4d3b-b5a4-50db1f726aef",}, ], "gridX": 0, "gridY": 0, @@ -25,8 +26,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +44,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +56,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},},},"Disabled":false,"id":"0c722af6-a209-4472-8eb0-1060349ba7d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2fbe55b8-f37f-4d3b-b5a4-50db1f726aef","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},},},"Disabled":false,"id":"d4c844cf-5d71-4523-8aa0-4d5d9ea706f5","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 7bb7e82e77..966ee23e98 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 @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { 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 eaf2d41d12..e2aef6ef1f 100644 --- a/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy +++ b/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy index 8bdc19cb3f..d93c4f90fb 100644 --- a/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy +++ b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_chaxe", - "bbox_bottom": 218, - "bbox_left": 13, - "bbox_right": 80, - "bbox_top": 78, + "bbox_bottom": 220, + "bbox_left": 0, + "bbox_right": 147, + "bbox_top": 0, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,19 +14,22 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"53399b32-65ae-42fe-aeba-a917fde0dbe8",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a2e91ccb-6f66-4e6b-8f33-993182e175e9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"56d140c8-b5ea-4a2c-bf86-15f365028fe2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9f118e5e-f416-42b3-9416-37178dfbbb6c",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"38658137-2ef2-45e9-81ef-4b006433d76e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cb2aaba6-9f7e-48a7-866c-3c3b1ffb2a7e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +58,9 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},},},"Disabled":false,"id":"3c650843-7b9c-42f1-a8b5-86dfe07f4222","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a2e91ccb-6f66-4e6b-8f33-993182e175e9","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},},},"Disabled":false,"id":"0da3b43c-b07d-4ddc-8eca-6b408337f1a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"56d140c8-b5ea-4a2c-bf86-15f365028fe2","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},},},"Disabled":false,"id":"15f421b6-50d0-4d87-a6c1-b2e90174479d","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9f118e5e-f416-42b3-9416-37178dfbbb6c","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},},},"Disabled":false,"id":"a28837d2-7da1-4af2-a08a-90a17f9fa8bb","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 262aa29fea..8372802d02 100644 --- a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy +++ b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy @@ -4,8 +4,8 @@ "name": "spr_weapon_chsword", "bbox_bottom": 222, "bbox_left": 26, - "bbox_right": 52, - "bbox_top": 50, + "bbox_right": 140, + "bbox_top": 54, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,19 +14,22 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"bb73f108-427e-431c-b395-c87b481cb3d4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dd0ca46f-7b3d-4195-b40d-a4f2d41a69ff",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"577f17b1-b3f8-48c7-960c-65be4a6c17fa",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"024d846f-72e0-44e2-890e-84ac065f8b62","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8c23d817-6399-4aa1-bd75-e508de02c50b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +58,9 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},},},"Disabled":false,"id":"877d958c-0ba3-4cf7-b6c6-61d21827c596","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"bb73f108-427e-431c-b395-c87b481cb3d4","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},},},"Disabled":false,"id":"cbce2ea4-8b20-43d5-be8d-e0e047fcb38d","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dd0ca46f-7b3d-4195-b40d-a4f2d41a69ff","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},},},"Disabled":false,"id":"13a3057f-de04-4ba8-8a89-8e0697df825e","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"577f17b1-b3f8-48c7-960c-65be4a6c17fa","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},},},"Disabled":false,"id":"91edfcf0-e9fd-4cd0-b962-3bc105a4b640","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 3dc8742883..596b06aa77 100644 --- a/sprites/spr_weapon_colors/spr_weapon_colors.yy +++ b/sprites/spr_weapon_colors/spr_weapon_colors.yy @@ -27,8 +27,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "deprecated", - "path": "folders/Sprites/Marine Viewer/deprecated.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy index 36b18c84b9..565986fca0 100644 --- a/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy +++ b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy @@ -2,9 +2,9 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_comflamer", - "bbox_bottom": 214, - "bbox_left": 0, - "bbox_right": 64, + "bbox_bottom": 215, + "bbox_left": 5, + "bbox_right": 164, "bbox_top": 98, "bboxMode": 0, "collisionKind": 1, @@ -14,19 +14,20 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3c2840d8-d534-41df-881f-8816321e5dba",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b8b16883-0c3a-40d9-89ff-859919a05660","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f75272a6-abde-4d18-873a-81f60468f7bc","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,11 +44,11 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, - "playbackSpeed": 1.0, + "playbackSpeed": 30.0, "playbackSpeedType": 0, "showBackdrop": true, "showBackdropImage": false, @@ -55,6 +56,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},},},"Disabled":false,"id":"7b484c45-0fb4-4a0e-9361-40cc333730bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3c2840d8-d534-41df-881f-8816321e5dba","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},},},"Disabled":false,"id":"7ec5822b-34a4-4dcc-8290-2fe94d732bff","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 deleted file mode 100644 index 287cd8a592..0000000000 --- a/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_weapon_comgrav", - "bbox_bottom": 190, - "bbox_left": 0, - "bbox_right": 64, - "bbox_top": 98, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0",}, - ], - "gridX": 0, - "gridY": 0, - "height": 231, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c40eeab8-c7cb-4516-b569-de154d054380","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_weapon_comgrav", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},},},"Disabled":false,"id":"fa3e98b7-e1af-483f-a0e2-4bb9b2eaa6a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 167, -} \ No newline at end of file diff --git a/sprites/spr_weapon_commelta/spr_weapon_commelta.yy b/sprites/spr_weapon_commelta/spr_weapon_commelta.yy deleted file mode 100644 index fd3097a1c8..0000000000 --- a/sprites/spr_weapon_commelta/spr_weapon_commelta.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_weapon_commelta", - "bbox_bottom": 193, - "bbox_left": 0, - "bbox_right": 64, - "bbox_top": 98, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0",}, - ], - "gridX": 0, - "gridY": 0, - "height": 231, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ebef2178-5163-4f2b-8fd4-48c0c06604a6","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_weapon_commelta", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},},},"Disabled":false,"id":"46d36c12-1869-4661-9233-2359ea03459a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 167, -} \ No newline at end of file diff --git a/sprites/spr_weapon_complas/spr_weapon_complas.yy b/sprites/spr_weapon_complas/spr_weapon_complas.yy deleted file mode 100644 index abf529b471..0000000000 --- a/sprites/spr_weapon_complas/spr_weapon_complas.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_weapon_complas", - "bbox_bottom": 188, - "bbox_left": 0, - "bbox_right": 64, - "bbox_top": 98, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0",}, - ], - "gridX": 0, - "gridY": 0, - "height": 231, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e0db97f1-dac5-4765-84d0-119b935d8cff","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_weapon_complas", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},},},"Disabled":false,"id":"0e5740de-eb74-4f25-9419-097f6d429f97","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 167, -} \ No newline at end of file diff --git a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy index 7ec8101e88..336d2b4663 100644 --- a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy +++ b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy index 42956f389b..4f0b2e2ae8 100644 --- a/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy +++ b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy index 53b96c1f61..86cf35e96a 100644 --- a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy +++ b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_flamer/spr_weapon_flamer.yy b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy index dfec06d047..c8c06a4d6d 100644 --- a/sprites/spr_weapon_flamer/spr_weapon_flamer.yy +++ b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_flamer", - "bbox_bottom": 217, - "bbox_left": 0, - "bbox_right": 65, - "bbox_top": 97, + "bbox_bottom": 205, + "bbox_left": 5, + "bbox_right": 164, + "bbox_top": 102, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,19 +14,20 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"64e8679b-d5d0-4274-a174-32724ce1f8ec",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c39fe812-11a6-49c4-b761-7446972f9cae",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f5e88495-a58b-4e27-851f-e5e5c8d35c1f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"79f4606e-569a-45f4-862f-5db5865cd612","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 9, + "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +44,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,11 +56,12 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},},},"Disabled":false,"id":"51e2ff14-868a-47ef-a428-a84bd622c9df","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c39fe812-11a6-49c4-b761-7446972f9cae","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},},},"Disabled":false,"id":"20371c28-bc5a-464e-bb0c-e21691f87d83","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, - "xorigin": 2, + "xorigin": 0, "yorigin": 0, }, "swatchColours": null, diff --git a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy index d31ff6182b..4160a3d658 100644 --- a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy +++ b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy @@ -4,7 +4,7 @@ "name": "spr_weapon_frcstaff", "bbox_bottom": 271, "bbox_left": 12, - "bbox_right": 66, + "bbox_right": 154, "bbox_top": 12, "bboxMode": 0, "collisionKind": 1, @@ -14,19 +14,22 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"99e87bd3-b1a5-4770-8164-66f56c168fab",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b36167ca-7151-4d45-95a1-8742d54f0dd0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"35e213ab-19c2-4427-821b-b92eece94bb6",}, ], "gridX": 0, "gridY": 0, "height": 272, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"222d47bb-4335-4c82-ac67-efb8f255c0d2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c133d37b-9535-4016-b38f-64276a3cdf49","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,12 +58,15 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},},"Disabled":false,"id":"8bf4c274-3780-4000-a5da-baf166ccb705","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"99e87bd3-b1a5-4770-8164-66f56c168fab","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},},"Disabled":false,"id":"9cf71ebc-85fb-4b5d-b83c-cbf695772e57","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b36167ca-7151-4d45-95a1-8742d54f0dd0","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},},"Disabled":false,"id":"e029387f-c227-4f87-8cca-65c732909452","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"35e213ab-19c2-4427-821b-b92eece94bb6","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},},"Disabled":false,"id":"37a7abf4-2ccf-47ce-b6bd-316532ec756e","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 51, + "yorigin": 40, }, "swatchColours": null, "swfPrecision": 2.525, 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 d4a09ca6ef..cda4b3b973 100644 --- a/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy +++ b/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_grav_cannon", - "bbox_bottom": 173, - "bbox_left": 33, - "bbox_right": 226, - "bbox_top": 55, + "bbox_bottom": 184, + "bbox_left": 4, + "bbox_right": 202, + "bbox_top": 66, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,13 +14,13 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0b8f3cc3-3ce9-4378-ad72-939912fe0616",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"67fde332-4798-49cf-bb44-0ebd213419c6",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"24da9524-e605-4157-b256-95ed80b963f5",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0b66cc63-481b-442f-9d64-64e302ee91c4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3a2b63b8-5da5-49d3-86ea-e72c46d62c14",}, ], "gridX": 0, "gridY": 0, - "height": 232, + "height": 231, "HTile": false, "layers": [ {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4c68dd2d-a1e6-4382-b7bf-d242a78c6b49","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "heavy_ranged", - "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -59,14 +59,14 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"dbc4ffb4-dc70-41fd-83b7-be3dc0ae50a0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0b8f3cc3-3ce9-4378-ad72-939912fe0616","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"94013f91-770a-49c3-a40e-9a0ac97fbbc4","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"67fde332-4798-49cf-bb44-0ebd213419c6","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"249cb8fd-b259-483a-89be-edfb1756753d","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"ae74c7da-b7f7-4015-941e-562f4bc25c9a","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"24da9524-e605-4157-b256-95ed80b963f5","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"002bd936-fe8e-42b0-85dc-08d3122f8cf0","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0b66cc63-481b-442f-9d64-64e302ee91c4","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"2e6744ac-e163-40d6-b6d8-74d988dc1198","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3a2b63b8-5da5-49d3-86ea-e72c46d62c14","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},},"Disabled":false,"id":"66bb8085-ae32-4b75-9902-52326cda1681","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, - "xorigin": 45, + "xorigin": 40, "yorigin": 0, }, "swatchColours": null, @@ -77,5 +77,5 @@ }, "type": 0, "VTile": false, - "width": 227, + "width": 207, } \ No newline at end of file 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 350c2d5613..64b3012424 100644 --- a/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy +++ b/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_grav_gun", - "bbox_bottom": 213, + "bbox_bottom": 219, "bbox_left": 11, - "bbox_right": 64, - "bbox_top": 95, + "bbox_right": 155, + "bbox_top": 101, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,6 +14,7 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"29b24457-ca6a-4c9d-82a6-613144e8fc4e",}, ], "gridX": 0, "gridY": 0, @@ -48,8 +49,8 @@ }, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -66,7 +67,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -78,6 +79,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},},},"Disabled":false,"id":"be6c4d78-c251-45e2-8172-2dc6160772eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"29b24457-ca6a-4c9d-82a6-613144e8fc4e","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},},},"Disabled":false,"id":"e1c6f313-60b3-4b73-9ef6-39d6bd21e16a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 ef3bbbaf97..0d5e39886f 100644 --- a/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy +++ b/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_grav_pistol", - "bbox_bottom": 166, + "bbox_bottom": 178, "bbox_left": 22, - "bbox_right": 57, - "bbox_top": 93, + "bbox_right": 144, + "bbox_top": 105, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,6 +14,7 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dbd97fe8-875d-44bc-a7a7-888a212884db",}, ], "gridX": 0, "gridY": 0, @@ -48,8 +49,8 @@ }, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -66,7 +67,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -78,6 +79,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},},},"Disabled":false,"id":"020a30d9-3988-4c55-91ae-54f299601401","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dbd97fe8-875d-44bc-a7a7-888a212884db","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},},},"Disabled":false,"id":"2549fd8e-be82-41a8-aada-d34ccaf9d8b0","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 69372e3256..537d8f1f5f 100644 --- a/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy +++ b/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_hand_flamer", - "bbox_bottom": 178, + "bbox_bottom": 184, "bbox_left": 10, - "bbox_right": 59, - "bbox_top": 100, + "bbox_right": 156, + "bbox_top": 106, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,6 +14,7 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a3f0b9f3-e415-442e-8e9c-74beff52199d",}, ], "gridX": 0, "gridY": 0, @@ -48,8 +49,8 @@ }, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -66,7 +67,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -78,6 +79,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},},},"Disabled":false,"id":"b33db15d-4ea7-4f57-85fd-d001d7688cfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a3f0b9f3-e415-442e-8e9c-74beff52199d","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},},},"Disabled":false,"id":"47f5fe4d-02a6-4cd3-a030-b1f7f5588900","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 b2e2ced6ad..9a5fa5708b 100644 --- a/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy +++ b/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "heavy_ranged", - "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy index eba1a1d904..cc365d2df5 100644 --- a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy +++ b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "heavy_ranged", - "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy index 909b83a4b9..3bbffbc221 100644 --- a/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy +++ b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_inferno/spr_weapon_inferno.yy b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy index d6ea06eedd..ff2989457b 100644 --- a/sprites/spr_weapon_inferno/spr_weapon_inferno.yy +++ b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_inferno", - "bbox_bottom": 172, - "bbox_left": 25, - "bbox_right": 58, - "bbox_top": 99, + "bbox_bottom": 168, + "bbox_left": 17, + "bbox_right": 148, + "bbox_top": 95, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,6 +14,7 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f788d341-e281-426b-99a8-576cdbb660ce",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"562ffd17-d026-4c0e-bd09-8f8cc3c4ae77",}, ], "gridX": 0, "gridY": 0, @@ -25,8 +26,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,11 +44,11 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, - "playbackSpeed": 1.0, + "playbackSpeed": 30.0, "playbackSpeedType": 0, "showBackdrop": true, "showBackdropImage": false, @@ -55,6 +56,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f788d341-e281-426b-99a8-576cdbb660ce","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},},},"Disabled":false,"id":"0f3ad698-f0ed-487e-b9f1-ad0c95f7d469","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"562ffd17-d026-4c0e-bd09-8f8cc3c4ae77","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},},},"Disabled":false,"id":"4c7e6a68-3724-49b8-b53f-d51bcf046004","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 c36b8965da..e57c06fb76 100644 --- a/sprites/spr_weapon_knife/spr_weapon_knife.yy +++ b/sprites/spr_weapon_knife/spr_weapon_knife.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_knife", - "bbox_bottom": 164, - "bbox_left": 33, - "bbox_right": 50, - "bbox_top": 61, + "bbox_bottom": 163, + "bbox_left": 24, + "bbox_right": 142, + "bbox_top": 60, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,19 +14,22 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c5c496b3-8d87-42ea-9625-89bf253c33d0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6c3c12f9-7d4c-425a-86e5-984b2f7cd11a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"474a32bf-3136-4129-b4e4-f3eee5568d72",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"90c1b0d9-e4bc-4456-99e4-7fda887f5129",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f2d036d3-3fd2-4d2b-ab43-81aa5a7ee3d3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dd206ef0-a851-4423-9628-95c71a609915","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +58,9 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},},},"Disabled":false,"id":"aa85f45a-777f-4198-a19d-33ec37678e1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6c3c12f9-7d4c-425a-86e5-984b2f7cd11a","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},},},"Disabled":false,"id":"555ae523-a7b2-466d-b267-ad7b1412f3a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"474a32bf-3136-4129-b4e4-f3eee5568d72","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},},},"Disabled":false,"id":"c4c4f6e5-14b5-4071-84ad-a395dad29834","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"90c1b0d9-e4bc-4456-99e4-7fda887f5129","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},},},"Disabled":false,"id":"5f7fb45e-7d83-4c2c-acf3-2ed23ad88b13","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 5a44185415..51ca2f2035 100644 --- a/sprites/spr_weapon_lasca/spr_weapon_lasca.yy +++ b/sprites/spr_weapon_lasca/spr_weapon_lasca.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "heavy_ranged", - "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy index ade840d4b1..c09d5a87cf 100644 --- a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy +++ b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { 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 deleted file mode 100644 index 220d9228a8..0000000000 --- a/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_weapon_mace_of_absolution", - "bbox_bottom": 261, - "bbox_left": 13, - "bbox_right": 75, - "bbox_top": 103, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"630e8d95-baaa-4950-8761-35b8ccf4848c",}, - ], - "gridX": 0, - "gridY": 0, - "height": 262, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_weapon_mace_of_absolution", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},},},"Disabled":false,"id":"03644e7c-f6ca-4447-91f5-b7c7c2d15ce1","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 7, - "yorigin": 30, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 181, -} \ No newline at end of file diff --git a/sprites/spr_weapon_melta/spr_weapon_melta.yy b/sprites/spr_weapon_melta/spr_weapon_melta.yy index 1bcb5b204c..c5840db0c8 100644 --- a/sprites/spr_weapon_melta/spr_weapon_melta.yy +++ b/sprites/spr_weapon_melta/spr_weapon_melta.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_melta", - "bbox_bottom": 212, - "bbox_left": 4, - "bbox_right": 61, - "bbox_top": 101, + "bbox_bottom": 201, + "bbox_left": 6, + "bbox_right": 160, + "bbox_top": 87, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,6 +14,7 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"881d2fb1-5056-4735-8d84-8ca6614caff0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"093cae00-ed42-49a5-84ff-7719eb3e004b",}, ], "gridX": 0, "gridY": 0, @@ -25,8 +26,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,11 +44,11 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, - "playbackSpeed": 1.0, + "playbackSpeed": 30.0, "playbackSpeedType": 0, "showBackdrop": true, "showBackdropImage": false, @@ -55,6 +56,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"881d2fb1-5056-4735-8d84-8ca6614caff0","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},},},"Disabled":false,"id":"74cd6908-01ec-4465-b482-4435e04d4f02","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"093cae00-ed42-49a5-84ff-7719eb3e004b","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},},},"Disabled":false,"id":"7317b28e-625e-42a6-b11a-379a816490af","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 8b048b734a..11e66c8920 100644 --- a/sprites/spr_weapon_missile/spr_weapon_missile.yy +++ b/sprites/spr_weapon_missile/spr_weapon_missile.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_missile", - "bbox_bottom": 160, - "bbox_left": 25, - "bbox_right": 77, - "bbox_top": 0, + "bbox_bottom": 146, + "bbox_left": 12, + "bbox_right": 154, + "bbox_top": 15, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,19 +14,20 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2250a315-f18a-45f1-956e-3e196b64c3b6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"51cfdf3d-88b2-412e-8acd-9689aa0521a5",}, ], "gridX": 0, "gridY": 0, - "height": 231, + "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5bccb04e-2893-4986-b824-b18637fb39ec","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"8838feaa-48ab-47af-a4f1-054a9a7c9fb9","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +44,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +56,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2250a315-f18a-45f1-956e-3e196b64c3b6","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},},},"Disabled":false,"id":"c1cf7e78-050c-4d04-bbb5-967f84a51577","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"51cfdf3d-88b2-412e-8acd-9689aa0521a5","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},},},"Disabled":false,"id":"7ce425b9-a469-44dc-83ee-c45e3fba069e","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 4fccb6fef1..7d172092a0 100644 --- a/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy +++ b/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "heavy_ranged", - "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_plasc/spr_weapon_plasc.yy b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy index c286821bca..0a44486e0e 100644 --- a/sprites/spr_weapon_plasc/spr_weapon_plasc.yy +++ b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "heavy_ranged", - "path": "folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_plasg/spr_weapon_plasg.yy b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy index 17d66faa33..e217b2ed1e 100644 --- a/sprites/spr_weapon_plasg/spr_weapon_plasg.yy +++ b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy @@ -4,7 +4,7 @@ "name": "spr_weapon_plasg", "bbox_bottom": 195, "bbox_left": 22, - "bbox_right": 65, + "bbox_right": 144, "bbox_top": 86, "bboxMode": 0, "collisionKind": 1, @@ -14,6 +14,7 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a4883e21-05cf-4d8f-bed5-d89946e80145",}, ], "gridX": 0, "gridY": 0, @@ -25,8 +26,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +44,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +56,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},},},"Disabled":false,"id":"e8b5a45b-814c-49dc-9fc4-16d6bf9347bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a4883e21-05cf-4d8f-bed5-d89946e80145","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},},},"Disabled":false,"id":"b9d35f28-492c-48ce-bc59-00dd43378397","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 4c31f054a9..e34628d4cf 100644 --- a/sprites/spr_weapon_plasp/spr_weapon_plasp.yy +++ b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_plasp", - "bbox_bottom": 172, - "bbox_left": 22, - "bbox_right": 51, - "bbox_top": 101, + "bbox_bottom": 173, + "bbox_left": 23, + "bbox_right": 143, + "bbox_top": 102, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,6 +14,7 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e9b93f86-ee4d-46dd-85b8-6a469057430e",}, ], "gridX": 0, "gridY": 0, @@ -25,8 +26,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +44,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +56,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},},},"Disabled":false,"id":"8333a6b3-f6e7-4458-ad54-3d025c953fdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e9b93f86-ee4d-46dd-85b8-6a469057430e","path":"sprites/spr_weapon_plasp/spr_weapon_plasp.yy",},},},"Disabled":false,"id":"10cd094d-1c40-4cc9-a2e0-88563ed7917a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 d4fa508ff9..207f83a9b5 100644 --- a/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy +++ b/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_powaxe", - "bbox_bottom": 231, - "bbox_left": 16, - "bbox_right": 73, - "bbox_top": 82, + "bbox_bottom": 215, + "bbox_left": 0, + "bbox_right": 155, + "bbox_top": 0, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,19 +14,22 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e9e43ac8-8872-4a91-b2c7-2aec646300b1",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a8431c20-507a-448c-9739-a6e71dd8371f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"766125ba-d5c9-4cf8-8800-ac92eebde4e8",}, ], "gridX": 0, "gridY": 0, "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"47b6aab9-0dc2-40bb-8df3-b32e803135d0","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5ce4d2d0-cf56-446f-b39d-069bf71ec83d","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 9, + "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,12 +58,15 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},},},"Disabled":false,"id":"90a9b82b-dd4a-488d-87a8-50b3fff5dc34","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e9e43ac8-8872-4a91-b2c7-2aec646300b1","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},},},"Disabled":false,"id":"55e563a8-14c2-40bf-a09a-53bbff789629","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a8431c20-507a-448c-9739-a6e71dd8371f","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},},},"Disabled":false,"id":"ec1c218c-2c76-4183-a49d-f46186e10a49","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"766125ba-d5c9-4cf8-8800-ac92eebde4e8","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},},},"Disabled":false,"id":"6d8590b0-fda9-4266-86cc-92678def8b77","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 11, + "yorigin": 0, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy index 8a915a2d1e..9469019f24 100644 --- a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy +++ b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy index 41de634544..b8a50ae60c 100644 --- a/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy +++ b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy @@ -30,8 +30,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "deprecated", - "path": "folders/Sprites/Marine Viewer/deprecated.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { 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 7cdfa2950c..b97897f05c 100644 --- a/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy +++ b/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "deprecated", - "path": "folders/Sprites/Marine Viewer/deprecated.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy index 7dea9b9893..2b81a94e51 100644 --- a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy +++ b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy @@ -3,8 +3,8 @@ "resourceVersion": "1.0", "name": "spr_weapon_powmace", "bbox_bottom": 261, - "bbox_left": 17, - "bbox_right": 70, + "bbox_left": 5, + "bbox_right": 175, "bbox_top": 107, "bboxMode": 0, "collisionKind": 1, @@ -13,20 +13,23 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"630e8d95-baaa-4950-8761-35b8ccf4848c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b35d9128-ba42-4e55-a9af-d7e0cc020880",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"23aa37db-0d4b-4e4c-a8a5-6b73dde07536",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3499703f-7d4c-4f28-8493-af031c87c0bb",}, ], "gridX": 0, "gridY": 0, "height": 262, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c10b9469-0355-40db-913d-37ad87c46d82","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3473fea1-f986-49e0-a74f-4e16f84ef3dc","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons_terminator", + "path": "folders/Sprites/Marine Viewer/weapons_terminator.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -54,13 +57,16 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"316e0e0f-a739-4bb0-b052-89d4b964924d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"01500611-3d0f-4b4f-a003-0e640a9e8e9c","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b35d9128-ba42-4e55-a9af-d7e0cc020880","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"45b291dd-1c7a-4658-b2a1-eac9d2f9ef9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"23aa37db-0d4b-4e4c-a8a5-6b73dde07536","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"d3ff8350-d479-47c3-8761-544537a02055","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3499703f-7d4c-4f28-8493-af031c87c0bb","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},},"Disabled":false,"id":"2f536ddb-0db5-402e-81c5-8af77d96f182","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, "xorigin": 7, - "yorigin": 20, + "yorigin": 12, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy index f2fd14d50c..2263404f24 100644 --- a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy +++ b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy @@ -3,9 +3,9 @@ "resourceVersion": "1.0", "name": "spr_weapon_powmaul", "bbox_bottom": 223, - "bbox_left": 30, - "bbox_right": 50, - "bbox_top": 68, + "bbox_left": 29, + "bbox_right": 138, + "bbox_top": 57, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,19 +14,21 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0411c512-ab45-4528-8744-8f5cc93375d9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"00c20a0b-8100-4cf3-86db-33bd0b8ac834",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"702eb9a2-705f-415f-a691-14aff59f08f6",}, ], "gridX": 0, "gridY": 0, "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"14332b18-11a3-493b-827c-f96db0fe5de2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fd84b4d2-be02-49e9-80ee-c61230d79677","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +45,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 3.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +57,8 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0411c512-ab45-4528-8744-8f5cc93375d9","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},},},"Disabled":false,"id":"562e79ed-f23d-4371-8a19-59b8c0541d4a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"00c20a0b-8100-4cf3-86db-33bd0b8ac834","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},},},"Disabled":false,"id":"4b24446f-3fb9-432e-ba3e-3234a69b24d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"702eb9a2-705f-415f-a691-14aff59f08f6","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},},},"Disabled":false,"id":"1fb9a7de-e900-43f2-b947-c7566d9a50dd","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 7a705b9340..ab6762ed18 100644 --- a/sprites/spr_weapon_powspear/spr_weapon_powspear.yy +++ b/sprites/spr_weapon_powspear/spr_weapon_powspear.yy @@ -3,8 +3,8 @@ "resourceVersion": "1.0", "name": "spr_weapon_powspear", "bbox_bottom": 275, - "bbox_left": 25, - "bbox_right": 44, + "bbox_left": 24, + "bbox_right": 142, "bbox_top": 17, "bboxMode": 0, "collisionKind": 1, @@ -14,19 +14,22 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"49d770e0-45f5-4f6a-932b-88984416b02a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"39acba31-1514-4d17-b51e-24001a11f230",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dc43142f-06af-40f2-b9c7-b5e855b50029",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7dfbc6f0-db07-4472-a526-cafd5d821e1c",}, ], "gridX": 0, "gridY": 0, "height": 281, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"737ddb0f-0768-4b00-b805-2515165a6313","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9f06783b-33fd-405c-accf-8508a6ebc1ae","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +58,9 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},},},"Disabled":false,"id":"b384452c-57a9-4471-867e-57707dc0e6f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"39acba31-1514-4d17-b51e-24001a11f230","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},},},"Disabled":false,"id":"008a2125-6976-468f-adf1-6bc4a20cee76","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dc43142f-06af-40f2-b9c7-b5e855b50029","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},},},"Disabled":false,"id":"b8207941-0d2a-40f9-92a1-e4f06df1ee2a","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7dfbc6f0-db07-4472-a526-cafd5d821e1c","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},},},"Disabled":false,"id":"2e6a41ea-17a5-4147-aa47-8d68373323fa","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 d5d8d4c932..e7932852bc 100644 --- a/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy +++ b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy @@ -30,8 +30,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "unused", - "path": "folders/Sprites/Marine Viewer/unused.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy index cf446311ca..d492bc70bf 100644 --- a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy +++ b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_powspear3", - "bbox_bottom": 281, + "bbox_bottom": 275, "bbox_left": 22, "bbox_right": 48, "bbox_top": 30, @@ -20,15 +20,15 @@ "height": 282, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"41b6b4ab-54d0-465a-abe2-ed4fff718dc7","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"017652a3-1080-42c6-8700-3cbe1f99bdb0","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"41b6b4ab-54d0-465a-abe2-ed4fff718dc7","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":false,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"017652a3-1080-42c6-8700-3cbe1f99bdb0","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":false,}, {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"67824055-5997-42cf-9911-ba6b9c0b00e5","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, "parent": { - "name": "unused", - "path": "folders/Sprites/Marine Viewer/unused.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy index 86255e582b..5ee0cfb3aa 100644 --- a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy +++ b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy @@ -2,9 +2,9 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_powswo", - "bbox_bottom": 220, + "bbox_bottom": 221, "bbox_left": 20, - "bbox_right": 59, + "bbox_right": 146, "bbox_top": 59, "bboxMode": 0, "collisionKind": 1, @@ -14,19 +14,22 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2d8c0f5d-9c67-4d9d-a923-668c83b5558b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"68f57d1d-2321-4125-847a-e384e3922bdc",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3aa17fdc-2bf1-413b-a492-1613c3b88cfe",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ad2d62f0-ca5a-4c09-86c2-ee917caf8ec6","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,6 +58,9 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},},},"Disabled":false,"id":"c90840de-d6cc-483e-a57c-af59544fddb7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2d8c0f5d-9c67-4d9d-a923-668c83b5558b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},},},"Disabled":false,"id":"e0186623-b117-4ead-83e6-8749ebdc1dac","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"68f57d1d-2321-4125-847a-e384e3922bdc","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},},},"Disabled":false,"id":"9f51f75b-3818-49cb-926f-6dac700c239f","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3aa17fdc-2bf1-413b-a492-1613c3b88cfe","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},},},"Disabled":false,"id":"5f957d71-882b-41c1-8c88-4a4408bb5b89","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 af60c15eed..84f0fa2bf3 100644 --- a/sprites/spr_weapon_relbla/spr_weapon_relbla.yy +++ b/sprites/spr_weapon_relbla/spr_weapon_relbla.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "deprecated", - "path": "folders/Sprites/Marine Viewer/deprecated.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { 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 d03b3ef64d..3288e5aaec 100644 --- a/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy +++ b/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy @@ -29,8 +29,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy index 3cb7e16bd8..350741ab8f 100644 --- a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy +++ b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_sbolter", - "bbox_bottom": 168, - "bbox_left": 3, - "bbox_right": 64, - "bbox_top": 88, + "bbox_bottom": 189, + "bbox_left": 5, + "bbox_right": 164, + "bbox_top": 109, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,6 +14,7 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9e8743e4-54e1-4c35-b7e7-bb668123eb5f",}, ], "gridX": 0, "gridY": 0, @@ -25,8 +26,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +44,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,9 +56,10 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},},},"Disabled":false,"id":"6f46c285-35b1-4a8e-b996-6405ca743092","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9e8743e4-54e1-4c35-b7e7-bb668123eb5f","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},},},"Disabled":false,"id":"a67c52fb-67e4-4c22-b808-d2298d2b778b","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, + "visibleRange": {"x":0.0,"y":0.0,}, "volume": 1.0, "xorigin": 0, "yorigin": 0, @@ -70,5 +72,5 @@ }, "type": 0, "VTile": false, - "width": 167, + "width": 180, } \ No newline at end of file diff --git a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy index 59b85ea60d..e08e7a44a0 100644 --- a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy +++ b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_sniper", - "bbox_bottom": 230, + "bbox_bottom": 210, "bbox_left": 27, - "bbox_right": 61, - "bbox_top": 49, + "bbox_right": 141, + "bbox_top": 29, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,19 +14,22 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"09e772d4-7976-49cd-a2e3-9dce1939fed0",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f7d01509-757f-4c4e-a51b-dcc361898e6e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f1b26714-9ca5-403a-a3b5-4a22cb8b41a7",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8d2013d9-4e68-4804-a99b-82cff87af25a",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2b9111a5-a70d-4779-86f0-73de1ae3fb8e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"34745a3f-9a2b-4068-80b0-9cd500568408","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, - "origin": 9, + "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -55,12 +58,15 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},},},"Disabled":false,"id":"a7fe76e7-cc09-48ac-9bb7-983d65dd2ac7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f7d01509-757f-4c4e-a51b-dcc361898e6e","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},},},"Disabled":false,"id":"d4dea5d2-c2ba-4c2e-8e3f-2bb5c7b0e2d6","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f1b26714-9ca5-403a-a3b5-4a22cb8b41a7","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},},},"Disabled":false,"id":"21052f2d-58a9-4742-a86b-902e511730a4","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8d2013d9-4e68-4804-a99b-82cff87af25a","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},},},"Disabled":false,"id":"cf3eec8f-c6cc-4b48-bdcc-c61c47bd1eaa","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, "volume": 1.0, "xorigin": 0, - "yorigin": 10, + "yorigin": 0, }, "swatchColours": null, "swfPrecision": 2.525, diff --git a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy index 544fb4cb1e..54ff988f8d 100644 --- a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy +++ b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_weapon_stalker", - "bbox_bottom": 222, - "bbox_left": 0, - "bbox_right": 71, - "bbox_top": 98, + "bbox_bottom": 220, + "bbox_left": 5, + "bbox_right": 161, + "bbox_top": 96, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,19 +14,20 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"14db339f-7395-4530-87dc-3a3aace86211",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7e8f3edd-ff77-4205-87a8-3319cc21c8df",}, ], "gridX": 0, "gridY": 0, "height": 231, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a4cd5a4b-c267-449f-9b5f-c336e8f68c00","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dcb709d2-2301-4c99-acab-76c6a482bdac","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, "parent": { - "name": "ranged", - "path": "folders/Sprites/Marine Viewer/weapons/ranged.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { @@ -43,11 +44,11 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 1.0, + "length": 2.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, - "playbackSpeed": 1.0, + "playbackSpeed": 30.0, "playbackSpeedType": 0, "showBackdrop": true, "showBackdropImage": false, @@ -55,6 +56,7 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"14db339f-7395-4530-87dc-3a3aace86211","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},},},"Disabled":false,"id":"160c40ae-6978-467b-a08b-d4ae57c05d2b","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7e8f3edd-ff77-4205-87a8-3319cc21c8df","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},},},"Disabled":false,"id":"65a240e4-c608-4ea9-8edf-d3965fd5d49d","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"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 2622e550f3..8bc4ea46ed 100644 --- a/sprites/spr_weapon_standard/spr_weapon_standard.yy +++ b/sprites/spr_weapon_standard/spr_weapon_standard.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 9, "parent": { - "name": "deprecated", - "path": "folders/Sprites/Marine Viewer/deprecated.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { diff --git a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy index 8c1bc452c9..38f6872fa9 100644 --- a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy +++ b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy @@ -28,8 +28,8 @@ "nineSlice": null, "origin": 0, "parent": { - "name": "melee", - "path": "folders/Sprites/Marine Viewer/weapons/melee.yy", + "name": "weapons", + "path": "folders/Sprites/Marine Viewer/weapons.yy", }, "preMultiplyAlpha": false, "sequence": { 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 deleted file mode 100644 index 400690dfc7..0000000000 --- a/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_ws_mk3__pualdron_veteran", - "bbox_bottom": 121, - "bbox_left": 11, - "bbox_right": 60, - "bbox_top": 64, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"41a2cc3c-da75-4ae5-957f-4605884d3c33",}, - ], - "gridX": 0, - "gridY": 0, - "height": 272, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dd66fef4-fe3c-4559-81ee-9bc6e44d5624","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "white_scars_specials", - "path": "folders/Sprites/Marine Viewer/body_types/specialist/white_scars_specials.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_ws_mk3__pualdron_veteran", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},},},"Disabled":false,"id":"a6bfe4dd-ff75-4365-af6c-fadbb12914f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 167, -} \ No newline at end of file diff --git a/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy b/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy deleted file mode 100644 index 36235f4918..0000000000 --- a/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_ws_mk4_monovisor", - "bbox_bottom": 83, - "bbox_left": 73, - "bbox_right": 94, - "bbox_top": 69, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226",}, - ], - "gridX": 0, - "gridY": 0, - "height": 272, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2353db13-4d43-4b24-a599-a7eda0369bac","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "white_scars_specials", - "path": "folders/Sprites/Marine Viewer/body_types/specialist/white_scars_specials.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_ws_mk4_monovisor", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},},},"Disabled":false,"id":"2f7020a2-698f-4265-8a00-5d2988511edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 167, -} \ No newline at end of file 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 deleted file mode 100644 index df953a5373..0000000000 --- a/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_ws_mk7_scar_of_the_ancients", - "bbox_bottom": 73, - "bbox_left": 68, - "bbox_right": 79, - "bbox_top": 59, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c43a742-205d-4a15-b030-7a635381bb2e",}, - ], - "gridX": 0, - "gridY": 0, - "height": 272, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"96444367-d43b-48f2-af6a-7071317401bd","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "white_scars_specials", - "path": "folders/Sprites/Marine Viewer/body_types/specialist/white_scars_specials.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_ws_mk7_scar_of_the_ancients", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5c43a742-205d-4a15-b030-7a635381bb2e","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},},},"Disabled":false,"id":"93fb0caf-9576-4f30-be2c-b8caebd494e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 167, -} \ No newline at end of file From 9d119c23b1810f1338143ac0ac8fd822e6a99996 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 7 Dec 2024 12:02:42 +0000 Subject: [PATCH 3/3] fix refugees index error --- .../scr_ork_fleet_functions.gml | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) 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 f74c641caf..3ceafbc4b9 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -15,11 +15,12 @@ function build_new_ork_ships_to_fleet(star, planet){ // Increase ship number for this object? var rando=irandom(101); if (obj_controller.known[eFACTION.Ork]>0) then rando-=10; - if (star.p_type[planet]=="Forge"){ + var _planet_type = star.p_type[planet]; + if (_planet_type=="Forge"){ rando-=20; - } else if (star.p_type[planet]=="Hive"){ + } else if (_planet_type=="Hive"){ rando-=10; - }else if (star.p_type[planet]=="Shrine" || star.p_type[planet]=="Temperate"){ + }else if (_planet_type=="Shrine" || _planet_type=="Temperate"){ rando-=5; } if (rando<=15){// was 25 @@ -93,21 +94,23 @@ function ork_fleet_arrive_target(){ var _imperial_ship = scr_orbiting_fleet([eFACTION.Player, eFACTION.Imperium]); if (_imperial_ship == "none" && _ork_fleet!="none" && planets>0){ - var _allow_landing=true,t1=0,l=0; + var _allow_landing=true,ork_attack_planet=0,l=0; repeat(planets){ l+=1; - if (t1=0) and (p_tyranids[l]>0) then t1=l; + if (ork_attack_planet=0) and (p_tyranids[l]>0) then ork_attack_planet=l; } - if (t1>0) then p_tyranids[t1]-=_ork_fleet.capital_number+(_ork_fleet.frigate_number/2); - if (p_tyranids[t1]<=0){ - if (planet_feature_bool(p_feature[t1], P_features.Gene_Stealer_Cult)){ - delete_features(p_feature[t1], P_features.Gene_Stealer_Cult); - adjust_influence(eFACTION.Tyranids, -25, t1); + if (ork_attack_planet>0) then p_tyranids[ork_attack_planet]-=_ork_fleet.capital_number+(_ork_fleet.frigate_number/2); + + if (p_tyranids[ork_attack_planet]<=0){ + if (planet_feature_bool(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult)){ + delete_features(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult); + 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"){ var targ_planet = scr_get_planet_with_owner(nearest_imperial,eFACTION.Imperium); - new_colony_fleet(self.id, t1, nearest_imperial.id, targ_planet, "refugee"); + if (targ_planet==-1) then targ_planet = irandom_range(1, nearest_imperial.planets); + new_colony_fleet(self.id, ork_attack_planet, nearest_imperial.id, targ_planet, "refugee"); } } }