diff --git a/.github/size_labeler.yml b/.github/size_labeler.yml new file mode 100644 index 0000000000..a661b35e37 --- /dev/null +++ b/.github/size_labeler.yml @@ -0,0 +1,30 @@ +version: 1 +appendOnly: false +labels: +- label: "Size: Tiny" + size: + below: 50 + +- label: "Size: Small" + size: + above: 49 + below: 200 + +- label: "Size: Medium" + size: + above: 199 + below: 400 + +- label: "Size: Big" + size: + above: 399 + below: 800 + +- label: "Size: Huge" + size: + above: 799 + below: 1600 + +- label: "Size: Epic" + size: + above: 1599 diff --git a/.github/srvaroa_labeler.yml b/.github/srvaroa_labeler.yml index 5d4627fcc6..44b4c524ae 100644 --- a/.github/srvaroa_labeler.yml +++ b/.github/srvaroa_labeler.yml @@ -40,7 +40,3 @@ labels: title: "^perf" - label: "PR: Performance" body: "(?i)(\\[performance\\]|\\[perf\\])" - -- label: "PR: Major Coding" - size: - above: 800 diff --git a/.github/stale_labeler.yml b/.github/stale_labeler.yml new file mode 100644 index 0000000000..920cd41c7b --- /dev/null +++ b/.github/stale_labeler.yml @@ -0,0 +1,6 @@ +version: 1 +appendOnly: false +labels: + - label: "Status: Stale" + last-modified: + at-least: 2w diff --git a/.github/workflows/labeler.yml b/.github/workflows/open_labeler.yml similarity index 82% rename from .github/workflows/labeler.yml rename to .github/workflows/open_labeler.yml index ff4c47c2bb..fadcfde720 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/open_labeler.yml @@ -18,11 +18,6 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - name: "File Based Labeler" - uses: actions/labeler@v5 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - sync-labels: false - name: "Content Based Labeler" uses: srvaroa/labeler@master env: diff --git a/.github/workflows/stale_labeler.yml b/.github/workflows/stale_labeler.yml new file mode 100644 index 0000000000..f865405e41 --- /dev/null +++ b/.github/workflows/stale_labeler.yml @@ -0,0 +1,20 @@ +name: "Stale Labeler" +on: + schedule: + - cron: "0 00 * * *" # <=== Change this value + +jobs: + labeler: + name: Label Stale Things + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - name: "Run Srvaroa Labeler" + uses: srvaroa/labeler@master + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + with: + config_path: .github/stale_labeler.yml + fail_on_error: true diff --git a/.github/workflows/sync_labeler.yml b/.github/workflows/sync_labeler.yml new file mode 100644 index 0000000000..46f243ba95 --- /dev/null +++ b/.github/workflows/sync_labeler.yml @@ -0,0 +1,32 @@ +# This workflow will triage pull requests and apply a label based on the +# paths that are modified in the pull request. +# +# To use this workflow, you will need to set up a .github/labeler.yml +# file with configuration. For more information, see: +# https://github.com/actions/labeler + +name: "PR Sync Labeler" +on: + pull_request_target: + types: [opened, edited, synchronize] + +jobs: + labeler: + name: Sync PR Labels + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - name: "File Based Labeler" + uses: actions/labeler@v5 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" + sync-labels: true + - name: "Size Based Labeler" + uses: srvaroa/labeler@master + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + with: + config_path: .github/size_labeler.yml + fail_on_error: true diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index de2b304055..b34036a38d 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -72,6 +72,7 @@ {"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":"roman_theme","folderPath":"folders/Sprites/Marine Viewer/body_types/specialist/roman_theme.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":"techmarine_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/techmarine_complex.yy",}, @@ -458,6 +459,24 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"tau.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"readme.md","CopyToMask":-1,"filePath":"datafiles/main",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"version.json","CopyToMask":-1,"filePath":"datafiles/main",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_knee",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"12.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_knee/one",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"32.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_knee/three",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"22.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_knee/two",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/eight",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/five",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/four",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/nine",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/one",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/seven",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/six",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/ten",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/three",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/two",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set/test_sprite",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"use_sets.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets",}, ], "isEcma": false, "LibraryEmitters": [], @@ -470,10 +489,12 @@ {"id":{"name":"spr_blog","path":"sprites/spr_blog/spr_blog.yy",},}, {"id":{"name":"spr_da_chaplain","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},}, {"id":{"name":"spr_icon","path":"sprites/spr_icon/spr_icon.yy",},}, + {"id":{"name":"spr_terminator_metal_tabbard","path":"sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy",},}, {"id":{"name":"spr_icon_chapters","path":"sprites/spr_icon_chapters/spr_icon_chapters.yy",},}, {"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":"spr_sword_pendant","path":"sprites/spr_sword_pendant/spr_sword_pendant.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",},}, @@ -495,10 +516,11 @@ {"id":{"name":"spr_gear_chap","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},}, {"id":{"name":"spr_marine_cloth_hood","path":"sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy",},}, {"id":{"name":"spr_gear_apoth","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},}, - {"id":{"name":"spr_gear_techb","path":"sprites/spr_gear_techb/spr_gear_techb.yy",},}, + {"id":{"name":"spr_metal_tabbard","path":"sprites/spr_metal_tabbard/spr_metal_tabbard.yy",},}, {"id":{"name":"spr_strength_icon","path":"sprites/spr_strength_icon/spr_strength_icon.yy",},}, {"id":{"name":"spr_marine_base","path":"sprites/spr_marine_base/spr_marine_base.yy",},}, {"id":{"name":"spr_clothing_colors","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},}, + {"id":{"name":"spr_ultra_backpack","path":"sprites/spr_ultra_backpack/spr_ultra_backpack.yy",},}, {"id":{"name":"spr_facial_colors","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},}, {"id":{"name":"spr_skitarii","path":"sprites/spr_skitarii/spr_skitarii.yy",},}, {"id":{"name":"spr_techmarine_left_leg","path":"sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy",},}, @@ -510,6 +532,7 @@ {"id":{"name":"spr_beakie_colors","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},}, {"id":{"name":"spr_dread_colors","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},}, {"id":{"name":"scr_draw_unit_image","path":"scripts/scr_draw_unit_image/scr_draw_unit_image.yy",},}, + {"id":{"name":"spr_knightly_personal_livery","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},}, {"id":{"name":"spr_errant_colors","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},}, {"id":{"name":"spr_da_mk7_helm_crests","path":"sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy",},}, {"id":{"name":"spr_iron_colors","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},}, @@ -524,6 +547,7 @@ {"id":{"name":"spr_generic_sgt_mk5","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},}, {"id":{"name":"spr_bionics_leg_3","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},}, {"id":{"name":"spr_tartaros2_colors","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},}, + {"id":{"name":"spr_knightly_belt","path":"sprites/spr_knightly_belt/spr_knightly_belt.yy",},}, {"id":{"name":"spr_tartaros_wep_fix","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},}, {"id":{"name":"spr_terminator_colors","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},}, {"id":{"name":"spr_terminator2_colors","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},}, @@ -542,6 +566,8 @@ {"id":{"name":"spr_weapon_standard","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},}, {"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":"spr_mk7_mongol_chest_variants","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},}, + {"id":{"name":"spr_mk6_forehead_knightly","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.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",},}, @@ -549,6 +575,7 @@ {"id":{"name":"spr_artificer_left_leg","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},}, {"id":{"name":"spr_weapon_bolter","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},}, {"id":{"name":"spr_weapon_sbolter","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},}, + {"id":{"name":"spr_terminator_complex_arm_hidden_right","path":"sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy",},}, {"id":{"name":"spr_weapon_comflamer","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},}, {"id":{"name":"spr_weapon_flamer","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},}, {"id":{"name":"spr_weapon_missile","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},}, @@ -622,6 +649,7 @@ {"id":{"name":"spr_sal_mk5_helm","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},}, {"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_mk6_knightly_mouth_variants","path":"sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},}, {"id":{"name":"spr_loadbar_empty","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.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",},}, @@ -630,6 +658,7 @@ {"id":{"name":"spr_load_splash","path":"sprites/spr_load_splash/spr_load_splash.yy",},}, {"id":{"name":"spr_formation_bars","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},}, {"id":{"name":"spr_bionic_leg_right","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},}, + {"id":{"name":"spr_terminator_complex_arms_upper_right","path":"sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy",},}, {"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",},}, @@ -638,16 +667,19 @@ {"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":"spr_roman_cloak","path":"sprites/spr_roman_cloak/spr_roman_cloak.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_jump_pack_complex","path":"sprites/spr_jump_pack_complex/spr_jump_pack_complex.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",},}, {"id":{"name":"spr_ui_but_2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},}, + {"id":{"name":"spr_mk7_mouth_prussian","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},}, {"id":{"name":"spr_ui_but_3","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},}, {"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",},}, @@ -659,6 +691,7 @@ {"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",},}, + {"id":{"name":"spr_apothecary_lights","path":"sprites/spr_apothecary_lights/spr_apothecary_lights.yy",},}, {"id":{"name":"spr_help_panel","path":"sprites/spr_help_panel/spr_help_panel.yy",},}, {"id":{"name":"scr_system_spawn_functions","path":"scripts/scr_system_spawn_functions/scr_system_spawn_functions.yy",},}, {"id":{"name":"UIRenderComponents","path":"scripts/UIRenderComponents/UIRenderComponents.yy",},}, @@ -673,18 +706,21 @@ {"id":{"name":"spr_popup_small","path":"sprites/spr_popup_small/spr_popup_small.yy",},}, {"id":{"name":"spr_mk6_head_variants","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},}, {"id":{"name":"spr_popup_event","path":"sprites/spr_popup_event/spr_popup_event.yy",},}, + {"id":{"name":"spr_ultra_belt","path":"sprites/spr_ultra_belt/spr_ultra_belt.yy",},}, {"id":{"name":"spr_pack_devastator","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},}, {"id":{"name":"spr_weapon_chainfist_small","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},}, {"id":{"name":"spr_popup_event_avatar","path":"sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy",},}, - {"id":{"name":"spr_scout_colors2","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},}, + {"id":{"name":"spr_scout_complex","path":"sprites/spr_scout_complex/spr_scout_complex.yy",},}, {"id":{"name":"obj_timer","path":"objects/obj_timer/obj_timer.yy",},}, {"id":{"name":"spr_popup_select","path":"sprites/spr_popup_select/spr_popup_select.yy",},}, {"id":{"name":"spr_ih_mk7_helm","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},}, {"id":{"name":"spr_company_title","path":"sprites/spr_company_title/spr_company_title.yy",},}, {"id":{"name":"spr_master_title","path":"sprites/spr_master_title/spr_master_title.yy",},}, {"id":{"name":"spr_loc_icon","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},}, + {"id":{"name":"spr_skull_on_chain","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},}, {"id":{"name":"spr_diplo_symbols","path":"sprites/spr_diplo_symbols/spr_diplo_symbols.yy",},}, {"id":{"name":"spr_defeat","path":"sprites/spr_defeat/spr_defeat.yy",},}, + {"id":{"name":"spr_mk7_gladiator_chest","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},}, {"id":{"name":"spr_mk3_right_leg_variants","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},}, {"id":{"name":"spr_rectangle","path":"sprites/spr_rectangle/spr_rectangle.yy",},}, {"id":{"name":"sprite245","path":"sprites/sprite245/sprite245.yy",},}, @@ -696,10 +732,12 @@ {"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_mk7_rope_belt","path":"sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.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_tech_face_plate","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.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_cloak_image_1","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},}, @@ -732,6 +770,7 @@ {"id":{"name":"spr_force_icon","path":"sprites/spr_force_icon/spr_force_icon.yy",},}, {"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_mk6_mongol_chest_variants","path":"sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.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",},}, @@ -747,6 +786,7 @@ {"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_dreadnought_complex","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.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",},}, @@ -757,6 +797,8 @@ {"id":{"name":"spr_ship_bb","path":"sprites/spr_ship_bb/spr_ship_bb.yy",},}, {"id":{"name":"spr_ship_stri","path":"sprites/spr_ship_stri/spr_ship_stri.yy",},}, {"id":{"name":"spr_ship_th","path":"sprites/spr_ship_th/spr_ship_th.yy",},}, + {"id":{"name":"spr_bionic_right_arm","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},}, + {"id":{"name":"spr_terminator_complex_arms_upper_left","path":"sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy",},}, {"id":{"name":"spr_mk3_left_leg_variants","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},}, {"id":{"name":"spr_assault_ram","path":"sprites/spr_assault_ram/spr_assault_ram.yy",},}, {"id":{"name":"spr_technology_icon","path":"sprites/spr_technology_icon/spr_technology_icon.yy",},}, @@ -769,6 +811,7 @@ {"id":{"name":"spr_artificer_left_pad","path":"sprites/spr_artificer_left_pad/spr_artificer_left_pad.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",},}, + {"id":{"name":"spr_mk3_belt","path":"sprites/spr_mk3_belt/spr_mk3_belt.yy",},}, {"id":{"name":"spr_ship_aven","path":"sprites/spr_ship_aven/spr_ship_aven.yy",},}, {"id":{"name":"DiploBasicNodes","path":"scripts/DiploBasicNodes/DiploBasicNodes.yy",},}, {"id":{"name":"spr_ship_black","path":"sprites/spr_ship_black/spr_ship_black.yy",},}, @@ -809,6 +852,7 @@ {"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_mk4_mongol_chest_variants","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.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",},}, @@ -817,6 +861,7 @@ {"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_ultra_right_shoulder_hanging","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},}, {"id":{"name":"spr_ship_custodian","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},}, {"id":{"name":"spr_ship_protector","path":"sprites/spr_ship_protector/spr_ship_protector.yy",},}, {"id":{"name":"spr_ship_emissary","path":"sprites/spr_ship_emissary/spr_ship_emissary.yy",},}, @@ -838,6 +883,7 @@ {"id":{"name":"scr_player_combat_weapon_stacks","path":"scripts/scr_player_combat_weapon_stacks/scr_player_combat_weapon_stacks.yy",},}, {"id":{"name":"spr_bio_fighter","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},}, {"id":{"name":"spr_ship_cairn","path":"sprites/spr_ship_cairn/spr_ship_cairn.yy",},}, + {"id":{"name":"spr_mk4_mongol_hat","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},}, {"id":{"name":"spr_dread_claw","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},}, {"id":{"name":"spr_ship_reaper","path":"sprites/spr_ship_reaper/spr_ship_reaper.yy",},}, {"id":{"name":"spr_ship_shroud","path":"sprites/spr_ship_shroud/spr_ship_shroud.yy",},}, @@ -845,12 +891,14 @@ {"id":{"name":"spr_ship_jackal","path":"sprites/spr_ship_jackal/spr_ship_jackal.yy",},}, {"id":{"name":"spr_ship_dirge","path":"sprites/spr_ship_dirge/spr_ship_dirge.yy",},}, {"id":{"name":"spr_ship_dese","path":"sprites/spr_ship_dese/spr_ship_dese.yy",},}, + {"id":{"name":"spr_skulls_belt","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},}, {"id":{"name":"spr_ship_veng","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},}, {"id":{"name":"spr_ship_daemon","path":"sprites/spr_ship_daemon/spr_ship_daemon.yy",},}, {"id":{"name":"spr_da_backpack","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},}, {"id":{"name":"spr_ship_carnage","path":"sprites/spr_ship_carnage/spr_ship_carnage.yy",},}, {"id":{"name":"spr_ship_icono","path":"sprites/spr_ship_icono/spr_ship_icono.yy",},}, {"id":{"name":"spr_weapon_powspear2","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},}, + {"id":{"name":"spr_backpack_fastening","path":"sprites/spr_backpack_fastening/spr_backpack_fastening.yy",},}, {"id":{"name":"scr_boarding_actions","path":"scripts/scr_boarding_actions/scr_boarding_actions.yy",},}, {"id":{"name":"sprite160","path":"sprites/sprite160/sprite160.yy",},}, {"id":{"name":"sprite158","path":"sprites/sprite158/sprite158.yy",},}, @@ -879,6 +927,7 @@ {"id":{"name":"spr_postbattle_space","path":"sprites/spr_postbattle_space/spr_postbattle_space.yy",},}, {"id":{"name":"spr_hero_skull","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},}, {"id":{"name":"spr_hero","path":"sprites/spr_hero/spr_hero.yy",},}, + {"id":{"name":"spr_lion_belt","path":"sprites/spr_lion_belt/spr_lion_belt.yy",},}, {"id":{"name":"spr_flame","path":"sprites/spr_flame/spr_flame.yy",},}, {"id":{"name":"spr_flame2","path":"sprites/spr_flame2/spr_flame2.yy",},}, {"id":{"name":"spr_tartaros_arms","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},}, @@ -886,6 +935,7 @@ {"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_tartaros_left_trim","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},}, + {"id":{"name":"spr_mk7_prussia_chest","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.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",},}, @@ -913,6 +963,7 @@ {"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_marksmans_honor","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.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",},}, @@ -928,6 +979,7 @@ {"id":{"name":"spr_craftworld","path":"sprites/spr_craftworld/spr_craftworld.yy",},}, {"id":{"name":"spr_fleet_tiny","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},}, {"id":{"name":"spr_pa_arms_ornate","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},}, + {"id":{"name":"spr_mk6_mouth_prussian","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},}, {"id":{"name":"spr_mk6_mouth_variants","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},}, {"id":{"name":"spr_fleet_alert","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},}, {"id":{"name":"spr_cloak_scale","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},}, @@ -951,6 +1003,8 @@ {"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_mk7_knightly_chest","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},}, + {"id":{"name":"spr_mk3_mouth","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},}, {"id":{"name":"spr_mar_fire_body2","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},}, {"id":{"name":"scr_creation_draw_slides","path":"scripts/scr_creation_draw_slides/scr_creation_draw_slides.yy",},}, {"id":{"name":"spr_mar_fire_body3","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},}, @@ -1006,6 +1060,7 @@ {"id":{"name":"pth_assault","path":"paths/pth_assault/pth_assault.yy",},}, {"id":{"name":"path3","path":"paths/path3/path3.yy",},}, {"id":{"name":"pth_speeder","path":"paths/pth_speeder/pth_speeder.yy",},}, + {"id":{"name":"spr_prussian_spike","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},}, {"id":{"name":"pth_speeder2","path":"paths/pth_speeder2/pth_speeder2.yy",},}, {"id":{"name":"spr_special_helm","path":"sprites/spr_special_helm/spr_special_helm.yy",},}, {"id":{"name":"macros","path":"scripts/macros/macros.yy",},}, @@ -1024,8 +1079,10 @@ {"id":{"name":"spr_weapon_grav_pistol","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},}, {"id":{"name":"scr_text_hit","path":"scripts/scr_text_hit/scr_text_hit.yy",},}, {"id":{"name":"spr_shutter_button","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},}, + {"id":{"name":"spr_gear_librarian_term","path":"sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy",},}, {"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":"spr_mk3_forehead_variants","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.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",},}, @@ -1071,12 +1128,15 @@ {"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":"spr_teeth","path":"sprites/spr_teeth/spr_teeth.yy",},}, {"id":{"name":"spr_indomitus_left_eye_bionic","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.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":"spr_bionic_left_arm","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},}, {"id":{"name":"spr_cloak_image_0","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},}, + {"id":{"name":"spr_scout_new","path":"sprites/spr_scout_new/spr_scout_new.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",},}, @@ -1117,6 +1177,7 @@ {"id":{"name":"scr_ui_advisors","path":"scripts/scr_ui_advisors/scr_ui_advisors.yy",},}, {"id":{"name":"spr_bionic_leg_left","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},}, {"id":{"name":"scr_ui_diplomacy","path":"scripts/scr_ui_diplomacy/scr_ui_diplomacy.yy",},}, + {"id":{"name":"spr_gladiator_crest","path":"sprites/spr_gladiator_crest/spr_gladiator_crest.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",},}, @@ -1159,6 +1220,7 @@ {"id":{"name":"scr_star_ownership","path":"scripts/scr_star_ownership/scr_star_ownership.yy",},}, {"id":{"name":"scr_enemy_ai_a","path":"scripts/scr_enemy_ai_a/scr_enemy_ai_a.yy",},}, {"id":{"name":"scr_enemy_ai_b","path":"scripts/scr_enemy_ai_b/scr_enemy_ai_b.yy",},}, + {"id":{"name":"spr_terminator_complex_arm_hidden_left","path":"sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy",},}, {"id":{"name":"spr_bionics_leg","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},}, {"id":{"name":"spr_bionics_eye","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},}, {"id":{"name":"spr_bionics_arm","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},}, @@ -1175,6 +1237,8 @@ {"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",},}, + {"id":{"name":"spr_crux_on_chain","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},}, + {"id":{"name":"spr_indomitus_knightly_robe","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},}, {"id":{"name":"scr_fleet_functions","path":"scripts/scr_fleet_functions/scr_fleet_functions.yy",},}, {"id":{"name":"NameGenerator","path":"scripts/NameGenerator/NameGenerator.yy",},}, {"id":{"name":"scr_random_event","path":"scripts/scr_random_event/scr_random_event.yy",},}, @@ -1192,9 +1256,11 @@ {"id":{"name":"scr_draw_management_unit","path":"scripts/scr_draw_management_unit/scr_draw_management_unit.yy",},}, {"id":{"name":"scr_gov_disp","path":"scripts/scr_gov_disp/scr_gov_disp.yy",},}, {"id":{"name":"scr_trade","path":"scripts/scr_trade/scr_trade.yy",},}, + {"id":{"name":"spr_bionic_right_eyes","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},}, {"id":{"name":"scr_trade_add","path":"scripts/scr_trade_add/scr_trade_add.yy",},}, {"id":{"name":"scr_trade_dep","path":"scripts/scr_trade_dep/scr_trade_dep.yy",},}, {"id":{"name":"scr_unit_equip_functions","path":"scripts/scr_unit_equip_functions/scr_unit_equip_functions.yy",},}, + {"id":{"name":"spr_ultra_tassels","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},}, {"id":{"name":"scr_demand","path":"scripts/scr_demand/scr_demand.yy",},}, {"id":{"name":"spr_if_mk5_helm","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},}, {"id":{"name":"scr_dialogue","path":"scripts/scr_dialogue/scr_dialogue.yy",},}, @@ -1251,6 +1317,7 @@ {"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":"spr_roman_tabbard","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.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",},}, @@ -1272,6 +1339,7 @@ {"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":"spr_mk7_complex_crux_belt","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.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",},}, @@ -1296,7 +1364,9 @@ {"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":"spr_sororitas1","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},}, + {"id":{"name":"spr_tech_belt","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},}, {"id":{"name":"fnt_tiny","path":"fonts/fnt_tiny/fnt_tiny.yy",},}, + {"id":{"name":"spr_mk7_complex_belt","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},}, {"id":{"name":"scr_necron_tombs","path":"scripts/scr_necron_tombs/scr_necron_tombs.yy",},}, {"id":{"name":"fnt_small","path":"fonts/fnt_small/fnt_small.yy",},}, {"id":{"name":"spr_none","path":"sprites/spr_none/spr_none.yy",},}, @@ -1316,6 +1386,7 @@ {"id":{"name":"obj_p_small","path":"objects/obj_p_small/obj_p_small.yy",},}, {"id":{"name":"obj_p_th","path":"objects/obj_p_th/obj_p_th.yy",},}, {"id":{"name":"obj_p_assra","path":"objects/obj_p_assra/obj_p_assra.yy",},}, + {"id":{"name":"spr_dev_pack_complex","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},}, {"id":{"name":"obj_en_ship","path":"objects/obj_en_ship/obj_en_ship.yy",},}, {"id":{"name":"obj_en_capital","path":"objects/obj_en_capital/obj_en_capital.yy",},}, {"id":{"name":"obj_en_cruiser","path":"objects/obj_en_cruiser/obj_en_cruiser.yy",},}, @@ -1330,6 +1401,7 @@ {"id":{"name":"obj_al_in","path":"objects/obj_al_in/obj_al_in.yy",},}, {"id":{"name":"spr_da_mk3","path":"sprites/spr_da_mk3/spr_da_mk3.yy",},}, {"id":{"name":"scr_company_struct","path":"scripts/scr_company_struct/scr_company_struct.yy",},}, + {"id":{"name":"spr_bionic_left_eyes","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},}, {"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",},}, @@ -1358,6 +1430,7 @@ {"id":{"name":"obj_ground_mission","path":"objects/obj_ground_mission/obj_ground_mission.yy",},}, {"id":{"name":"obj_temp5","path":"objects/obj_temp5/obj_temp5.yy",},}, {"id":{"name":"obj_temp6","path":"objects/obj_temp6/obj_temp6.yy",},}, + {"id":{"name":"spr_roman_centurian_crest","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},}, {"id":{"name":"obj_temp7","path":"objects/obj_temp7/obj_temp7.yy",},}, {"id":{"name":"obj_temp8","path":"objects/obj_temp8/obj_temp8.yy",},}, {"id":{"name":"obj_temp_inq","path":"objects/obj_temp_inq/obj_temp_inq.yy",},}, @@ -1368,6 +1441,7 @@ {"id":{"name":"obj_credits","path":"objects/obj_credits/obj_credits.yy",},}, {"id":{"name":"obj_creation","path":"objects/obj_creation/obj_creation.yy",},}, {"id":{"name":"obj_creation_popup","path":"objects/obj_creation_popup/obj_creation_popup.yy",},}, + {"id":{"name":"spr_mk3_chest","path":"sprites/spr_mk3_chest/spr_mk3_chest.yy",},}, {"id":{"name":"obj_main_menu_buttons","path":"objects/obj_main_menu_buttons/obj_main_menu_buttons.yy",},}, {"id":{"name":"obj_new_button","path":"objects/obj_new_button/obj_new_button.yy",},}, {"id":{"name":"obj_managment_panel","path":"objects/obj_managment_panel/obj_managment_panel.yy",},}, @@ -1383,6 +1457,7 @@ {"id":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},}, {"id":{"name":"spr_da_mk4","path":"sprites/spr_da_mk4/spr_da_mk4.yy",},}, {"id":{"name":"obj_p1_bullet","path":"objects/obj_p1_bullet/obj_p1_bullet.yy",},}, + {"id":{"name":"spr_mk3_mouth_prussian","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.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",},}, @@ -1401,6 +1476,7 @@ {"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":"scr_culture_visuals","path":"scripts/scr_culture_visuals/scr_culture_visuals.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",},}, {"id":{"name":"spr_da_term_honor","path":"sprites/spr_da_term_honor/spr_da_term_honor.yy",},}, @@ -1408,6 +1484,7 @@ {"id":{"name":"obj_all_fleet","path":"objects/obj_all_fleet/obj_all_fleet.yy",},}, {"id":{"name":"obj_p_fleet","path":"objects/obj_p_fleet/obj_p_fleet.yy",},}, {"id":{"name":"obj_en_fleet","path":"objects/obj_en_fleet/obj_en_fleet.yy",},}, + {"id":{"name":"spr_knightly_robes","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},}, {"id":{"name":"scr_perils_table","path":"scripts/scr_perils_table/scr_perils_table.yy",},}, {"id":{"name":"obj_fleet_select","path":"objects/obj_fleet_select/obj_fleet_select.yy",},}, {"id":{"name":"spr_data_slate_back","path":"sprites/spr_data_slate_back/spr_data_slate_back.yy",},}, @@ -1438,6 +1515,7 @@ {"id":{"name":"obj_fleet_show","path":"objects/obj_fleet_show/obj_fleet_show.yy",},}, {"id":{"name":"spr_generic_sgt_mk3","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},}, {"id":{"name":"Main_Menu","path":"rooms/Main_Menu/Main_Menu.yy",},}, + {"id":{"name":"spr_mk7_chest_ultra","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},}, {"id":{"name":"scr_population_influence","path":"scripts/scr_population_influence/scr_population_influence.yy",},}, {"id":{"name":"Creation","path":"rooms/Creation/Creation.yy",},}, {"id":{"name":"Game","path":"rooms/Game/Game.yy",},}, @@ -1446,8 +1524,10 @@ {"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",},}, + {"id":{"name":"spr_mk3_mouth_flame_cult","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},}, {"id":{"name":"Defeat","path":"rooms/Defeat/Defeat.yy",},}, {"id":{"name":"combat_testing","path":"rooms/combat_testing/combat_testing.yy",},}, + {"id":{"name":"spr_indomitus_belt","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},}, {"id":{"name":"testing_half","path":"rooms/testing_half/testing_half.yy",},}, {"id":{"name":"Testing_newnew","path":"rooms/Testing_newnew/Testing_newnew.yy",},}, {"id":{"name":"notes","path":"notes/notes/notes.yy",},}, diff --git a/datafiles/main/chapters/1.JSON b/datafiles/main/chapters/1.JSON index 91a2d319bb..630f386e30 100644 --- a/datafiles/main/chapters/1.JSON +++ b/datafiles/main/chapters/1.JSON @@ -56,6 +56,9 @@ "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant //"trim_on": 0 // 0 no, 1 yes for special trim colours // todo update ref for new name }, + "culture_styles" : [ + "Knightly", + ], "names": { //Chapter Staff "hchaplain": "Sapphon", diff --git a/datafiles/main/chapters/10.JSON b/datafiles/main/chapters/10.JSON index d0dad1c471..34a1cd7eff 100644 --- a/datafiles/main/chapters/10.JSON +++ b/datafiles/main/chapters/10.JSON @@ -57,6 +57,10 @@ "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant //"trim_on": 0 // 0 no, 1 yes for special trim colours }, + "culture_styles" : [ + "Knightly", + "Crusader" + ], "names": { //Chapter Staff "hchaplain": "Grimaldus", diff --git a/datafiles/main/chapters/11.JSON b/datafiles/main/chapters/11.JSON index 79baa9fcd8..0d522867ae 100644 --- a/datafiles/main/chapters/11.JSON +++ b/datafiles/main/chapters/11.JSON @@ -56,6 +56,9 @@ "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant //"trim_on": 1 // 0 no, 1 yes for pauldron trim colours. Trim colour will still be used for certain complex livery items }, + "culture_styles" : [ + "Greek", + ], "names": { //Chapter Staff "hchaplain": "Ivanus Enkomi", // Head Chaplain diff --git a/datafiles/main/chapters/2.JSON b/datafiles/main/chapters/2.JSON index 7f803b47d3..989481ab4d 100644 --- a/datafiles/main/chapters/2.JSON +++ b/datafiles/main/chapters/2.JSON @@ -24,6 +24,7 @@ "recruiting_name": "", "discipline": "rune Magick", // one of 'default' 'biomancy' 'pyromancy' 'telekinesis' 'rune Magick' "aspirant_trial": "SURVIVAL", // ? need to find the best way to do this + "advantages": [ //TODO something with these after rework of adv organisation "", "Lightning Warriors", @@ -57,6 +58,9 @@ "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant //"trim_on": 0 // 0 no, 1 yes for special trim colours // todo update ref for new name }, + "culture_styles" : [ + "Mongol", + ], "names": { //Chapter Staff "hchaplain": "Jaghorin", diff --git a/datafiles/main/chapters/7.JSON b/datafiles/main/chapters/7.JSON index 21eb5f8aad..0909daa3cb 100644 --- a/datafiles/main/chapters/7.JSON +++ b/datafiles/main/chapters/7.JSON @@ -58,6 +58,10 @@ "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant //"trim_on": 0 // 0 no, 1 yes for special trim colours }, + "culture_styles" : [ + "Roman", + "Ultra" + ], "names": { //Chapter Staff "hchaplain": "Ortan Cassius", diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_knee/data.json b/datafiles/main/visual_sets/Company_marks_roman_right_knee/data.json new file mode 100644 index 0000000000..e3771f4be0 --- /dev/null +++ b/datafiles/main/visual_sets/Company_marks_roman_right_knee/data.json @@ -0,0 +1,9 @@ +[ + { + "name" : "test_sprite", + "data" : { + "body_types" :[0], + "position" : "head", + }, + } +] \ No newline at end of file diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_knee/one/12.png b/datafiles/main/visual_sets/Company_marks_roman_right_knee/one/12.png new file mode 100644 index 0000000000..6c13d1e5c8 Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_knee/one/12.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_knee/three/32.png b/datafiles/main/visual_sets/Company_marks_roman_right_knee/three/32.png new file mode 100644 index 0000000000..9a93f6eb4c Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_knee/three/32.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_knee/two/22.png b/datafiles/main/visual_sets/Company_marks_roman_right_knee/two/22.png new file mode 100644 index 0000000000..6b74ac9c5f Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_knee/two/22.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/data.json b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/data.json new file mode 100644 index 0000000000..46cdc8347b --- /dev/null +++ b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/data.json @@ -0,0 +1,82 @@ +[ + { + "name" : "one", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [1], + }, + }, + { + "name" : "two", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [2], + }, + }, + { + "name" : "three", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [3], + }, + }, + { + "name" : "four", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [4], + }, + }, + { + "name" : "five", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [5], + }, + }, + { + "name" : "six", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [6], + }, + }, + { + "name" : "seven", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [7], + }, + }, + { + "name" : "eight", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [8], + }, + }, + { + "name" : "nine", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [9], + }, + }, + { + "name" : "ten", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [10], + }, + }, +] \ No newline at end of file diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/eight/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/eight/1.png new file mode 100644 index 0000000000..e8cf235f05 Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/eight/1.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/five/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/five/1.png new file mode 100644 index 0000000000..056e5f1fb1 Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/five/1.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/four/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/four/1.png new file mode 100644 index 0000000000..e001b745f0 Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/four/1.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/nine/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/nine/1.png new file mode 100644 index 0000000000..46039e7e8b Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/nine/1.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/one/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/one/1.png new file mode 100644 index 0000000000..229ee1a784 Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/one/1.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/seven/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/seven/1.png new file mode 100644 index 0000000000..fec653a394 Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/seven/1.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/six/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/six/1.png new file mode 100644 index 0000000000..6fd2e10afc Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/six/1.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/ten/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/ten/1.png new file mode 100644 index 0000000000..8bc13ab079 Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/ten/1.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/three/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/three/1.png new file mode 100644 index 0000000000..dc0da3b49b Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/three/1.png differ diff --git a/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/two/1.png b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/two/1.png new file mode 100644 index 0000000000..dc0da3b49b Binary files /dev/null and b/datafiles/main/visual_sets/Company_marks_roman_right_shoulder/two/1.png differ diff --git a/datafiles/main/visual_sets/Test_set/data.json b/datafiles/main/visual_sets/Test_set/data.json new file mode 100644 index 0000000000..e3771f4be0 --- /dev/null +++ b/datafiles/main/visual_sets/Test_set/data.json @@ -0,0 +1,9 @@ +[ + { + "name" : "test_sprite", + "data" : { + "body_types" :[0], + "position" : "head", + }, + } +] \ No newline at end of file diff --git a/datafiles/main/visual_sets/Test_set/test_sprite/1.png b/datafiles/main/visual_sets/Test_set/test_sprite/1.png new file mode 100755 index 0000000000..1b381017c6 Binary files /dev/null and b/datafiles/main/visual_sets/Test_set/test_sprite/1.png differ diff --git a/datafiles/main/visual_sets/use_sets.json b/datafiles/main/visual_sets/use_sets.json new file mode 100644 index 0000000000..193d856041 --- /dev/null +++ b/datafiles/main/visual_sets/use_sets.json @@ -0,0 +1,3 @@ +[ + "Company_marks_roman_right_shoulder" +] \ No newline at end of file diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index d444ff72ef..f2e6b9dd44 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -539,6 +539,7 @@ command_set[20]=1; command_set[24]=1; modest_livery=0; progenitor_visuals=0; +tagged_training=0; // ** Default menu items ** selecting_planet=0; diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index 3ada0a36ed..ed97e74b2b 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -98,7 +98,7 @@ if (nope!=1){ } global.load=0; - +planet_types = ARR_planet_types; skip=false; premades=true; @@ -219,8 +219,80 @@ buttons = { str1 : "four", font : fnt_40k_14b }, - ], "Home System Planets"), + ], "Home System Planets"), + + culture_styles : new multi_select([ + { + str1 : "Greek", + font : fnt_40k_14b, + }, + { + str1 : "Roman", + font : fnt_40k_14b + }, + { + str1 : "Knightly", + font : fnt_40k_14b + }, + { + str1 : "Gladiator", + font : fnt_40k_14b + }, + { + str1 : "Mongol", + font : fnt_40k_14b + }, + { + str1 : "Feral", + font : fnt_40k_14b + }, + { + str1 : "Flame Cult", + font : fnt_40k_14b + }, + { + str1 : "Mechanical Cult", + font : fnt_40k_14b + }, + { + str1 : "Prussian", + font : fnt_40k_14b + }, + { + str1 : "Ganger (cthonian)", + font : fnt_40k_14b + }, + { + str1 : "Alpha", + font : fnt_40k_14b + }, + { + str1 : "Ultra", + font : fnt_40k_14b + }, + { + str1 : "Renaissance", + font : fnt_40k_14b, + }, + { + str1 : "Blood", + font : fnt_40k_14b, + }, + { + str1 : "Angelic", + font : fnt_40k_14b, + }, + { + str1 : "Crusader", + font : fnt_40k_14b, + }, + { + str1 : "Gothic", + font : fnt_40k_14b, + }, + ], "Chapter Visual Styles") } + with (buttons){ home_spawn_loc_options.current_selection = 1; home_planets.current_selection = 1; diff --git a/objects/obj_event/Step_0.gml b/objects/obj_event/Step_0.gml index 3f0a3347a1..f0146e4b3f 100644 --- a/objects/obj_event/Step_0.gml +++ b/objects/obj_event/Step_0.gml @@ -321,10 +321,10 @@ if (ticked=1){// Select a random marine and have them perform an action if (attend_corrupted[ide]=0){ - if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "Chaos")){ + if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "chaos")){ unit.corruption+=choose(1,2,3,4); } - if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "Daemon")){ + if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "daemonic")){ unit.corruption+=choose(6,7,8,9); } attend_corrupted[ide]=1; diff --git a/objects/obj_mass_equip/Step_0.gml b/objects/obj_mass_equip/Step_0.gml index 852fd11c30..3d1513c3b8 100644 --- a/objects/obj_mass_equip/Step_0.gml +++ b/objects/obj_mass_equip/Step_0.gml @@ -338,7 +338,7 @@ if (refresh=true) and (obj_controller.settings>0){ have_armour_num+=scr_item_count("Power Armour"); have_armour_num+=scr_item_count("MK4 Maximus"); have_armour_num+=scr_item_count("MK5 Heresy"); - have_armour_num+=scr_item_count("MK3 Iron"); + have_armour_num+=scr_item_count("MK3 Iron Armour"); } if (req_armour="Terminator Armour"){ have_armour_num+=scr_item_count("Terminator Armour"); diff --git a/objects/obj_ncombat/Create_0.gml b/objects/obj_ncombat/Create_0.gml index 5a1f29a593..59e9f09100 100644 --- a/objects/obj_ncombat/Create_0.gml +++ b/objects/obj_ncombat/Create_0.gml @@ -15,6 +15,7 @@ if (nope!=1){audio_sound_gain(snd_battle,0.25*obj_controller.master_volume*obj_c //limit on the size of the players forces allowed +enter_pressed = 0 man_size_limit = 0; man_limit_reached = false; man_size_count = 0; diff --git a/objects/obj_ncombat/KeyPress_13.gml b/objects/obj_ncombat/KeyPress_13.gml index 5b81e982d4..a8509f2a54 100644 --- a/objects/obj_ncombat/KeyPress_13.gml +++ b/objects/obj_ncombat/KeyPress_13.gml @@ -15,7 +15,9 @@ if __b__ // 135; // instance_activate_object(obj_cursor); - +if (enemy_forces<=0) { // Combat for whatever reason sometimes bugs out when there are no enemies, so if enter is pressed 6 times at this state it will set started to 2 + enter_pressed++ +} if (started>=2) then instance_activate_object(obj_pnunit); @@ -38,7 +40,7 @@ if (started=3){ -if (turn_count >= 50){ +if (turn_count >= 50 || enter_pressed > 5) { started=2; } if ((started=2) or (started=4)){ diff --git a/objects/obj_p_assra/Step_0.gml b/objects/obj_p_assra/Step_0.gml index 08e5a56b24..fb4d2f6e72 100644 --- a/objects/obj_p_assra/Step_0.gml +++ b/objects/obj_p_assra/Step_0.gml @@ -284,8 +284,8 @@ if (boarding=true) and (board_cooldown>=0) and (instance_exists(target)) and (in // End, do the damage - if (arp=1) then hurt=max(0,attack*dr); - if (arp=0) then hurt=max(0,(attack-ac)*dr); + if (arp=1) then hurt=max(0,attack*(1-dr)); + if (arp=0) then hurt=max(0,(attack-ac)*(1-dr)); repeat(hits){ unit.add_or_sub_health(-hurt); diff --git a/objects/obj_popup/Draw_0.gml b/objects/obj_popup/Draw_0.gml index 7a7b96de18..4a42d71858 100644 --- a/objects/obj_popup/Draw_0.gml +++ b/objects/obj_popup/Draw_0.gml @@ -138,82 +138,106 @@ try { } } - if (artifact_struct.has_tag("MINOR")) { - if (giveto == eFACTION.Imperium) { - obj_controller.disposition[eFACTION.Imperium] += 6; - } - if (giveto == 3) { - obj_controller.disposition[3] += 4; - } - if ((giveto == 4) && (inq_hide != 2)) { - obj_controller.disposition[4] += 4; - } - - if ((giveto == 4) && (inq_hide == 2)) { - obj_controller.disposition[4] += 2; - } - - if ((giveto == 5) && (!is_daemon)) { - obj_controller.disposition[5] += 4; - var o = 0; - if (scr_has_adv("Reverent Guardians")) { - obj_controller.disposition[5] += 2; - } - } - if (giveto == 6) { - obj_controller.disposition[6] += 3; - } - if (giveto == 8) { - obj_controller.disposition[8] += 4; - } - } + if (artifact_struct.has_tag("MINOR")) { + obj_controller.disposition[giveto] = clamp(obj_controller.disposition[giveto] + 1, -100, 100); + } else { + var daemon_arts = function(faction, is_chaos, is_daemon) { + switch (faction) { + case eFACTION.Imperium: + if (is_daemon) { + var v = 0, ev = 0; + for (var v = 1; v < array_length(obj_controller.event); v++) { + if (obj_controller.event[v] == "") { + ev = v; + break; + } + } + obj_controller.event[ev] = "imperium_daemon"; + obj_controller.event_duration[ev] = 1; + with (obj_star) { + for (var i = 1; i <= planets; i++) { + if (p_owner[i] == 2) { + p_heresy[i] += choose(30, 40, 50, 60); + } + } + } + } + if (is_chaos) { + with (obj_star) { + for (var i = 1; i <= planets; i++) { + if ((p_owner[i] == 2) && (p_heresy[i] > 0)) { + p_heresy[i] += 10; + } + } + } + } + break; + case eFACTION.Tau: + if (is_daemon) { + with (obj_star) { + for (var i = 1; i <= planets; i++) { + if (p_owner[i] == 8) { + p_heresy[i] += 40; + } + } + } + } + break; + } + } + + var specialmod = 0 + switch (giveto) { + case eFACTION.Imperium: + break; + case eFACTION.Mechanicus: + break; + case eFACTION.Inquisition: + if (inq_hide == 2) { + specialmod -= 1; + } + + if (is_chaos) { + specialmod += 2; + } + + if (is_daemon) { + specialmod += 4; + } + break; + case eFACTION.Ecclesiarchy: + if (!is_daemon) { + if (scr_has_adv("Reverent Guardians")) { + specialmod += 2; + } + } else { + specialmod -= 2; + } + break; + case eFACTION.Eldar: + if (scr_has_disadv("Tolerant")) { + specialmod += 1; + } + break; + case eFACTION.Tau: + if (scr_has_disadv("Tolerant")) { + specialmod += 1; + } + break; + } + + daemon_arts(giveto, is_chaos, is_daemon) + var tagmod = artifact_struct.artifact_faction_value(giveto); + obj_controller.disposition[giveto] = clamp(obj_controller.disposition[giveto] + 2 + specialmod + tagmod, -100, 100); + } - // Need to modify ^^^^ based on if it is chaos or daemonic + // Need to modify ^^^^ based on if it is chaos or daemonic - if (giveto == 2) { - if (is_daemon) { - var v = 0, ev = 0; - for (var v = 1; v < array_length(obj_controller.event); v++) { - if ((ev == 0) && (obj_controller.event[v] == "")) { - ev = v; - } - } - obj_controller.event[ev] = "imperium_daemon"; - obj_controller.event_duration[ev] = 1; - with (obj_star) { - for (var i = 1; i <= planets; i++) { - if (p_owner[i] == 2) { - p_heresy[i] += choose(30, 40, 50, 60); - } - } - } - } - if (is_chaos) { - with (obj_star) { - for (var i = 1; i <= planets; i++) { - if ((p_owner[i] == 2) && (p_heresy[i] > 0)) { - p_heresy[i] += 10; - } - } - } - } - obj_controller.disposition[2] += 4; - } else if (giveto == 8) { - if (is_daemon) { - with (obj_star) { - for (var i = 1; i <= planets; i++) { - if (p_owner[i] == 8) { - p_heresy[i] += 40; - } - } - } - } - } - delete_artifact(arti_index); - instance_destroy(); - exit; - } - } + delete_artifact(arti_index); + instance_destroy(); + exit; + } + } var zoom = 0; if (instance_exists(obj_controller)) { @@ -932,7 +956,7 @@ try { } unit = obj_ini.TTRPG[target_comp][obj_controller.ide[i]]; - if (arti.has_tag("Daemonic") || arti.has_tag("Chaos")) { + if (arti.has_tag("daemonic") || arti.has_tag("chaos")) { unit.corruption += irandom(10 + 2); if (unit.role() == "Chapter Master") { dwarn = true; diff --git a/objects/obj_popup/Step_0.gml b/objects/obj_popup/Step_0.gml index 14ee0a6238..44ef89d03f 100644 --- a/objects/obj_popup/Step_0.gml +++ b/objects/obj_popup/Step_0.gml @@ -403,10 +403,10 @@ try { repeat (700) { ide += 1; if ((attend_corrupted[ide] == 0) && (attend_id[ide] > 0)) { - if (string_count("Chaos", obj_ini.artifact_tags[obj_controller.fest_display]) > 0) { + if (string_count("chaos", obj_ini.artifact_tags[obj_controller.fest_display]) > 0) { obj_ini.TTRPG[attend_co[ide], attend_id[ide]].corruption += choose(1, 2, 3, 4); } - if (string_count("Daem", obj_ini.artifact_tags[obj_controller.fest_display]) > 0) { + if (string_count("daemonic", obj_ini.artifact_tags[obj_controller.fest_display]) > 0) { obj_ini.TTRPG[attend_co[ide], attend_id[ide]].corruption += choose(6, 7, 8, 9); } attend_corrupted[ide] = 1; diff --git a/scripts/JsonFileListLoader/JsonFileListLoader.gml b/scripts/JsonFileListLoader/JsonFileListLoader.gml index b2c66340f7..4207c24d64 100644 --- a/scripts/JsonFileListLoader/JsonFileListLoader.gml +++ b/scripts/JsonFileListLoader/JsonFileListLoader.gml @@ -19,7 +19,7 @@ function JsonFileListLoader() constructor { try { var item_total = 0; var file_path = working_directory + relative_file_path; - if(file_exists(file_path) == false){ + if (file_exists(file_path) == false){ log_error($"File does not exist at path {file_path}"); return result; } diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 3a52489ecc..65e1a7a67d 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -1,24 +1,675 @@ +function scr_has_style(style){ + var result = false; + if (!is_array(style)){ + try { + var result; + if (instance_exists(obj_creation)) { + result = array_contains(obj_creation.buttons.culture_styles.selections(), style); + } else { + result = array_contains(obj_ini.culture_styles, style); + } + } catch (_exception){ + handle_exception(_exception); + result = false; + } + } else { + for (var i=0;i-1){ + array_delete(exceptions, array_position, 1); + if (array_length(exceptions)){ + return true; + } else { + return false; + } + } else { + return false; + } } else { - sprite_merge(self[$ area], add_sprite); + return false; + } + } + + static assign_modulars = function(){ + var modulars = global.modular_drawing_items; + var _mod = {}; + + + try{ + for (var i=0; i=_mod.max_saturation){ + if (!check_exception("max_saturation")){ + continue; + } + } + } + } + if (struct_exists(_mod, "body_types")){ + if (!array_contains(_mod.body_types, armour_type)){ + if (!check_exception("body_types")){ + continue; + } + } + } + if (struct_exists(_mod, "role_type")){ + var _viable = false; + for (var a=0;achoice){ + var _override_areas = struct_get_names(_spec_over[2]); + for (var j = 0;j = array_length(positions)) then continue; + if ((_torso_purity_seals[i]+_exp)>100){ + draw_sprite(purity_seals,_torso_purity_seals[i] ,_x_offset+positions[i][0], _y_offset+positions[i][1]); + } + } + } + if (struct_exists(_body[$ "left_arm"],"purity_seal")){ + var _arm_seals = _body[$ "left_arm"][$"purity_seal"]; + if (armour_type==ArmourType.Normal){ + var positions = [[135, 69], [121, 73]]; + } + else { + var positions = [[163, 92], [148, 94], [126, 84]]; + } + for (var i=0;i= array_length(positions)) then continue; + if ((_arm_seals[i]+_exp)>100){ + draw_sprite(purity_seals,_arm_seals[i] ,_x_offset+positions[i][0], _y_offset+positions[i][1]); + } + } + } + if (struct_exists(_body[$ "right_arm"],"purity_seal")){ + var _arm_seals = _body[$ "right_arm"][$"purity_seal"]; + if (armour_type==ArmourType.Normal){ + var positions = [[44, 76], [30,71], [16, 69]]; + } + else { + var positions = [[11, 91], [39, 90], [66, 86]]; + } + for (var i=0;i= array_length(positions)) then continue; + if ((_arm_seals[i]+_exp)>100){ + draw_sprite(purity_seals,_arm_seals[i] ,_x_offset+positions[i][0], _y_offset+positions[i][1]); + } + } + } + } + } + static base_armour = function(){ + armour_type = ArmourType.Normal + switch (unit.armour()){ + case "MK7 Aquila": + case "Artificer Armour": + add_group(mk7_bits); + armour_type = ArmourType.Normal + break; + case "MK6 Corvus": + add_group({ + armour: spr_mk6_complex, + backpack: spr_mk6_complex_backpack, + left_arm: spr_mk6_left_arm, + right_arm: spr_mk6_right_arm, + left_trim :spr_mk7_left_trim, + right_trim: spr_mk7_right_trim, + mouth_variants : spr_mk6_mouth_variants, + head : spr_mk6_head_variants, + }); + armour_type = ArmourType.Normal + break; + case "MK5 Heresy": + add_group({ + armour: spr_mk5_complex, + backpack: spr_mk5_complex_backpack, + left_arm: spr_mk5_left_arm, + right_arm: spr_mk5_right_arm, + left_trim :spr_mk7_left_trim, + right_trim: spr_mk7_right_trim, + head : spr_mk5_head_variants, + }); + armour_type = ArmourType.Normal + /*if (scr_has_style("Prussian")){ + add_to_area("chest_variants", spr_mk7_prussia_chest); + }*/ + break; + case "MK4 Maximus": + add_group({ + chest_variants: spr_mk4_chest_variants, + armour: spr_mk4_complex, + backpack: spr_mk4_complex_backpack, + left_arm :spr_mk4_left_arm, + leg_variants: spr_mk4_leg_variants, + right_arm: spr_mk4_right_arm, + left_trim: spr_mk4_left_trim, + right_trim: spr_mk4_right_trim, + mouth_variants: spr_mk4_mouth_variants, + head : spr_mk4_head_variants, + }); + armour_type = ArmourType.Normal + break; + case "MK3 Iron Armour": + add_group({ + armour : spr_mk3_complex, + backpack : spr_mk3_complex_backpack, + left_arm : spr_mk3_left_arm, + right_arm : spr_mk3_right_arm , + head : spr_mk3_head_variants, + left_leg : spr_mk3_left_leg_variants, + right_leg : spr_mk3_right_leg_variants, + mouth_variants: spr_mk3_mouth, + forehead : spr_mk3_forehead_variants, + belt : spr_mk3_belt, + chest_variants : spr_mk3_chest, + }); + armour_type = ArmourType.Normal + break; + case "MK8 Errant": + add_group(mk7_bits); + add_to_area("gorget",spr_mk8_gorget); + armour_type = ArmourType.Normal; + break; + case "Terminator Armour": + add_group({ + armour : spr_indomitus_complex, + left_arm : spr_indomitus_left_arm, + right_arm : spr_indomitus_right_arm, + backpack : spr_indomitus_backpack_variants, + chest_variants : spr_indomitus_chest_variants, + leg_variants : spr_indomitus_leg_variants, + head : spr_indomitus_head_variants, + belt : spr_indomitus_belt + }); + armour_type = ArmourType.Terminator; + break; + case "Tartaros": + + add_group({ + armour : spr_tartaros_complex, + left_arm : spr_tartaros_left_arm, + right_arm : spr_tartaros_right_arm, + right_leg : spr_tartaros_right_leg, + left_leg : spr_tartaros_left_leg, + chest_variants : spr_tartaros_chest, + gorget : spr_tartaros_gorget, + mouth_variants : spr_tartaros_faceplate, + head : spr_tartaros_head_variants, + left_trim : spr_tartaros_left_trim, + right_trim : spr_tartaros_right_trim, + + }); + armour_type = ArmourType.Terminator; + break; + case "Dreadnought": + add_group({ + armour : spr_dreadnought_complex, + }) + armour_type = ArmourType.Dreadnought; + break; + case "Scout Armour": + add_group({ + armour : spr_scout_complex, + left_arm: spr_mk6_left_arm, + right_arm: spr_mk6_right_arm, + }) + armour_type = ArmourType.Scout; + break + default: + add_group(mk7_bits); + break; + + } + var type = unit.get_body_data("type","cloak"); + if (type != "none") { + static _cloaks = { + "scale":spr_cloak_scale, + "pelt":spr_cloak_fur, + "cloth":spr_cloak_cloth, + } + if (struct_exists(_cloaks, type)){ + add_to_area("cloak",_cloaks[$ type]); + add_to_area("cloak_image",spr_cloak_image_1); + add_to_area("cloak_trim",spr_cloak_image_0); + } + + } + assign_modulars(); + } + + if (unit.IsSpecialist("forge")){ + if array_contains(["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour"], unit.armour()){ + if (unit.has_trait("tinkerer")){ + add_group({ + "armour":spr_techmarine_complex, + "right_trim":spr_techmarine_right_trim, + "left_trim":spr_techmarine_left_trim, + "leg_variants":spr_techmarine_left_leg, + "leg_variants":spr_techmarine_right_leg, + "head":spr_techmarine_head, + "chest_variants":spr_techmarine_chest, + "mouth_variants" : spr_tech_face_plate + }) + } + } + + } + static draw_cloaks = function(){ + var _shader_set_multiply_blend = function(_r, _g, _b) { + shader_set(shd_multiply_blend); + shader_set_uniform_f(shader_get_uniform(shd_multiply_blend, "u_Color"), _r, _g, _b); + }; + _shader_set_multiply_blend(127, 107, 89); + draw_component("cloak"); + + _shader_set_multiply_blend(obj_controller.trim_colour_replace[0]*255, obj_controller.trim_colour_replace[1]*255, obj_controller.trim_colour_replace[2]*255); + draw_component("cloak_image"); + draw_component("cloak_trim"); + + shader_reset(); + shader_set(full_livery_shader); + } + + static add_to_area = function(area, add_sprite, overide_data = "none"){ + if (sprite_exists(add_sprite)){ + var _add_sprite_length = sprite_get_number(add_sprite); + if (!struct_exists(self, area)){ + self[$ area] = sprite_duplicate(add_sprite); + var _overide_start = 0; + } else { + var _overide_start = sprite_get_number(self[$ area]); + sprite_merge(self[$ area], add_sprite) + } + if (overide_data != "none"){ + add_overide(area, _overide_start, _add_sprite_length,overide_data) + } + } + } + + static add_overide = function(area,_overide_start, sprite_length, overide_data){ + if (!struct_exists(overides, area)){ + overides[$ area] = []; } + array_push(overides[$ area], [_overide_start, _overide_start+sprite_length, overide_data]); } - static replace_area = function(area, add_sprite){ + static replace_area = function(area, add_sprite, overide_data = "none"){ if (struct_exists(self, area)){ sprite_delete(self[$area]); + if (struct_exists(overides, area)){ + struct_remove(overides,area); + } } self[$ area] = sprite_duplicate(add_sprite); + if (overide_data != "none"){ + add_overide(area, 0, sprite_get_number(self[$ area]),overide_data) + } } static remove_area = function(area){ if (struct_exists(self, area)){ sprite_delete(self[$area]); struct_remove(self, area); + if (struct_exists(overides, area)){ + struct_remove(overides,area); + } } } @@ -30,15 +681,15 @@ function ComplexSet() constructor{ } } - static add_relative_to_status = function(area, add_sprite, status_level, variant, unit){ + static add_relative_to_status = function(area, add_sprite, status_level, overide_data="none"){ var _roles = obj_ini.role[100]; var tiers = [ ["Chapter Master"], ["Forge Master", "Master of Sanctity","Master of the Apothecarion",string("Chief {0}",_roles[eROLE.Librarian])], - [_roles[eROLE.Captain]], - [_roles[eROLE.HonourGuard]], - [_roles[eROLE.Ancient], _roles[eROLE.Champion]], - [_roles[eROLE.VeteranSergeant], _roles[eROLE.Terminator]], + [_roles[eROLE.Captain], _roles[eROLE.HonourGuard]], + [_roles[eROLE.Champion]], + [_roles[eROLE.Ancient],_roles[eROLE.VeteranSergeant]], + [ _roles[eROLE.Terminator]], [_roles[eROLE.Veteran], _roles[eROLE.Sergeant],_roles[eROLE.Chaplain],_roles[eROLE.Apothecary],_roles[eROLE.Techmarine],_roles[eROLE.Librarian]], ["Codiciery", "Lexicanum",_roles[eROLE.Tactical],_roles[eROLE.Assault],_roles[eROLE.Devastator]], [_roles[eROLE.Scout],] @@ -54,80 +705,33 @@ function ComplexSet() constructor{ } } if (_unit_tier<=status_level){ - add_to_area(area, add_sprite); + add_to_area(area, add_sprite, overide_data); } else { var variation_tier = (_unit_tier - status_level)+1; - if (variant%variation_tier == 0){ - add_to_area(area, add_sprite); + if (variation_map[$ area] % variation_tier == 0){ + add_to_area(area, add_sprite, overide_data); } } } - static draw_cloaks = function(unit,x_offset,y_offset){ - var type = unit.get_body_data("type","cloak"); - if (type != "none") { - var _cloaks = { - "scale":spr_cloak_scale, - "pelt":spr_cloak_fur, - "cloth":spr_cloak_cloth, - } - if (struct_exists(_cloaks, type)){ - var _draw_sprite = _cloaks[$ type]; - var _shader_set_multiply_blend = function(_r, _g, _b) { - shader_set(shd_multiply_blend); - shader_set_uniform_f(shader_get_uniform(shd_multiply_blend, "u_Color"), _r, _g, _b); - }; - _shader_set_multiply_blend(127, 107, 89); - var choice = unit.get_body_data("variant","cloak")%sprite_get_number(_draw_sprite); - draw_sprite(_draw_sprite,choice,x_offset,y_offset); - if (_draw_sprite == spr_cloak_cloth) { - _shader_set_multiply_blend(obj_controller.trim_colour_replace[0]*255, obj_controller.trim_colour_replace[1]*255, obj_controller.trim_colour_replace[2]*255); - var choice = unit.get_body_data("image_0","cloak")%sprite_get_number(spr_cloak_image_0); - draw_sprite(spr_cloak_image_0,choice,x_offset,y_offset); - var choice = unit.get_body_data("image_1","cloak")%sprite_get_number(spr_cloak_image_1); - draw_sprite(spr_cloak_image_1,choice,x_offset,y_offset); - } - shader_reset(); - } - - } - shader_set(full_livery_shader); - } + position_overides = { + + }; - static draw_head = function(unit, x_surface_offset,y_surface_offset){ + static draw_head = function(unit){ var choice; if (struct_exists(self, "head")){ - if (struct_exists(self, "crest")){ - choice = unit.get_body_data("crest_variation","head")%sprite_get_number(crest); - draw_sprite(self.crest,choice,x_surface_offset,y_surface_offset); - } - var choice = unit.get_body_data("variation","head")%sprite_get_number(head); - draw_sprite(head,choice,x_surface_offset,y_surface_offset); - - if (struct_exists(self, "forehead")){ - choice = unit.get_body_data("forehead_variation","head")%sprite_get_number(forehead); - draw_sprite(forehead,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(self, "mouth_variants")){ - choice = unit.get_body_data("variant","jaw")%sprite_get_number(mouth_variants); - draw_sprite(mouth_variants,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(self, "left_eye")){ - choice = unit.get_body_data("variant","left_eye")%sprite_get_number(left_eye); - draw_sprite(left_eye,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(self, "right_eye")){ - choice = unit.get_body_data("variant","right_eye")%sprite_get_number(right_eye); - draw_sprite(right_eye,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(self, "crown")){ - var choice = unit.get_body_data("crown_variation","head")%sprite_get_number(crown); - draw_sprite(crown,choice,x_surface_offset,y_surface_offset); - } + draw_component("crest"); + draw_component("head"); + draw_component("forehead"); + draw_component("mouth_variants"); + draw_component("left_eye"); + draw_component("right_eye"); + draw_component("crown"); } } - static complex_helms = function(data,unit){ + static complex_helms = function(data){ set_complex_shader_area(["eye_lense"], data.helm_lens); if (data.helm_pattern == 0){ set_complex_shader_area(["left_head", "right_head","left_muzzle", "right_muzzle"], data.helm_secondary); @@ -142,12 +746,20 @@ function ComplexSet() constructor{ var _decoration_surface = surface_create(_surface_width, 60); shader_reset(); surface_set_target(_head_surface); - draw_head(unit, 0, 0); + var _temp = [x_surface_offset, y_surface_offset]; + x_surface_offset = 0; + y_surface_offset = 0; + draw_head(unit); surface_reset_target(); + x_surface_offset = _temp[0]; + y_surface_offset = _temp[1]; remove_area("mouth_variants"); remove_area("crest"); remove_area("forehead"); + remove_area("left_eye"); + remove_area("right_eye"); + remove_area("crown"); shader_set(helm_shader); surface_set_target(_decoration_surface); @@ -171,121 +783,10 @@ function ComplexSet() constructor{ set_complex_shader_area(["left_head", "right_head","left_muzzle", "right_muzzle"], data.helm_primary); } } + base_armour(); } -function get_complex_set(set = eARMOUR_SET.MK7){ - var set_pieces = new ComplexSet(); - - if (!array_contains([eARMOUR_SET.Indomitus, eARMOUR_SET.Tartaros], set)) { - set_pieces.add_group({ - right_pauldron : spr_gothic_numbers_right_pauldron, - left_knee : spr_numeral_left_knee - }) - } - - if (set == eARMOUR_SET.MK7){ - set_pieces.add_group({ - armour : spr_mk7_complex, - left_arm : spr_mk7_left_arm, - right_arm : spr_mk7_right_arm, - left_trim : spr_mk7_left_trim, - right_trim : spr_mk7_right_trim, - mouth_variants : spr_mk7_mouth_variants, - thorax_variants : spr_mk7_thorax_variants, - chest_variants : spr_mk7_chest_variants, - leg_variants : spr_mk7_leg_variants, - backpack : spr_mk7_complex_backpack, - head : spr_mk7_head_variants, - }); - }else if (set == eARMOUR_SET.MK6){ - set_pieces.add_group({ - armour: spr_mk6_complex, - backpack: spr_mk6_complex_backpack, - left_arm: spr_mk6_left_arm, - right_arm: spr_mk6_right_arm, - left_trim :spr_mk7_left_trim, - right_trim: spr_mk7_right_trim, - mouth_variants : spr_mk6_mouth_variants, - head : spr_mk6_head_variants, - }); - }else if (set == eARMOUR_SET.MK5){ - set_pieces.add_group({ - armour: spr_mk5_complex, - backpack: spr_mk5_complex_backpack, - left_arm: spr_mk5_left_arm, - right_arm: spr_mk5_right_arm, - left_trim :spr_mk7_left_trim, - right_trim: spr_mk7_right_trim, - head : spr_mk5_head_variants, - }); - }else if (set == eARMOUR_SET.MK4){ - set_pieces.add_group({ - chest_variants: spr_mk4_chest_variants, - armour: spr_mk4_complex, - backpack: spr_mk4_complex_backpack, - left_arm :spr_mk4_left_arm, - leg_variants: spr_mk4_leg_variants, - right_arm: spr_mk4_right_arm, - left_trim: spr_mk4_left_trim, - right_trim: spr_mk4_right_trim, - mouth_variants: spr_mk4_mouth_variants, - head : spr_mk4_head_variants, - }); - }else if (set == eARMOUR_SET.MK3){ - set_pieces.add_group({ - armour : spr_mk3_complex, - backpack : spr_mk3_complex_backpack, - left_arm : spr_mk3_left_arm, - right_arm : spr_mk3_right_arm , - head : spr_mk3_head_variants, - left_leg : spr_mk3_left_leg_variants, - right_leg : spr_mk3_right_leg_variants - }); - }else if (set == eARMOUR_SET.MK8){ - set_pieces.add_group({ - armour : spr_mk7_complex, - backpack : spr_mk7_complex_backpack, - left_arm : spr_mk7_left_arm, - right_arm : spr_mk7_right_arm, - left_trim : spr_mk7_left_trim, - right_trim : spr_mk7_right_trim, - mouth_variants : spr_mk7_mouth_variants, - thorax_variants : spr_mk7_thorax_variants, - chest_variants : spr_mk7_chest_variants, - leg_variants : spr_mk7_leg_variants, - gorget : spr_mk8_gorget, - head : spr_mk7_head_variants, - }); - }else if (set == eARMOUR_SET.Indomitus){ - set_pieces.add_group({ - armour : spr_indomitus_complex, - left_arm : spr_indomitus_left_arm, - right_arm : spr_indomitus_right_arm, - backpack : spr_indomitus_backpack_variants, - chest_variants : spr_indomitus_chest_variants, - leg_variants : spr_indomitus_leg_variants, - head : spr_indomitus_head_variants - }); - }else if (set == eARMOUR_SET.Tartaros){ - set_pieces.add_group({ - armour : spr_tartaros_complex, - left_arm : spr_tartaros_left_arm, - right_arm : spr_tartaros_right_arm, - right_leg : spr_tartaros_right_leg, - left_leg : spr_tartaros_left_leg, - chest_variants : spr_tartaros_chest, - gorget : spr_tartaros_gorget, - mouth_variants : spr_tartaros_faceplate, - head : spr_tartaros_head_variants, - left_trim : spr_tartaros_left_trim, - right_trim : spr_tartaros_right_trim, - - }); - } - - return set_pieces; -} /// blend_mode_custom(source_surface, destination_surface) @@ -369,4 +870,5 @@ function blend_mode_custom(source_surface, destination_surface, allowed_cross_co // Reset the target surface_reset_target(); -} \ No newline at end of file +} + diff --git a/scripts/scr_add_artifact/scr_add_artifact.gml b/scripts/scr_add_artifact/scr_add_artifact.gml index 20c3b22a68..f65e77270a 100644 --- a/scripts/scr_add_artifact/scr_add_artifact.gml +++ b/scripts/scr_add_artifact/scr_add_artifact.gml @@ -292,6 +292,36 @@ function ArtifactStruct(Index) constructor{ } + static artifact_faction_value = function(faction) { + #macro ART_PLAYER [] + #macro ART_IMPERIUM ["PUR", "ADAMANTINE", "GLOW", "CHB", "UFL", "UBOLT", "DUB"] + #macro ART_MECHANICUS ["PUR", "RO", "CRU"] + #macro ART_INQUISITION ["PUR"] + #macro ART_ECCLESIARCHY ["PUR", "ART", "GOLD"] + #macro ART_ELDAR ["SUP", "ART", "JAD", "SILENT", "SCOPE"] + #macro ART_ORK [] + #macro ART_TAU ["SUP", "ART", "BIG", "SOO", "SCOPE"] + #macro ART_TYRANIDS [] // Tyranids, Genestealers + #macro ART_CHAOS [] // Chaos, Heretics + #macro ART_NECRONS [] + + if (faction < 0 || faction >= array_length(faction_preferences)) { + // Logging or fallback + log_warning("Warning: Faction index out of range. Defaulting to empty preferences."); + return 0; + } + + var returnvalue = 0; + var faction_preferences = [[], ART_PLAYER, ART_IMPERIUM, ART_MECHANICUS, ART_INQUISITION, ART_ECCLESIARCHY, ART_ELDAR, ART_ORK, ART_TAU, ART_TYRANIDS, ART_CHAOS, ART_CHAOS, ART_TYRANIDS, ART_NECRONS]; + var like_tags_array = faction_preferences[faction]; + for (var i = 0; iincrements){ + if (mouse_check_button(mb_left)){ + dragging = true + } + } + } + if (dragging){ + if (_mouse_pos[0]>(_rect[2])){ + value = value_limits[1]; + } else if (_mouse_pos[0]<(_rect[0])){ + value = value_limits[0]; + } else { + var mouse_rel = _mouse_pos[0] - x1; + var increment_count = (mouse_rel/width_increments); + value = value_limits[0] + (increment_count * value_increments); + } + } + } +} function TextBarArea(XX,YY,Max_width = 400) constructor{ allow_input=false; xx=XX; @@ -244,6 +294,85 @@ function drop_down(selection, draw_x, draw_y, options,open_marker){ return [selection,open_marker]; } +function multi_select(options_array, title)constructor{ + self.title = title; + x_gap = 10; + y_gap = 5; + x1 = 0; + y1 = 0; + x2 = 0; + y2 = 0; + + active_col = #009500; + innactive_col = c_gray; + max_width = 0; + max_height = 0; + toggles = []; + for (var i=0;ix2 ? _prev_x:x2; + y2 = _prev_y + _cur_opt.height; + if (max_width>0){ + if (_prev_x - x1 > max_width){ + _prev_x = x1; + _prev_y += _cur_opt.height+y_gap; + items_on_row = 0; + } + } + } + } + static set = function(set_array){ + for (var s=0;s 0) { + _new_val = list[0]; + } + return _new_val; +} + + + diff --git a/scripts/scr_chapter_new/scr_chapter_new.gml b/scripts/scr_chapter_new/scr_chapter_new.gml index 2941c19837..7bbc4af6d8 100644 --- a/scripts/scr_chapter_new/scr_chapter_new.gml +++ b/scripts/scr_chapter_new/scr_chapter_new.gml @@ -27,6 +27,7 @@ function ChapterData() constructor { home_spawn_loc = 1; recruit_home_relationship = 1; home_warp = 1; + culture_styles = []; home_planets = 1; flagship_name = global.name_generator.generate_imperial_ship_name(); @@ -322,6 +323,7 @@ function scr_chapter_new(argument0) { obj_creation.adv = chapter_object.advantages; obj_creation.dis = chapter_object.disadvantages; + obj_creation.buttons.culture_styles.set(chapter_object.culture_styles); obj_creation.full_liveries = chapter_object.full_liveries; obj_creation.complex_livery_data = chapter_object.complex_livery_data; if (obj_creation.full_liveries!=""){ diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml index 2f36f8e3d6..bd9f8a63c4 100644 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml @@ -268,8 +268,9 @@ function ColourItem(xx,yy) constructor{ } -function setup_complex_livery_shader(setup_role, game_setup=false){ +function setup_complex_livery_shader(setup_role, game_setup=false, unit = "none"){ shader_reset(); + shader_set(full_livery_shader); var _full_liveries = obj_ini.full_liveries; var _roles = obj_ini.role[100]; var data_set = obj_ini.full_liveries[0]; @@ -291,9 +292,33 @@ function setup_complex_livery_shader(setup_role, game_setup=false){ } } } - // show_debug_message(data_set); - shader_set(full_livery_shader); var spot_names = struct_get_names(data_set); + var cloth_col = [201.0/255.0, 178.0/255.0, 147.0/255.0]; + if (unit != "none"){ + var cloth_variation=unit.body.torso.cloth.variation; + + + if (cloth_variation>10){ + var _distinct_colours = []; + for (var i=0;i1 && _recruit_world_type>0){ draw_sprite_stretched(spr_creation_arrow,0,1265,285,32,32); draw_sprite_stretched(spr_creation_arrow,1,1455,285,32,32); - var planet_types = ARR_planet_types; - var planet_change_allow = (mouse_left>=1) and (cooldown<=0) and (custom>1); - for (var i=0;i1){ draw_sprite_stretched(spr_creation_arrow,0,525,285,32,32); draw_sprite_stretched(spr_creation_arrow,1,725,285,32,32); - } - var planet_types = ["Dead","Ice", "Temperate","Feudal","Shrine","Agri","Death","Hive","Forge","Desert","Lava"]; - var planet_change_allow = (mouse_left>=1) and (cooldown<=0) and (custom>1); - for (var i=0;i1){ if (text_selected="flagship_name") and (text_bar>30) then draw_text_transformed(644,398,flagship_name,0.5,0.5,0); if (text_selected="flagship_name") and (text_bar<=30) then draw_text_transformed(644,398,flagship_name+"|",0.5,0.5,0); diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml new file mode 100644 index 0000000000..cb9e0151e3 --- /dev/null +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -0,0 +1,471 @@ +function load_visual_sets(){ + var _vis_set_directory = working_directory + "\\main\\visual_sets"; + if (directory_exists(_vis_set_directory)){ + + var _file_buffer = buffer_load($"{_vis_set_directory}\\use_sets.json"); + if (_file_buffer == -1) { + throw ("Could not open file"); + } + var _json_string = buffer_read(_file_buffer, buffer_string); + buffer_delete(_file_buffer); + var _raw_data = json_parse(_json_string); + if (!is_array(_raw_data)){ + throw ("use_sets.json File Wrong Format"); + } + for (var i=0;i= 2) { - _bionic_spr_index = sprite_get_number(_bionic_spr) - 1; - } - draw_sprite_flipped(_bionic_spr, _bionic_spr_index, _x_surface_offset, _y_surface_offset); - } else { - draw_sprite(_bionic_spr, _bionic_spr_index, _x_surface_offset, _y_surface_offset); - } - } else if (arm_variant[_right_left] > 0) { - shader_set(full_livery_shader); - if ((_right_left == 1) && struct_exists(_complex_set, "right_arm") && (arm_variant[_right_left] == 1)) { - draw_sprite(_complex_set.right_arm, 0, _x_surface_offset, _y_surface_offset); - shader_set(sReplaceColor); - } else if ((_right_left == 2) && struct_exists(_complex_set, "left_arm") && (arm_variant[_right_left] == 1)) { - shader_set(full_livery_shader); - draw_sprite(_complex_set.left_arm, 0, _x_surface_offset, _y_surface_offset); - shader_set(sReplaceColor); - } else { - shader_set(sReplaceColor); - var _spr_index = (arm_variant[_right_left] - 1) * 2; - if (_right_left == 2) { - _spr_index += (_specialist_colours >= 2) ? 1 : 0; - draw_sprite_flipped(_arm_spr, _spr_index, _x_surface_offset, _y_surface_offset); - } else { - draw_sprite(_arm_spr, _spr_index, _x_surface_offset, _y_surface_offset); - } - } - } - } - } - shader_set(full_livery_shader); - }; + var _role = obj_ini.role[100]; var complex_set={}; @@ -362,6 +299,7 @@ function scr_draw_unit_image(_background=false){ var tech_brothers_trait = -5; var body_part; var dev_trait = 0; + static _body_parts = ARR_body_parts; // if (unit_role=="Chapter Master"){unit_specialization=111;} // // Honour Guard @@ -427,13 +365,7 @@ function scr_draw_unit_image(_background=false){ // if (_armour_type!=ArType.Norm) then draw_backpack=false; - if (unit_back=="Jump Pack"){ - draw_backpack=false; - back_equipment=BackType.Jump; - }else if (unit_back=="Heavy Weapons Pack"){ - draw_backpack=false; - back_equipment=BackType.Dev; - } else if (unit_back="Servo-arm"){ + if (unit_back="Servo-arm"){ servo_arm=1; } else if (unit_back="Servo-harness"){ servo_harness=1; @@ -461,7 +393,7 @@ function scr_draw_unit_image(_background=false){ break; } - if (armour_type!=ArmourType.Normal) then draw_backpack=false; + draw_backpack = armour_type==ArmourType.Normal; if (armour_type!=ArmourType.Dreadnought && armour_type!=ArmourType.None){ if (weapon_one()!=""){ @@ -480,110 +412,15 @@ function scr_draw_unit_image(_background=false){ //TODO make some sort of reusable structure to handle this sort of colour logic // also not ideal way of creating colour variation but it's a first pass - var cloth_variation=body.torso.cloth.variation; - var cloth_col = [201.0/255.0, 178.0/255.0, 147.0/255.0]; - if (unit_chapter != "Dark Angels"){ - with (obj_controller){ - if (cloth_variation < 2){ - cloth_col = body_colour_replace; - } else if (cloth_variation < 4){ - cloth_col = secondary_colour_replace; - } else if (cloth_variation < 6){ - cloth_col = pauldron_colour_replace; - } else if (cloth_variation < 8){ - cloth_col = trim_colour_replace; - }else if (cloth_variation < 10){ - cloth_col = pauldron2_colour_replace; - }else if (cloth_variation < 12){ - cloth_col = weapon_colour_replace; - } - } - } - with (obj_controller){ - shader_set_uniform_f_array(shader_get_uniform(sReplaceColor, "robes_colour_replace"), cloth_col); - } - // Special specialist stuff here - /* - unit_specialization=0; - if (unit_role=obj_ini.role[100,14]) then unit_specialization == UnitSpecialization.Chaplain;// Chaplain - if (unit_role=obj_ini.role[100,15]) then unit_specialization == UnitSpecialization.Apothecary;// Apothecary - if (unit_role=obj_ini.role[100,15]) and ((unit_chapter="Blood Angels" || obj_ini.progenitor==PROGENITOR.BLOOD_ANGELS)) then unit_specialization=4;// Sanguinary - if (unit_role=obj_ini.role[100,16]) then unit_specialization == UnitSpecialization.Techmarine;// Techmarine - if (unit_role=obj_ini.role[100,17]) then unit_specialization == UnitSpecialization.Librarian;// Librarian - */ var shader_array_set = array_create(8, -1); pauldron_trim=obj_controller.trim; specialist_colours=obj_ini.col_special; - - // Chaplain - if (array_contains([UnitSpecialization.Chaplain, UnitSpecialization.WolfPriest], unit_specialization)){ - shader_array_set[ShaderType.Body] = Colors.Black; - shader_array_set[ShaderType.Helmet] = Colors.Black; - shader_array_set[ShaderType.Lens] = Colors.Red; - shader_array_set[ShaderType.Trim] = Colors.Dark_Gold; - shader_array_set[ShaderType.RightPauldron] = Colors.Black; - pauldron_trim=1; - specialist_colours=0; - if (unit_chapter == "Dark Angels") { - shader_array_set[ShaderType.Trim] = Colors.Copper; - if (unit_role == "Master of Sanctity") { - shader_array_set[ShaderType.Helmet] = Colors.Caliban_Green; - pauldron_trim=0; - } - } - } //TODO complex shader means no need for all this edge case stuff - // Apothecary - else if (unit_specialization == UnitSpecialization.Apothecary) and (unit_chapter!="Space Wolves"){ - shader_array_set[ShaderType.Body] = Colors.White; - shader_array_set[ShaderType.Helmet] = Colors.White; - shader_array_set[ShaderType.Lens] = Colors.Red; - shader_array_set[ShaderType.RightPauldron] = Colors.White; - pauldron_trim=0; - specialist_colours=0; - } - // Techmarine - else if (unit_specialization == UnitSpecialization.Techmarine) and (unit_chapter!="Iron Hands"){ - shader_array_set[ShaderType.Body] = Colors.Red; - shader_array_set[ShaderType.Helmet] = Colors.Red; - shader_array_set[ShaderType.Lens] = Colors.Lime; - shader_array_set[ShaderType.Trim] = Colors.Silver; - shader_array_set[ShaderType.RightPauldron] = Colors.Red; - pauldron_trim=1; - specialist_colours=0; - } - - // Librarian - else if (unit_specialization == UnitSpecialization.Librarian){ - shader_array_set[ShaderType.Body] = Colors.Dark_Ultramarine; - shader_array_set[ShaderType.Helmet] = Colors.Dark_Ultramarine; - shader_array_set[ShaderType.Lens] = Colors.Cyan; - shader_array_set[ShaderType.Trim] = Colors.Gold; - shader_array_set[ShaderType.RightPauldron] = Colors.Dark_Ultramarine; - pauldron_trim=1; - specialist_colours=0; - } - - // Honour Guard - else if (unit_role==_role[eROLE.HonourGuard]){ - pauldron_trim=0; - specialist_colours=0; - // Blood Angels - if (unit_special_colours==UnitSpecialColours.Gold){ - shader_array_set[ShaderType.Body] = Colors.Gold; - shader_array_set[ShaderType.Helmet] = Colors.Gold; - shader_array_set[ShaderType.LeftPauldron] = Colors.Gold; - shader_array_set[ShaderType.Trim] = Colors.Gold; - // Ultramarines - } else if (unit_chapter == "Ultramarines"){ - shader_array_set[ShaderType.Helmet] = Colors.Sanguine_Red; - } - } // Blood Angels Death Company Marines - else if (unit_specialization==UnitSpecialization.DeathCompany){ + if (unit_specialization==UnitSpecialization.DeathCompany){ shader_array_set[ShaderType.Body] = Colors.Black; shader_array_set[ShaderType.Helmet] = Colors.Black; shader_array_set[ShaderType.LeftPauldron] = Colors.Black; @@ -643,15 +480,6 @@ function scr_draw_unit_image(_background=false){ pauldron_trim=0; specialist_colours=0; } - - // Blood Angels Sergeants - if (unit_chapter == "Blood Angels" && unit_role == _role[eROLE.Sergeant]){ - shader_array_set[ShaderType.LeftPauldron] = Colors.Black; - shader_array_set[ShaderType.RightPauldron] = Colors.Black; - pauldron_trim=0; - specialist_colours=0; - } - //We can return to the custom shader values at any time during draw doing this set_shader_array(shader_array_set); // Marine draw sequence @@ -667,33 +495,6 @@ function scr_draw_unit_image(_background=false){ //Rejoice! // draw_sprite(spr_marine_base,img,x_surface_offset,y_surface_offset); - var clothing_style = 3; - - if (global.chapter_name == "Doom Benefactors") { - clothing_style = 4; - } else { - switch (obj_ini.progenitor) { - case ePROGENITOR.DARK_ANGELS: - case ePROGENITOR.IMPERIAL_FISTS: - case ePROGENITOR.IRON_HANDS: - case ePROGENITOR.RAVEN_GUARD: - clothing_style = 0; - break; - - case ePROGENITOR.WHITE_SCARS: - clothing_style = 1; - break; - - case ePROGENITOR.SPACE_WOLVES: - clothing_style = 2; - break; - - case ePROGENITOR.SALAMANDERS: - clothing_style = 4; - break; - } - } - if (unit_armour!=""){ var yep=0; @@ -705,72 +506,10 @@ function scr_draw_unit_image(_background=false){ tech_brothers_trait=0 } } - }else{armour_sprite=spr_weapon_blank;}// Define armour - - - - if (armour_type == ArmourType.Scout){ - if (dev_trait>0) then dev_trait=10; - armour_sprite=spr_scout_colors2; - if (squad!="none"){ - if (obj_ini.squads[squad].type=="scout_sniper_squad" || weapon_one()=="Sniper Rifle" || weapon_two()=="Sniper Rifle"){ - unit_is_sniper = true; - } - } - }else if (unit_armour=="MK3 Iron Armour"){ - if (dev_trait>0) then dev_trait=13; - if (tech_brothers_trait>-5) then tech_brothers_trait=3; - armour_sprite=spr_mk3_colors; - }else if (unit_armour=="MK4 Maximus"){ - if (dev_trait>0) then dev_trait=13; - if (tech_brothers_trait>-5) then tech_brothers_trait=3; - armour_sprite=spr_mk4_colors; - }else if (unit_armour=="MK5 Heresy"){ - if (dev_trait>0) then dev_trait=13; - if (tech_brothers_trait>-5) then tech_brothers_trait=3; - armour_sprite=spr_mk5_colors; - }else if (unit_armour=="MK6 Corvus"){ - if (dev_trait>0) then dev_trait=13; - if (tech_brothers_trait>-5) then tech_brothers_trait=2; - armour_sprite=spr_beakie_colors; - }else if (unit_armour=="MK7 Aquila" || unit_armour=="Power Armour"){ - if (tech_brothers_trait>-5) then tech_brothers_trait=0; - if (dev_trait>0) then dev_trait=13; - armour_sprite=spr_mk7_colors; - }else if (unit_armour=="MK8 Errant"){ - if (dev_trait>0) then dev_trait=13; - if (tech_brothers_trait>-5) then tech_brothers_trait=0; - armour_sprite=spr_mk8_colors; - }else if (unit_armour=="Tartaros"){ - armour_sprite=spr_tartaros2_colors; - if (tech_brothers_trait>-5) then tech_brothers_trait=4; - } - if (unit_armour=="Terminator Armour"){ - armour_sprite=spr_terminator3_colors; - if (tech_brothers_trait>-5) then tech_brothers_trait=5; - }else if (unit_armour=="Artificer Armour"){ - if (dev_trait>0) then dev_trait=13; - if (tech_brothers_trait>-5) then tech_brothers_trait=1; - armour_sprite=spr_artificer_colors; - } - - if (armour_sprite=spr_weapon_blank) and (unit_armour!=""){ - if (string_count("Power Armour",unit_armour)>0){ - if (dev_trait>0) then dev_trait=13; - if (tech_brothers_trait>-5) then tech_brothers_trait=0; - armour_sprite=spr_mk7_colors; - } - if (string_count("Artifi",unit_armour)>0){ - if (dev_trait>0) then dev_trait=13; - if (tech_brothers_trait>-5) then tech_brothers_trait=1; - armour_sprite=spr_artificer_colors; - } - if (string_count("Termi",unit_armour)>0){ - if (tech_brothers_trait>-5) then tech_brothers_trait=5; - armour_sprite=spr_terminator3_colors; - } - } - + }else { + armour_sprite=spr_weapon_blank; + }// Define armour + // Draw the lights if (unit_specialization == UnitSpecialization.Apothecary) and (unit_armour!="") and (back_equipment == BackType.None){ if (unit_armour=="Terminator Armour") then draw_sprite(spr_gear_apoth,0,x_surface_offset,y_surface_offset-22); // for terminators @@ -792,226 +531,15 @@ function scr_draw_unit_image(_background=false){ draw_sprite(spr_marine_base,skin_color,x_surface_offset,y_surface_offset); - if (skin_color!=6) then draw_sprite(spr_clothing_colors,clothing_style,x_surface_offset,y_surface_offset); - } else { - if (armour_type == ArmourType.Scout){ - if (unit_is_sniper = true){ - draw_sprite(spr_marine_head,skin_color,x_surface_offset,y_surface_offset); - draw_sprite(spr_scout_colors,11,x_surface_offset,y_surface_offset);// Scout Sniper Cloak - } - draw_sprite(armour_sprite,specialist_colours,x_surface_offset,y_surface_offset); - draw_sprite(spr_facial_colors,clothing_style,x_surface_offset,y_surface_offset); - specific_armour_sprite=armour_sprite; - armour_bypass=true; - }else if (unit_armour=="MK3 Iron Armour"){ - specific_armour_sprite = spr_mk3_complex; - complex_set = get_complex_set(eARMOUR_SET.MK3); - complex_livery = true; - if (unit_progenitor == ePROGENITOR.DARK_ANGELS){ - complex_livery = false; - if (unit_role==_role[eROLE.Captain]){ - // specific_armour_sprite = spr_da_mk3; - armour_draw=[spr_da_mk3,0]; - robes_bypass = true; - robes_hood_bypass = true; - armour_bypass=true; - } - } - } else if (unit_armour=="MK4 Maximus"){ - specific_armour_sprite = spr_mk4_complex; - complex_set = get_complex_set(eARMOUR_SET.MK4); - complex_livery = true; - if (array_contains(["Champion",_role[2],_role[5]], unit_role)){ - /*if (unit_chapter=="Ultramarines"){ - armour_draw=[spr_ultra_honor_guard,body.torso.armour_choice]; - armour_bypass=true; - draw_sprite(spr_ultra_honor_guard,2,x_surface_offset,y_surface_offset); - } else { - armour_draw=[spr_generic_honor_guard,body.torso.armour_choice]; - armour_bypass=true; - }*/ - } - if (unit_progenitor == ePROGENITOR.DARK_ANGELS){ - if (unit_role==_role[eROLE.Captain]){ - // specific_armour_sprite = spr_da_mk4; - complex_livery = false; - armour_draw=[spr_da_mk4,0]; - robes_bypass = true; - robes_hood_bypass = true; - armour_bypass=true; - } - } - } else if (unit_armour=="MK5 Heresy"){ - specific_armour_sprite = spr_mk5_complex; - complex_set = get_complex_set(eARMOUR_SET.MK5); - complex_livery = true; - //TODO sort this mess out streamline system somehow - if (progenitor_map() == 2){ - complex_set.add_to_area("mouth_variants", spr_mk5_samuri_faceplate); - } - if (unit_progenitor == ePROGENITOR.DARK_ANGELS){ - complex_set.add_relative_to_status("crest", spr_da_mk5_helm_crests, 2, get_body_data("crest_variation","head"), self); - if (unit_role==_role[eROLE.Captain]){ - // specific_armour_sprite = spr_da_mk5; - armour_draw=[spr_da_mk5,0]; - robes_bypass = true; - robes_hood_bypass = true; - armour_bypass=true; - complex_livery = false; - } - } - } else if (unit_armour=="MK6 Corvus"){ - specific_armour_sprite = spr_mk6_complex; - complex_set = get_complex_set(eARMOUR_SET.MK6); - complex_livery = true; - specific_armour_sprite = spr_beakie_colors; - if (obj_ini.progenitor == ePROGENITOR.DARK_ANGELS){ - complex_set.add_relative_to_status("crest", spr_da_mk6_helm_crests, 2, get_body_data("crest_variation","head"), self); - if (unit_role==_role[eROLE.Captain]){ - complex_livery = false; - // specific_armour_sprite = spr_da_mk6; - armour_draw=[spr_da_mk6,0]; - robes_bypass = true; - robes_hood_bypass = true; - armour_bypass=true; - } - } - - } else if (unit_armour=="MK7 Aquila" || unit_armour="Power Armour"){ - specific_armour_sprite = spr_mk7_complex; - complex_set = get_complex_set(eARMOUR_SET.MK7); - complex_livery = true; - if (obj_ini.progenitor == ePROGENITOR.DARK_ANGELS){ - complex_set.add_relative_to_status("crest", spr_da_mk7_helm_crests, 2, get_body_data("crest_variation","head"), self); - if (unit_role==_role[eROLE.Captain]){ - // specific_armour_sprite = spr_da_mk7; - armour_draw = [spr_da_mk7,0]; - robes_bypass = true; - robes_hood_bypass = true; - armour_bypass = true; - complex_livery = false; - } - } - } else if (unit_armour=="MK8 Errant"){ - specific_armour_sprite = spr_mk8_colors; - complex_set = get_complex_set(eARMOUR_SET.MK8); - complex_livery = true; - if (unit_progenitor == ePROGENITOR.DARK_ANGELS) { - complex_set.add_relative_to_status("crest", spr_da_mk7_helm_crests, 2, get_body_data("crest_variation","head"), self); - if (unit_role==_role[eROLE.Captain]){ - // specific_armour_sprite = spr_da_mk8; - armour_draw=[spr_da_mk8,0]; - robes_bypass = true; - robes_hood_bypass = true; - armour_bypass=true; - } - } - } else if (unit_armour=="Artificer Armour"){ - complex_set = get_complex_set(eARMOUR_SET.MK7); - complex_set.add_group({ - right_leg : spr_artificer_right_leg, - left_leg : spr_artificer_left_leg, - chest_variants : spr_artificer_chest, - thorax_variants : spr_artificer_thorax, - mouth_variants : spr_artificer_mouth, - left_trim : spr_artificer_left_trim, - left_pauldron : spr_artificer_left_pad, - }); - complex_livery = true; - if (array_contains(["Champion",_role[2],_role[5]], unit_role)){ - if (unit_chapter=="Ultramarines"){ - armour_draw=[spr_ultra_honor_guard2, body.torso.armour_choice]; - armour_bypass=true; - // Draw cape; - draw_sprite(spr_ultra_honor_guard2,2,x_surface_offset,y_surface_offset); - } - } - if (unit_chapter=="Blood Angels" || unit_progenitor == eCHAPTERS.BLOOD_ANGELS){ - if (unit_role=="Chapter Master"){ + // if (skin_color!=6) then draw_sprite(spr_clothing_colors,clothing_style,x_surface_offset,y_surface_offset); + } else { - armour_bypass=true; - hide_bionics = true; - robes_bypass = true; - robes_hood_bypass = true; - armour_draw=[spr_dante,0]; - // Draw wings; - draw_sprite(spr_dante,1,x_surface_offset,y_surface_offset); - } else if (unit_role==_role[2]){ - - armour_bypass=true; - hide_bionics = true; - robes_bypass = true; - robes_hood_bypass = true; - armour_draw=[spr_sanguin_guard,0]; - draw_sprite(spr_sanguin_guard,1,x_surface_offset,y_surface_offset); - } - } else if(unit_chapter=="Dark Angels"){ - if (unit_role=="Chapter Master"){ - armour_bypass=true; - hide_bionics = true; - robes_bypass = true; - robes_hood_bypass = true; - armour_draw=[spr_azreal,0]; - } - if (unit_role=="Master of Sanctity"){ - armour_bypass=true; - hide_bionics = true; - robes_bypass = true; - robes_hood_bypass = true; - skull_mask = false; - armour_draw=[spr_da_chaplain,0]; - } - } - } else if (unit_armour=="Tartaros"){ - specific_armour_sprite = spr_tartaros_complex; - complex_set = get_complex_set(eARMOUR_SET.Tartaros); + var _complex_armours = ["MK3 Iron Armour", "MK4 Maximus","Terminator Armour","Tartaros","MK7 Aquila", "Power Armour", "MK8 Errant","Artificer Armour", "MK4 Maximus", "MK5 Heresy", "MK6 Corvus", "Dreadnought", "Scout Armour"]; + if (array_contains(_complex_armours, armour())){ + complex_set = new ComplexSet(self); complex_livery = true; - } else if (unit_armour=="Terminator Armour"){ - specific_armour_sprite = spr_indomitus_complex; - complex_set = get_complex_set(eARMOUR_SET.Indomitus); - complex_livery = true; - if(unit_chapter == "Dark Angels"){ - if (unit_role == _role[eROLE.HonourGuard]){ - armour_bypass=true; - armour_draw=[spr_da_term_honor,0]; - hide_bionics = true; - } - } - } - if (unit_role == _role[eROLE.Champion] || unit_role == _role[eROLE.Captain]){ - if (unit_armour=="Terminator Armour" || unit_armour="Tartaros"){ - complex_set.add_to_area("crown", spr_terminator_laurel); - } else if (armour_type == ArmourType.Normal){ - complex_set.add_to_area("crown", spr_laurel); - if (unit_role == _role[eROLE.Champion]) { - if (unit_armour!="MK3 Iron Armour"){ - complex_set.add_to_area("mouth_variants", spr_special_helm); - } - } - } - } - if (armour_type == ArmourType.Normal){ - if (progenitor_map() == 2){ - complex_set.add_to_area("crest", spr_mongol_topknots); - complex_set.add_to_area("forehead", spr_mongol_hat); - } - } - if (unit_specialization == UnitSpecialization.Techmarine){ - if array_contains(["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour"], unit_armour){ - if (has_trait("tinkerer") && complex_livery){ - complex_set.add_group({ - "armour":spr_techmarine_complex, - "right_trim":spr_techmarine_right_trim, - "left_trim":spr_techmarine_left_trim, - "leg_variants":spr_techmarine_left_leg, - "leg_variants":spr_techmarine_right_leg, - "head":spr_techmarine_head, - "chest_variants":spr_techmarine_chest, - }) - } - } + } - } if (armour_type==ArmourType.Normal && complex_livery && unit_role==_role[2]){ complex_set.add_group({ right_leg : spr_artificer_right_leg, @@ -1058,63 +586,7 @@ function scr_draw_unit_image(_background=false){ draw_sprite(spr_gear_halo,halo_type+halo_color,x_surface_offset,y_surface_offset+halo_offset_y); } - // Draw the backpack - if (draw_backpack){ - var _backpack_sprite = ""; - var _backpack_index = 0; - - if (specialist_colours==0) { - _backpack_sprite = armour_sprite; - _backpack_index = 10; - } else if (specialist_colours==1) { - _backpack_sprite = armour_sprite; - _backpack_index = 11; - } else if (specialist_colours>=2) { - _backpack_sprite = armour_sprite; - _backpack_index = 12; - } - - if (body.torso.backpack_variation % 3 == 0) { - if (unit_progenitor == ePROGENITOR.DARK_ANGELS){ - if array_contains(["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour"], unit_armour){ - _backpack_sprite = spr_da_backpack; - complex_set.add_to_area("backpack",spr_da_backpack); - } - } - if (reverent_guardians) and (!modest_livery){ - complex_set.add_to_area("backpack",spr_pack_brazier3); - } - } - - /*if (unit_progenitor == "Dark Angels") { - if (unit_role == "Chapter Master") { - _backpack_sprite = spr_da_backpack; - _backpack_index = 1; - } else if (unit_role == "Master of Sanctity") { - _backpack_sprite = spr_da_chaplain; - _backpack_index = 1; - } - }*/ - if (complex_livery) && (struct_exists(complex_set, "backpack")){ - var choice = get_body_data("backpack_variation","torso")%sprite_get_number(complex_set.backpack); - setup_complex_livery_shader(role()); - draw_sprite(complex_set.backpack,choice,x_surface_offset,y_surface_offset); - shader_set(sReplaceColor); - } else { - draw_sprite(_backpack_sprite, _backpack_index, x_surface_offset, y_surface_offset); - } - }else{ - if (back_equipment==BackType.Jump){ - var color_variant = min(specialist_colours, 2); - draw_sprite(spr_pack_jump,color_variant,x_surface_offset,y_surface_offset); - } else if (back_equipment==BackType.Dev){ - var color_variant = min(specialist_colours, 2); - draw_sprite(spr_pack_devastator,color_variant,x_surface_offset,y_surface_offset); - } - } - if (armour_type == ArmourType.Terminator && complex_livery){ - var _body_parts = ARR_body_parts; for (var part = 0; part < array_length(_body_parts); part++) { if (struct_exists(body[$ _body_parts[part]], "bionic")) { @@ -1141,9 +613,34 @@ function scr_draw_unit_image(_background=false){ } } } - if(!complex_livery){ - draw_unit_arms(x_surface_offset, y_surface_offset, armour_type, specialist_colours, hide_bionics, complex_set); - } + if (armour_type == ArmourType.Normal && (!robes_bypass || !robes_hood_bypass)) { + var robe_offset_x = 0; + var robe_offset_y = 0; + var hood_offset_x = 0; + var hood_offset_y = 0; + if (armour_type == ArmourType.Scout) { + robe_offset_x = 1; + robe_offset_y = 10; + hood_offset_x = 1; + hood_offset_y = 10; + } + if (struct_exists(body[$ "head"],"hood") && !robes_hood_bypass) { + draw_sprite(spr_marine_cloth_hood,0,x_surface_offset+hood_offset_x,y_surface_offset+hood_offset_y); + } + if (struct_exists(body[$ "torso"],"robes") && !robes_bypass) { + if (body.torso.robes == 0){ + complex_set.add_to_area("robe",spr_marine_robes); + } else if (body.torso.robes == 1) { + if (scr_has_adv("Daemon Binders") && !modest_livery){ + complex_set.add_to_area("robes",spr_binders_robes); + } else { + complex_set.add_to_area("robes",spr_marine_robes); + } + } else { + complex_set.add_to_area("tabbard",spr_cloth_tabbard); + } + } + } if (armour_type==ArmourType.Normal && complex_livery){ if (struct_exists(body[$ "right_leg"], "bionic")) { @@ -1155,101 +652,46 @@ function scr_draw_unit_image(_background=false){ complex_set.replace_area("left_leg",spr_bionic_leg_left); } } + if (complex_livery){ - setup_complex_livery_shader(role()); - var _complex_helm = false; - if (unit_role ==_role[eROLE.Sergeant]){ - _complex_helm = obj_ini.complex_livery_data.sgt; - }else if(unit_role==_role[eROLE.VeteranSergeant]){ - _complex_helm = obj_ini.complex_livery_data.vet_sgt; - }else if(unit_role==_role[eROLE.Captain]){ - _complex_helm = obj_ini.complex_livery_data.captain; - }else if(unit_role==_role[eROLE.Veteran] || (unit_role==_role[eROLE.Terminator] && company == 1)){ - _complex_helm = obj_ini.complex_livery_data.veteran; - } - if (is_struct(_complex_helm) && struct_exists(complex_set, "head")){ - surface_reset_target(); - complex_set.complex_helms(_complex_helm, self); - surface_set_target(unit_surface); - } if (psy_hood){ complex_set.replace_area("crown", spr_psy_hood_complex); + } + for (var part = 0; part < array_length(_body_parts); part++) { + if (struct_exists(body[$ _body_parts[part]], "bionic")) { + if (armour_type == ArmourType.Normal) { + var body_part = _body_parts[part]; + var bionic = body[$ body_part][$ "bionic"]; + switch (body_part) { + case "left_eye": + complex_set.add_to_area("left_eye", spr_bionic_left_eyes); + break; + + case "right_eye": + complex_set.add_to_area("right_eye", spr_bionic_right_eyes); + break; + + } + } + } } } // Draw torso if (!armour_bypass){ if (complex_livery){ if (struct_exists(complex_set, "armour")){ - complex_set.draw_cloaks(self,x_surface_offset,y_surface_offset ); - draw_unit_arms(x_surface_offset, y_surface_offset, armour_type, specialist_colours, hide_bionics, complex_set); - shader_set(full_livery_shader); - if (struct_exists(complex_set, "armour")){ - var choice = get_body_data("armour_choice","torso")%sprite_get_number(complex_set.armour); - draw_sprite(complex_set.armour,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(complex_set, "chest_variants")){ - var choice = get_body_data("chest_variation","torso")%sprite_get_number(complex_set.chest_variants); - draw_sprite(complex_set.chest_variants,choice,x_surface_offset,y_surface_offset); + complex_set.x_surface_offset = x_surface_offset; + complex_set.y_surface_offset = y_surface_offset + complex_set.draw(); + } else if (specific_armour_sprite!="none"){ + if (sprite_exists(specific_armour_sprite)){ + draw_sprite(specific_armour_sprite,0,x_surface_offset,y_surface_offset); } - if (struct_exists(complex_set, "thorax_variants")){ - var choice = get_body_data("thorax_variation","torso")%sprite_get_number(complex_set.thorax_variants); - draw_sprite(complex_set.thorax_variants,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(complex_set, "leg_variants")){ - var choice = get_body_data("leg_variants","left_leg")%sprite_get_number(complex_set.leg_variants); - draw_sprite(complex_set.leg_variants,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(complex_set, "left_leg")){ - var choice = get_body_data("leg_variants","left_leg")%sprite_get_number(complex_set.left_leg); - draw_sprite(complex_set.left_leg,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(complex_set, "right_leg")){ - var choice = get_body_data("leg_variants","right_leg")%sprite_get_number(complex_set.right_leg); - draw_sprite(complex_set.right_leg,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(complex_set, "left_trim")){ - var choice = get_body_data("trim_variation","left_arm")%sprite_get_number(complex_set.left_trim); - draw_sprite(complex_set.left_trim,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(complex_set, "right_trim")){ - var choice = get_body_data("trim_variation","right_arm")%sprite_get_number(complex_set.right_trim); - draw_sprite(complex_set.right_trim,choice,x_surface_offset,y_surface_offset); - } - complex_set.draw_head(self, x_surface_offset,y_surface_offset); - if (struct_exists(complex_set, "gorget")){ - var choice = get_body_data("variant","throat")%sprite_get_number(complex_set.gorget); - draw_sprite(complex_set.gorget,choice,x_surface_offset,y_surface_offset); - } - if (struct_exists(complex_set, "right_pauldron")){ - draw_sprite(complex_set.right_pauldron,company,x_surface_offset,y_surface_offset); - } - if (struct_exists(complex_set, "left_pauldron")){ - draw_sprite(complex_set.left_pauldron,company,x_surface_offset,y_surface_offset); - } - if (struct_exists(complex_set, "left_knee")){ - draw_sprite(complex_set.left_knee,company,x_surface_offset,y_surface_offset); - } - } else { - draw_sprite(specific_armour_sprite,0,x_surface_offset,y_surface_offset); } shader_set(sReplaceColor); } else{ draw_sprite(armour_sprite,specialist_colours,x_surface_offset,y_surface_offset); } - // Draw additional torso decals - - if (array_contains(["MK3 Iron Armour", "MK6 Corvus", "MK7 Aquila", "MK8 Errant"], unit_armour)){ - if (back_equipment == BackType.Jump || back_equipment == BackType.Dev){ - draw_sprite(mk7_chest_variants,1,x_surface_offset,y_surface_offset); - } - } - // Draw pauldron trim - if (!complex_livery){ - if (specific_armour_sprite != "none"){ - if (pauldron_trim==0 && specialist_colours<=1) then draw_sprite(specific_armour_sprite,4,x_surface_offset,y_surface_offset); - if (pauldron_trim==0 && specialist_colours>=2) then draw_sprite(specific_armour_sprite,5,x_surface_offset,y_surface_offset); - } - } } else if (array_length(armour_draw)){ draw_sprite(armour_draw[0], armour_draw[1],x_surface_offset,y_surface_offset); } @@ -1277,35 +719,6 @@ function scr_draw_unit_image(_background=false){ } } } - - // Techmarine Details - if (array_contains([UnitSpecialization.Techmarine, UnitSpecialization.IronFather], unit_specialization)){ - var lens_offset = 0; - if (unit_armour == "Terminator Armour" || unit_armour == "Tartaros"){ - lens_offset = -6; - } - if (body.head.variation > 5) { - draw_sprite_flipped(spr_gear_techa, 0, x_surface_offset, y_surface_offset + lens_offset); - } else { - draw_sprite(spr_gear_techa,0,x_surface_offset,y_surface_offset + lens_offset); - } - if (body.torso.variation > 5) { - if (unit_armour == "Terminator Armour"){ - draw_sprite(spr_gear_techb,1,x_surface_offset,y_surface_offset); - } else { - draw_sprite(spr_gear_techb,0,x_surface_offset,y_surface_offset); - } - } - } - - // Librarian Details - if (unit_specialization == UnitSpecialization.Librarian) { - if (armour_type == ArmourType.Normal) { - draw_sprite(spr_gear_librarian, 0, x_surface_offset, y_surface_offset); - } else if (armour_type == ArmourType.Terminator) { - draw_sprite(spr_gear_librarian, 0, x_surface_offset-14, y_surface_offset-14); - } - } // Hood if (!complex_livery){ @@ -1326,137 +739,8 @@ function scr_draw_unit_image(_background=false){ } } } - } - //purity seals/decorations - //TODO imprvoe this logic to be more extendable + } - if (armour_type==ArmourType.Normal){ - var _torso_data = body[$ "torso"]; - if (struct_exists(_torso_data,"purity_seal")){ - var _torso_purity_seals = _torso_data[$"purity_seal"]; - if (_torso_purity_seals[2]==1){ - draw_sprite(spr_purity_seal,2,x_surface_offset-24,y_surface_offset+14); - } - if (_torso_purity_seals[0]==1){ - draw_sprite(spr_purity_seal,0,x_surface_offset-44,y_surface_offset+18); - } - if (_torso_purity_seals[1]==1){ - draw_sprite(spr_purity_seal,0,x_surface_offset-6,y_surface_offset+16); - } - } - if (struct_exists(body[$ "left_arm"],"purity_seal")){ - var _arm_seals = body[$ "left_arm"][$"purity_seal"]; - if (_arm_seals[0]==1){ - draw_sprite(spr_purity_seal,1,x_surface_offset+70,y_surface_offset); - } - if (_arm_seals[1]==1){ - draw_sprite(spr_purity_seal,0,x_surface_offset+26,y_surface_offset+7); - } - if (_arm_seals[2]==1){ - draw_sprite(spr_purity_seal,0,x_surface_offset+15,y_surface_offset+10); - } - } - if (struct_exists(body[$ "right_arm"],"purity_seal")){ - var _arm_seals = body[$ "right_arm"][$"purity_seal"]; - if (_arm_seals[0]==1){ - draw_sprite(spr_purity_seal,2,x_surface_offset-54,y_surface_offset-3); - } - if (_arm_seals[0]==1){ - draw_sprite(spr_purity_seal,0,x_surface_offset-72,y_surface_offset+8); - } - if (_arm_seals[0]==1){ - draw_sprite(spr_purity_seal,0,x_surface_offset-57,y_surface_offset+12); - } - } - } - - // Bionics - if (!hide_bionics || armour_type != ArmourType.Terminator) { - var eye_move_x = 0; - var eye_move_y = 0; - var eye_spacer = 0; - if (unit_armour=="Terminator Armour") { - // Adjust eye bionics on chaplain terminator armour - if (skull_mask) { - eye_move_y = 2; - eye_spacer = -2; - // Adjust eye bionics on terminator armour - } else { - eye_move_y = -7; - } - } - // Draw bionics - surface_reset_target(); - var bionic_surface = surface_create(512,512); - surface_set_target(bionic_surface); - var _body_parts = ARR_body_parts; - - for (var part = 0; part < array_length(_body_parts); part++) { - if (struct_exists(body[$ _body_parts[part]], "bionic")) { - if (armour_type == ArmourType.Normal || unit_armour=="Terminator Armour") { - var body_part = _body_parts[part]; - var bionic = body[$ body_part][$ "bionic"]; - switch (body_part) { - case "left_eye": - if (bionic.variant == 0) { - draw_sprite(spr_bionics_eye, 1,x_surface_offset+ eye_move_x + eye_spacer, y_surface_offset + eye_move_y); - } else if (bionic.variant == 1) { - draw_sprite(spr_bionic_eye_2, 1,x_surface_offset+eye_move_x + eye_spacer, y_surface_offset + eye_move_y); - } else if (bionic.variant == 2) { - draw_sprite(spr_bionic_eye_2, 2,x_surface_offset+eye_move_x + eye_spacer, y_surface_offset + eye_move_y); - } - break; - - case "right_eye": - if (bionic.variant == 0) { - draw_sprite(spr_bionics_eye, 0,x_surface_offset+eye_move_x, y_surface_offset + eye_move_y); - } else if (bionic.variant == 1) { - draw_sprite(spr_bionic_eye_2, 0,x_surface_offset+eye_move_x, y_surface_offset + eye_move_y); - } else if (bionic.variant == 2) { - draw_sprite(spr_bionic_eye_2, 4,x_surface_offset+eye_move_x, y_surface_offset + eye_move_y); - } - break; - - case "left_leg": - if (!complex_livery){ - if (armour_type == ArmourType.Normal) { - var sprite_num = 2; - if (specialist_colours >= 2) { - sprite_num = 3; - } - if (bionic.variant == 0) { - draw_sprite(spr_bionics_leg_2, sprite_num, x_surface_offset, y_surface_offset) - } else { - draw_sprite(spr_bionics_leg_3, sprite_num, x_surface_offset, y_surface_offset) - } - } - } - break; - - case "right_leg": - if (!complex_livery){ - if (armour_type == ArmourType.Normal) { - if (bionic.variant == 0) { - draw_sprite(spr_bionics_leg_2, 0, x_surface_offset, y_surface_offset) - } else { - draw_sprite(spr_bionics_leg_3, 0, x_surface_offset, y_surface_offset) - } - } - } - break; - } - } - } - } - surface_reset_target(); - shader_set_uniform_i(shader_get_uniform(sReplaceColor, "u_blend_modes"), 1); - texture_set_stage(shader_get_sampler_index(sReplaceColor, "background_texture"), surface_get_texture(unit_surface)); - surface_set_target(unit_surface); - draw_surface(bionic_surface, 0,0); - surface_free(bionic_surface); - shader_set(sReplaceColor); - shader_set_uniform_i(shader_get_uniform(sReplaceColor, "u_blend_modes"), 0); - } // Draw Custom Helmets if (armour_type==ArmourType.Normal && !armour_bypass){ if (unit_role == _role[eROLE.Champion]) { @@ -1473,13 +757,6 @@ function scr_draw_unit_image(_background=false){ if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) { draw_sprite(spr_helm_decorations,0,x_surface_offset,y_surface_offset-10); } - } else if (armour_type == ArmourType.Scout){ - var head_mod = body.head.variation%3; - if (head_mod == 1){ - draw_sprite(spr_scout_heads,0,x_surface_offset,y_surface_offset); - } else if (head_mod==2){ - draw_sprite(spr_scout_heads,1,x_surface_offset,y_surface_offset); - } } @@ -1506,35 +783,6 @@ function scr_draw_unit_image(_background=false){ robes_bypass = true; robes_hood_bypass = true; } - if (armour_type == ArmourType.Normal && (!robes_bypass || !robes_hood_bypass)) { - var robe_offset_x = 0; - var robe_offset_y = 0; - var hood_offset_x = 0; - var hood_offset_y = 0; - if (armour_type == ArmourType.Scout) { - robe_offset_x = 1; - robe_offset_y = 10; - hood_offset_x = 1; - hood_offset_y = 10; - } - if (struct_exists(body[$ "head"],"hood") && !robes_hood_bypass) { - draw_sprite(spr_marine_cloth_hood,0,x_surface_offset+hood_offset_x,y_surface_offset+hood_offset_y); - } - if (struct_exists(body[$ "torso"],"robes") && !robes_bypass) { - if (body.torso.robes == 0){ - draw_sprite(spr_marine_robes,0,x_surface_offset+robe_offset_x,y_surface_offset+robe_offset_y); - } else if (body.torso.robes == 1) { - if (scr_has_adv("Daemon Binders") && !modest_livery){ - var _index = pauldron_trim == 1 ? 0 : 1; - draw_sprite(spr_binders_robes,_index,x_surface_offset+robe_offset_x,y_surface_offset+robe_offset_y); - } else { - draw_sprite(spr_marine_robes,1,x_surface_offset+robe_offset_x,y_surface_offset+robe_offset_y); - } - } else { - draw_sprite(spr_cloth_tabbard,0,x_surface_offset+robe_offset_x,y_surface_offset+robe_offset_y); - } - } - } var shield_offset_x = 0; var shield_offset_y = 0; @@ -1559,6 +807,7 @@ function scr_draw_unit_image(_background=false){ // // Draw weapons shader_set(sReplaceColor); + if (!new_weapon_draw[1]) { if (ui_weapon[1]!=0) and (sprite_exists(ui_weapon[1])){ if (ui_twoh[1]==false) and (ui_twoh[2]==false){ @@ -1594,6 +843,7 @@ function scr_draw_unit_image(_background=false){ } } + // Draw hands above the weapon sprite; for (var i = 1; i <= 2; i++) { if (hand_on_top[i]) then draw_unit_hands(x_surface_offset, y_surface_offset, armour_type, specialist_colours, hide_bionics, i); @@ -1601,7 +851,6 @@ function scr_draw_unit_image(_background=false){ // if (reverent_guardians=1) then draw_sprite(spr_pack_brazier,1,x_surface_offset,y_surface_offset); if (armour_type==ArmourType.Dreadnought){ - draw_sprite(spr_dreadnought_chasis_colors,specialist_colours,x_surface_offset,y_surface_offset); var left_arm = dreadnought_sprite_components(weapon_two()); var colour_scheme = specialist_colours<=1 ? 0 : 1; draw_sprite(left_arm,colour_scheme,x_surface_offset,y_surface_offset); @@ -1644,7 +893,40 @@ function scr_draw_unit_image(_background=false){ var _complex_sprite_names = struct_get_names(complex_set); for (var i=0;i=4) and (recruit_count==0){ - var _data = spec_train_data[3]; - var marine_company=0; - var random_marine=scr_random_marine( - [ - obj_ini.role[100][8], - obj_ini.role[100][18], - obj_ini.role[100][10], - obj_ini.role[100][9] - ], - _data.min_exp, - { - "stat":_data.req - } - ); - - if (random_marine != "none"){ - marine_position=random_marine[1]; - marine_company=random_marine[0]; + var random_marine = spec_data_set(eROLE_TAG.Apothecary); + if (random_marine != "none") { + var marine_position=random_marine[1]; + var marine_company=random_marine[0]; // This gets the last open slot for company 0 var open_slot = find_company_open_slot(0); if (open_slot!=-1){ @@ -142,7 +167,8 @@ function apothecary_training(){ } } } else { - scr_alert("red","recruitment","No marines available for apothecary traning",0,0); + training_apothecary = 0; + scr_alert("red","recruitment",$"No marines available for {obj_ini.role[100][eROLE.Apothecary]} traning",0,0); } } } @@ -169,6 +195,7 @@ function chaplain_training(){ scr_alert("green","recruitment",unit.name_role()+" has finished training.",0,0); chaplain_points-=48; unit.update_role(obj_ini.role[100][14]); + unit.role_tag = [0, 0, 0, 0]; unit.add_exp(10); chaplain_aspirant=0; warn=""; @@ -192,23 +219,10 @@ function chaplain_training(){ chaplain_points=0; } }else if (chaplain_points>=4) and (recruit_count==0){ - var _data = spec_train_data[2]; - var marine_company=0; - random_marine=scr_random_marine( - [ - obj_ini.role[100][8], - obj_ini.role[100][18], - obj_ini.role[100][10], - obj_ini.role[100][9] - ], - _data.min_exp, - { - "stat":_data.req - } - ); - if (random_marine != "none"){ - marine_position = random_marine[1]; - marine_company = random_marine[0]; + var random_marine = spec_data_set(eROLE_TAG.Chaplain); + if (random_marine != "none") { + var marine_position = random_marine[1]; + var marine_company = random_marine[0]; var open_slot = find_company_open_slot(0); if (open_slot!=-1){ chaplain_aspirant=1; @@ -223,7 +237,10 @@ function chaplain_training(){ scr_company_order(0); } } - } + } else { + training_chaplain = 0; + scr_alert("red","recruitment",$"No remaining {obj_ini.role[100][eROLE.Chaplain]} applicant marines for training",0,0); + } } } } @@ -258,34 +275,21 @@ function librarian_training(){ scr_alert("green","recruitment",unit.name_role()+" has finished training.",0,0); unit.update_role("Lexicanum"); + unit.role_tag = [0, 0, 0, 0]; with(obj_ini){scr_company_order(0);} } }else { psyker_points=0; } } else if (psyker_points>=4) and (recruit_count==0){ - - var _data = spec_train_data[1]; - var marine_company=0; - var random_marine=scr_random_marine( - [ - obj_ini.role[100][8], - obj_ini.role[100][18], - obj_ini.role[100][10], - obj_ini.role[100][9] - ], - _data.min_exp, - { - "stat":_data.req - } - ); - if (random_marine == "none"){ - training_psyker=0; + var random_marine = spec_data_set(eROLE_TAG.Librarian); + if (random_marine == "none") { + training_psyker = 0; scr_alert("red","recruitment","No remaining warp sensitive marines for training",0,0); }else if (random_marine != "none"){ // This gets the last open slot for company 0 - marine_position = random_marine[1]; - marine_company = random_marine[0]; + var marine_position = random_marine[1]; + var marine_company = random_marine[0]; var open_slot = find_company_open_slot(0); scr_move_unit_info(marine_company,0, marine_position, open_slot); unit = fetch_unit([0,open_slot]); @@ -318,7 +322,13 @@ function techmarine_training(){ if (training_techmarine>0){ recruit_count=scr_role_count(novice_type,""); - if (tech_points>=360){ + if (obj_controller.faction_status[eFACTION.Mechanicus] != "War") { + var _threshold = 360 + } else { + var _threshold = 252 + } + + if (tech_points>=_threshold){ if (recruit_count>0){ random_marine=scr_random_marine(novice_type,0); if (random_marine != "none"){ @@ -326,6 +336,7 @@ function techmarine_training(){ tech_points-=360; unit.update_role(obj_ini.role[100][16]); + unit.role_tag = [0, 0, 0, 0]; unit.add_exp(30); t=0; @@ -375,24 +386,10 @@ function techmarine_training(){ tech_points=0; } }else if (tech_points>=4) and (recruit_count==0){ - marine_position=0; - var _data = spec_train_data[0]; - var marine_company=0; - var random_marine=scr_random_marine( - [ - obj_ini.role[100][8], - obj_ini.role[100][18], - obj_ini.role[100][10], - obj_ini.role[100][9] - ], - _data.min_exp, - { - "stat":_data.req - } - ); - if (random_marine != "none"){ - marine_position = random_marine[1]; - marine_company = random_marine[0]; + var random_marine = spec_data_set(eROLE_TAG.Techmarine); + if (random_marine != "none") { + var marine_position = random_marine[1]; + var marine_company = random_marine[0]; // This gets the last open slot for company 0 var open_slot = find_company_open_slot(0); if (open_slot!=-1){ @@ -426,7 +423,7 @@ function techmarine_training(){ } } else{ training_techmarine = 0; - scr_alert("red",string("recruitment","No marines with sufficient technology aptitude for {0} training",obj_ini.role[100][16]),0,0); + scr_alert("red","recruitment",$"No marines with sufficient technology aptitude for {obj_ini.role[100][eROLE.Techmarine]} training",0,0); } } } diff --git a/scripts/scr_ui_settings/scr_ui_settings.gml b/scripts/scr_ui_settings/scr_ui_settings.gml index f2c0856512..b787efcab9 100644 --- a/scripts/scr_ui_settings/scr_ui_settings.gml +++ b/scripts/scr_ui_settings/scr_ui_settings.gml @@ -469,6 +469,20 @@ function scr_ui_settings() { modest_livery=0; } } + + draw_text(xx+66,yy+343,"Tagged Training"); + che=tagged_training; + cx=xx+31; + cy=yy+339; + + draw_sprite(spr_creation_check,che+2,cx,cy); + if (scr_hit(cx+31,cy,cx+300,cy+20)=true) { + tool1="Tagged training"; + tool2="Turned off by default, makes specialist training select only tagged marines, click on their potential indicators to tag."; + } + if (point_and_click([cx,cy,cx+32,cy+32])) { + tagged_training = !tagged_training; + } yy+=35; diff --git a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml index 0e2afb83ac..6e1fae2718 100644 --- a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml +++ b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml @@ -77,7 +77,7 @@ function scr_update_unit_armour(new_armour, from_armoury=true, to_armoury=true, } } else { if (!is_string(armour(true))){ - delete_artifact(armour(true)); + delete_artifact(armour(true)); // This code path along with the other functions causes a feedback loop as delete_artifact calls unequip_from_unit which calls all functions in this file } } } @@ -358,4 +358,35 @@ function alter_unit_equipment(update_equipment, from_armoury=true, to_armoury=tr break; } } -} \ No newline at end of file +} + +function unit_has_equipped(check_equippment){ + var equip_areas = struct_get_names(check_equippment); + var _has_equipped = true; + for (var i=0;i= 90 && company > 0 && company < 6) || company == 1){ @@ -432,19 +440,19 @@ function scr_marine_game_spawn_constructions(){ add_bionics("none","standard",false); } if (irandom(3)==0){ - body[$ "torso"][$ "purity_seal"] = [irandom(1),irandom(1),irandom(1),]; + body[$ "torso"][$ "purity_seal"] = [irandom(100),irandom(100),irandom(100),]; } if (irandom(3)==0){ - body[$ "left_arm"][$ "purity_seal"] = [irandom(1),irandom(1),irandom(1),]; + body[$ "left_arm"][$ "purity_seal"] = [irandom(100),irandom(100),irandom(100),]; } if (irandom(3)==0){ - body[$ "right_arm"][$ "purity_seal"] = [irandom(1),irandom(1),irandom(1),]; + body[$ "right_arm"][$ "purity_seal"] = [irandom(100),irandom(100),irandom(100),]; } if (irandom(3)==0){ - body[$ "left_leg"][$ "purity_seal"] = [irandom(1),irandom(1),irandom(1),]; + body[$ "left_leg"][$ "purity_seal"] = [irandom(100),irandom(100),irandom(100),]; } if (irandom(3)==0){ - body[$ "right_leg"][$ "purity_seal"] = [irandom(1),irandom(1),irandom(1),]; + body[$ "right_leg"][$ "purity_seal"] = [irandom(100),irandom(100),irandom(100),]; } } \ No newline at end of file diff --git a/shaders/full_livery_shader/full_livery_shader.fsh b/shaders/full_livery_shader/full_livery_shader.fsh index 05ac3f904e..16684bc82c 100644 --- a/shaders/full_livery_shader/full_livery_shader.fsh +++ b/shaders/full_livery_shader/full_livery_shader.fsh @@ -26,10 +26,16 @@ uniform vec3 eye_lense; uniform vec3 right_backpack; uniform vec3 left_backpack; uniform vec3 company_marks; +uniform vec3 robes_colour_replace; varying vec2 v_vTexcoord; varying vec4 v_vColour; + +vec3 light_or_dark(vec3 m_colour, float shade){ + return vec3((m_colour.r * shade) + 0.01, m_colour.g * shade, m_colour.b * shade); +} + void main() { vec4 col = texture2D(gm_BaseTexture, v_vTexcoord); @@ -107,7 +113,28 @@ void main() }; if (col.rgb == vec3(128.0/255.0,128.0/255.0,0.0)){ col.rgb = company_marks.rgb; - }; + }; + + vec3 robes_colour_base = vec3(201.0 / 255.0, 178.0 / 255.0, 147.0 / 255.0); + vec3 robes_highlight = vec3(230.0 / 255.0, 203.0 / 255.0, 168.0 / 255.0); + vec3 robes_darkness = vec3(189.0 / 255.0, 167.0 / 255.0, 138.0 / 255.0); + vec3 robes_colour_base_2 = vec3(169.0 / 255.0, 150.0 / 255.0, 123.0 / 255.0); + vec3 robes_highlight_2 = vec3(186.0 / 255.0, 165.0 / 255.0, 135.0 / 255.0); + vec3 robes_darkness_2 = vec3(148.0 / 255.0, 132.0 / 255.0, 108.0 / 255.0); + if (col.rgb == robes_colour_base.rgb || col.rgb == robes_colour_base_2.rgb) { + col.rgb = light_or_dark(robes_colour_replace , 1.0).rgb; + }; + if (col.rgb == robes_highlight.rgb || col.rgb == robes_highlight_2.rgb) { + col.rgb = light_or_dark(robes_colour_replace , 1.25).rgb; + //col.rgb = mix(robes_highlight.rgb, robes_colour_replace.rgb, 0.25); + }; + if (col.rgb == robes_darkness.rgb || col.rgb == robes_darkness_2.rgb) { + //col.rgb = vec3(col.r*0.8, col.g*0.8, col.b*0.8).rgb; + //col.rgb = robes_colour_replace.rgb; + //col.rgb = mix(robes_darkness.rbg, robes_colour_replace.rgb, 0.25); + col.rgb = light_or_dark(robes_colour_replace , 0.75).rgb; + }; + gl_FragColor = v_vColour * col; } diff --git a/sprites/spr_apothecary_lights/fbe2c10c-ddf0-458e-99ee-c3b5fba778d6.png b/sprites/spr_apothecary_lights/fbe2c10c-ddf0-458e-99ee-c3b5fba778d6.png new file mode 100644 index 0000000000..1d072f6745 Binary files /dev/null and b/sprites/spr_apothecary_lights/fbe2c10c-ddf0-458e-99ee-c3b5fba778d6.png differ diff --git a/sprites/spr_apothecary_lights/layers/fbe2c10c-ddf0-458e-99ee-c3b5fba778d6/db192a8c-3604-4553-bea9-59dc5e18b44c.png b/sprites/spr_apothecary_lights/layers/fbe2c10c-ddf0-458e-99ee-c3b5fba778d6/db192a8c-3604-4553-bea9-59dc5e18b44c.png new file mode 100644 index 0000000000..85e673c416 Binary files /dev/null and b/sprites/spr_apothecary_lights/layers/fbe2c10c-ddf0-458e-99ee-c3b5fba778d6/db192a8c-3604-4553-bea9-59dc5e18b44c.png differ diff --git a/sprites/spr_apothecary_lights/spr_apothecary_lights.yy b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy new file mode 100644 index 0000000000..8fb46c00f9 --- /dev/null +++ b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_apothecary_lights", + "bbox_bottom": 41, + "bbox_left": 33, + "bbox_right": 129, + "bbox_top": 5, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"db192a8c-3604-4553-bea9-59dc5e18b44c","blendMode":0,"displayName":"default","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_apothecary_lights", + "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":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_apothecary_lights/spr_apothecary_lights.yy",},},},"Disabled":false,"id":"5b54351d-f020-400d-99c5-b24a753b7623","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_backpack_fastening/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png b/sprites/spr_backpack_fastening/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png new file mode 100644 index 0000000000..c45b013a58 Binary files /dev/null and b/sprites/spr_backpack_fastening/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png differ diff --git a/sprites/spr_backpack_fastening/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png b/sprites/spr_backpack_fastening/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png new file mode 100644 index 0000000000..c45b013a58 Binary files /dev/null and b/sprites/spr_backpack_fastening/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png differ diff --git a/sprites/spr_backpack_fastening/spr_backpack_fastening.yy b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy new file mode 100644 index 0000000000..7f3ca65544 --- /dev/null +++ b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_backpack_fastening", + "bbox_bottom": 89, + "bbox_left": 53, + "bbox_right": 114, + "bbox_top": 36, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"afeb1ada-ac9c-4851-8836-ecc4563b7ef0","blendMode":0,"displayName":"default","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_backpack_fastening", + "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":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","path":"sprites/spr_backpack_fastening/spr_backpack_fastening.yy",},},},"Disabled":false,"id":"13043471-e077-4f56-9ff2-cd603f68f0f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 1, + "yorigin": 7, + }, + "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_bionic_left_arm/1760fafc-7f34-4184-937c-64a145f1e4e9.png b/sprites/spr_bionic_left_arm/1760fafc-7f34-4184-937c-64a145f1e4e9.png new file mode 100644 index 0000000000..112998e90f Binary files /dev/null and b/sprites/spr_bionic_left_arm/1760fafc-7f34-4184-937c-64a145f1e4e9.png differ diff --git a/sprites/spr_bionic_left_arm/cd829f66-11dc-4ec3-b718-e71b936e0974.png b/sprites/spr_bionic_left_arm/cd829f66-11dc-4ec3-b718-e71b936e0974.png new file mode 100644 index 0000000000..1ab9993dd8 Binary files /dev/null and b/sprites/spr_bionic_left_arm/cd829f66-11dc-4ec3-b718-e71b936e0974.png differ diff --git a/sprites/spr_bionic_left_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/Copied Layer 1.png b/sprites/spr_bionic_left_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/Copied Layer 1.png new file mode 100644 index 0000000000..30ccde9042 Binary files /dev/null and b/sprites/spr_bionic_left_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/Copied Layer 1.png differ diff --git a/sprites/spr_bionic_left_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/f54e47d6-9977-4d33-b3c6-2d679214f713.png b/sprites/spr_bionic_left_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/f54e47d6-9977-4d33-b3c6-2d679214f713.png new file mode 100644 index 0000000000..1ba94a57cd Binary files /dev/null and b/sprites/spr_bionic_left_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/f54e47d6-9977-4d33-b3c6-2d679214f713.png differ diff --git a/sprites/spr_bionic_left_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/Copied Layer 1.png b/sprites/spr_bionic_left_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/Copied Layer 1.png new file mode 100644 index 0000000000..b1471f2df3 Binary files /dev/null and b/sprites/spr_bionic_left_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/Copied Layer 1.png differ diff --git a/sprites/spr_bionic_left_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/f54e47d6-9977-4d33-b3c6-2d679214f713.png b/sprites/spr_bionic_left_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/f54e47d6-9977-4d33-b3c6-2d679214f713.png new file mode 100644 index 0000000000..1ba94a57cd Binary files /dev/null and b/sprites/spr_bionic_left_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/f54e47d6-9977-4d33-b3c6-2d679214f713.png differ diff --git a/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy b/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy new file mode 100644 index 0000000000..f4b4defd00 --- /dev/null +++ b/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy @@ -0,0 +1,77 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_bionic_left_arm", + "bbox_bottom": 125, + "bbox_left": 119, + "bbox_right": 149, + "bbox_top": 74, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1760fafc-7f34-4184-937c-64a145f1e4e9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cd829f66-11dc-4ec3-b718-e71b936e0974",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f54e47d6-9977-4d33-b3c6-2d679214f713","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"Copied Layer 1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "bionics", + "path": "folders/Sprites/Marine Viewer/bionics.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_bionic_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": 2.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":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},},},"Disabled":false,"id":"5976c9a5-8277-4050-b34d-34f2d872e4da","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},},},"Disabled":false,"id":"8cbf2a21-7ada-41e5-903e-cd67592bac46","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, + "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_bionic_left_eyes/3a76b1d9-a84c-419f-a5f5-375da469c28a.png b/sprites/spr_bionic_left_eyes/3a76b1d9-a84c-419f-a5f5-375da469c28a.png new file mode 100644 index 0000000000..6b75ca6454 Binary files /dev/null and b/sprites/spr_bionic_left_eyes/3a76b1d9-a84c-419f-a5f5-375da469c28a.png differ diff --git a/sprites/spr_bionic_left_eyes/84fee39f-d943-4d5c-96eb-328cb7868960.png b/sprites/spr_bionic_left_eyes/84fee39f-d943-4d5c-96eb-328cb7868960.png new file mode 100644 index 0000000000..858c289550 Binary files /dev/null and b/sprites/spr_bionic_left_eyes/84fee39f-d943-4d5c-96eb-328cb7868960.png differ diff --git a/sprites/spr_bionic_left_eyes/ae4bbb98-d515-4b56-bf1a-35a210a7ddde.png b/sprites/spr_bionic_left_eyes/ae4bbb98-d515-4b56-bf1a-35a210a7ddde.png new file mode 100644 index 0000000000..937cfcbfad Binary files /dev/null and b/sprites/spr_bionic_left_eyes/ae4bbb98-d515-4b56-bf1a-35a210a7ddde.png differ diff --git a/sprites/spr_bionic_left_eyes/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1.png b/sprites/spr_bionic_left_eyes/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1.png new file mode 100644 index 0000000000..adc84a5e22 Binary files /dev/null and b/sprites/spr_bionic_left_eyes/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1.png differ diff --git a/sprites/spr_bionic_left_eyes/e7f65790-3f61-4102-8f4f-1fdc5bb5706b.png b/sprites/spr_bionic_left_eyes/e7f65790-3f61-4102-8f4f-1fdc5bb5706b.png new file mode 100644 index 0000000000..2824c4dbb9 Binary files /dev/null and b/sprites/spr_bionic_left_eyes/e7f65790-3f61-4102-8f4f-1fdc5bb5706b.png differ diff --git a/sprites/spr_bionic_left_eyes/layers/3a76b1d9-a84c-419f-a5f5-375da469c28a/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png b/sprites/spr_bionic_left_eyes/layers/3a76b1d9-a84c-419f-a5f5-375da469c28a/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png new file mode 100644 index 0000000000..6b75ca6454 Binary files /dev/null and b/sprites/spr_bionic_left_eyes/layers/3a76b1d9-a84c-419f-a5f5-375da469c28a/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png differ diff --git a/sprites/spr_bionic_left_eyes/layers/84fee39f-d943-4d5c-96eb-328cb7868960/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png b/sprites/spr_bionic_left_eyes/layers/84fee39f-d943-4d5c-96eb-328cb7868960/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png new file mode 100644 index 0000000000..858c289550 Binary files /dev/null and b/sprites/spr_bionic_left_eyes/layers/84fee39f-d943-4d5c-96eb-328cb7868960/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png differ diff --git a/sprites/spr_bionic_left_eyes/layers/ae4bbb98-d515-4b56-bf1a-35a210a7ddde/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png b/sprites/spr_bionic_left_eyes/layers/ae4bbb98-d515-4b56-bf1a-35a210a7ddde/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png new file mode 100644 index 0000000000..937cfcbfad Binary files /dev/null and b/sprites/spr_bionic_left_eyes/layers/ae4bbb98-d515-4b56-bf1a-35a210a7ddde/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png differ diff --git a/sprites/spr_bionic_left_eyes/layers/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1/ab5572a3-6ec3-4246-b233-d520321f022c.png b/sprites/spr_bionic_left_eyes/layers/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1/ab5572a3-6ec3-4246-b233-d520321f022c.png new file mode 100644 index 0000000000..adc84a5e22 Binary files /dev/null and b/sprites/spr_bionic_left_eyes/layers/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1/ab5572a3-6ec3-4246-b233-d520321f022c.png differ diff --git a/sprites/spr_bionic_left_eyes/layers/e7f65790-3f61-4102-8f4f-1fdc5bb5706b/a994b48d-2ce5-4616-97c1-3fbcf74aa7bd.png b/sprites/spr_bionic_left_eyes/layers/e7f65790-3f61-4102-8f4f-1fdc5bb5706b/a994b48d-2ce5-4616-97c1-3fbcf74aa7bd.png new file mode 100644 index 0000000000..2824c4dbb9 Binary files /dev/null and b/sprites/spr_bionic_left_eyes/layers/e7f65790-3f61-4102-8f4f-1fdc5bb5706b/a994b48d-2ce5-4616-97c1-3fbcf74aa7bd.png differ diff --git a/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy b/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy new file mode 100644 index 0000000000..db6cdf34e1 --- /dev/null +++ b/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_bionic_left_eyes", + "bbox_bottom": 39, + "bbox_left": 84, + "bbox_right": 102, + "bbox_top": 22, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"84fee39f-d943-4d5c-96eb-328cb7868960",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ffe959c8-a6cf-4ae9-819b-7981e63e1c53","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "bionics", + "path": "folders/Sprites/Marine Viewer/bionics.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_bionic_left_eyes", + "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":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},},},"Disabled":false,"id":"b28cdb8f-d22c-4a36-ae78-60b9bfaa06d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},},},"Disabled":false,"id":"e755fe34-01b8-43ee-9b7b-6853fc630075","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},},},"Disabled":false,"id":"5d55ecb9-522e-4979-9234-e8bcd8048c58","IsCreationKey":false,"Key":2.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_bionic_right_arm/1760fafc-7f34-4184-937c-64a145f1e4e9.png b/sprites/spr_bionic_right_arm/1760fafc-7f34-4184-937c-64a145f1e4e9.png new file mode 100644 index 0000000000..19ad4db3d1 Binary files /dev/null and b/sprites/spr_bionic_right_arm/1760fafc-7f34-4184-937c-64a145f1e4e9.png differ diff --git a/sprites/spr_bionic_right_arm/cd829f66-11dc-4ec3-b718-e71b936e0974.png b/sprites/spr_bionic_right_arm/cd829f66-11dc-4ec3-b718-e71b936e0974.png new file mode 100644 index 0000000000..72bf5a44d8 Binary files /dev/null and b/sprites/spr_bionic_right_arm/cd829f66-11dc-4ec3-b718-e71b936e0974.png differ diff --git a/sprites/spr_bionic_right_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/Copied Layer 1.png b/sprites/spr_bionic_right_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/Copied Layer 1.png new file mode 100644 index 0000000000..3eaafeed02 Binary files /dev/null and b/sprites/spr_bionic_right_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/Copied Layer 1.png differ diff --git a/sprites/spr_bionic_right_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/f54e47d6-9977-4d33-b3c6-2d679214f713.png b/sprites/spr_bionic_right_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/f54e47d6-9977-4d33-b3c6-2d679214f713.png new file mode 100644 index 0000000000..6a50ba7c38 Binary files /dev/null and b/sprites/spr_bionic_right_arm/layers/1760fafc-7f34-4184-937c-64a145f1e4e9/f54e47d6-9977-4d33-b3c6-2d679214f713.png differ diff --git a/sprites/spr_bionic_right_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/Copied Layer 1.png b/sprites/spr_bionic_right_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/Copied Layer 1.png new file mode 100644 index 0000000000..f965e1aa9c Binary files /dev/null and b/sprites/spr_bionic_right_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/Copied Layer 1.png differ diff --git a/sprites/spr_bionic_right_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/f54e47d6-9977-4d33-b3c6-2d679214f713.png b/sprites/spr_bionic_right_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/f54e47d6-9977-4d33-b3c6-2d679214f713.png new file mode 100644 index 0000000000..6a50ba7c38 Binary files /dev/null and b/sprites/spr_bionic_right_arm/layers/cd829f66-11dc-4ec3-b718-e71b936e0974/f54e47d6-9977-4d33-b3c6-2d679214f713.png differ diff --git a/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy b/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy new file mode 100644 index 0000000000..e8b8c274df --- /dev/null +++ b/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy @@ -0,0 +1,77 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_bionic_right_arm", + "bbox_bottom": 125, + "bbox_left": 17, + "bbox_right": 47, + "bbox_top": 74, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1760fafc-7f34-4184-937c-64a145f1e4e9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cd829f66-11dc-4ec3-b718-e71b936e0974",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f54e47d6-9977-4d33-b3c6-2d679214f713","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"Copied Layer 1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "bionics", + "path": "folders/Sprites/Marine Viewer/bionics.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_bionic_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": 2.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":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},},},"Disabled":false,"id":"f40b0403-9c6e-4050-94b1-3fdb07c4949b","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},},},"Disabled":false,"id":"84ded38f-b057-4586-aeaf-f434c1ad998f","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, + "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_bionic_right_eyes/3a76b1d9-a84c-419f-a5f5-375da469c28a.png b/sprites/spr_bionic_right_eyes/3a76b1d9-a84c-419f-a5f5-375da469c28a.png new file mode 100644 index 0000000000..9b3f5e2506 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/3a76b1d9-a84c-419f-a5f5-375da469c28a.png differ diff --git a/sprites/spr_bionic_right_eyes/84fee39f-d943-4d5c-96eb-328cb7868960.png b/sprites/spr_bionic_right_eyes/84fee39f-d943-4d5c-96eb-328cb7868960.png new file mode 100644 index 0000000000..802a1b3d45 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/84fee39f-d943-4d5c-96eb-328cb7868960.png differ diff --git a/sprites/spr_bionic_right_eyes/ae4bbb98-d515-4b56-bf1a-35a210a7ddde.png b/sprites/spr_bionic_right_eyes/ae4bbb98-d515-4b56-bf1a-35a210a7ddde.png new file mode 100644 index 0000000000..bbf309e3d9 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/ae4bbb98-d515-4b56-bf1a-35a210a7ddde.png differ diff --git a/sprites/spr_bionic_right_eyes/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1.png b/sprites/spr_bionic_right_eyes/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1.png new file mode 100644 index 0000000000..adc84a5e22 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1.png differ diff --git a/sprites/spr_bionic_right_eyes/e7f65790-3f61-4102-8f4f-1fdc5bb5706b.png b/sprites/spr_bionic_right_eyes/e7f65790-3f61-4102-8f4f-1fdc5bb5706b.png new file mode 100644 index 0000000000..2824c4dbb9 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/e7f65790-3f61-4102-8f4f-1fdc5bb5706b.png differ diff --git a/sprites/spr_bionic_right_eyes/layers/3a76b1d9-a84c-419f-a5f5-375da469c28a/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png b/sprites/spr_bionic_right_eyes/layers/3a76b1d9-a84c-419f-a5f5-375da469c28a/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png new file mode 100644 index 0000000000..9b3f5e2506 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/layers/3a76b1d9-a84c-419f-a5f5-375da469c28a/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png differ diff --git a/sprites/spr_bionic_right_eyes/layers/84fee39f-d943-4d5c-96eb-328cb7868960/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png b/sprites/spr_bionic_right_eyes/layers/84fee39f-d943-4d5c-96eb-328cb7868960/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png new file mode 100644 index 0000000000..802a1b3d45 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/layers/84fee39f-d943-4d5c-96eb-328cb7868960/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png differ diff --git a/sprites/spr_bionic_right_eyes/layers/ae4bbb98-d515-4b56-bf1a-35a210a7ddde/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png b/sprites/spr_bionic_right_eyes/layers/ae4bbb98-d515-4b56-bf1a-35a210a7ddde/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png new file mode 100644 index 0000000000..bbf309e3d9 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/layers/ae4bbb98-d515-4b56-bf1a-35a210a7ddde/ffe959c8-a6cf-4ae9-819b-7981e63e1c53.png differ diff --git a/sprites/spr_bionic_right_eyes/layers/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1/ab5572a3-6ec3-4246-b233-d520321f022c.png b/sprites/spr_bionic_right_eyes/layers/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1/ab5572a3-6ec3-4246-b233-d520321f022c.png new file mode 100644 index 0000000000..adc84a5e22 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/layers/c56ba0ce-4a1c-45da-bf26-cb8e4d639bc1/ab5572a3-6ec3-4246-b233-d520321f022c.png differ diff --git a/sprites/spr_bionic_right_eyes/layers/e7f65790-3f61-4102-8f4f-1fdc5bb5706b/a994b48d-2ce5-4616-97c1-3fbcf74aa7bd.png b/sprites/spr_bionic_right_eyes/layers/e7f65790-3f61-4102-8f4f-1fdc5bb5706b/a994b48d-2ce5-4616-97c1-3fbcf74aa7bd.png new file mode 100644 index 0000000000..2824c4dbb9 Binary files /dev/null and b/sprites/spr_bionic_right_eyes/layers/e7f65790-3f61-4102-8f4f-1fdc5bb5706b/a994b48d-2ce5-4616-97c1-3fbcf74aa7bd.png differ diff --git a/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy b/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy new file mode 100644 index 0000000000..4290198ce6 --- /dev/null +++ b/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_bionic_right_eyes", + "bbox_bottom": 39, + "bbox_left": 64, + "bbox_right": 82, + "bbox_top": 22, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"84fee39f-d943-4d5c-96eb-328cb7868960",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ffe959c8-a6cf-4ae9-819b-7981e63e1c53","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "bionics", + "path": "folders/Sprites/Marine Viewer/bionics.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_bionic_right_eyes", + "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":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},},},"Disabled":false,"id":"63faba23-bea0-4293-b76a-0c67b3efa44c","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},},},"Disabled":false,"id":"a9cf283c-8a9c-4047-9850-5cc548a2862a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},},},"Disabled":false,"id":"f39a3fed-6e36-4af6-82d2-1ab2c62e00f7","IsCreationKey":false,"Key":2.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_chaplain_helm/570e9798-a363-4113-a62f-3329e557f4cf.png b/sprites/spr_chaplain_helm/570e9798-a363-4113-a62f-3329e557f4cf.png index c15b9f839e..ba22a9ba2e 100644 Binary files a/sprites/spr_chaplain_helm/570e9798-a363-4113-a62f-3329e557f4cf.png and b/sprites/spr_chaplain_helm/570e9798-a363-4113-a62f-3329e557f4cf.png differ diff --git a/sprites/spr_chaplain_helm/layers/570e9798-a363-4113-a62f-3329e557f4cf/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png b/sprites/spr_chaplain_helm/layers/570e9798-a363-4113-a62f-3329e557f4cf/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png index c15b9f839e..ba22a9ba2e 100644 Binary files a/sprites/spr_chaplain_helm/layers/570e9798-a363-4113-a62f-3329e557f4cf/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png and b/sprites/spr_chaplain_helm/layers/570e9798-a363-4113-a62f-3329e557f4cf/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png differ diff --git a/sprites/spr_chaplain_helm/spr_chaplain_helm.yy b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy index fe86ce76f6..68e1c6e2c8 100644 --- a/sprites/spr_chaplain_helm/spr_chaplain_helm.yy +++ b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy @@ -4,7 +4,7 @@ "name": "spr_chaplain_helm", "bbox_bottom": 44, "bbox_left": 68, - "bbox_right": 96, + "bbox_right": 97, "bbox_top": 14, "bboxMode": 0, "collisionKind": 1, diff --git a/sprites/spr_cloth_tabbard/7c76cecb-d2ce-4f4f-b157-64eba53bc857.png b/sprites/spr_cloth_tabbard/7c76cecb-d2ce-4f4f-b157-64eba53bc857.png index 36b6756880..8b5acf8bcb 100644 Binary files a/sprites/spr_cloth_tabbard/7c76cecb-d2ce-4f4f-b157-64eba53bc857.png and b/sprites/spr_cloth_tabbard/7c76cecb-d2ce-4f4f-b157-64eba53bc857.png differ diff --git a/sprites/spr_cloth_tabbard/layers/7c76cecb-d2ce-4f4f-b157-64eba53bc857/91113e17-3a28-4d70-a9e7-e9978ecfe4cb.png b/sprites/spr_cloth_tabbard/layers/7c76cecb-d2ce-4f4f-b157-64eba53bc857/91113e17-3a28-4d70-a9e7-e9978ecfe4cb.png index 36b6756880..8b5acf8bcb 100644 Binary files a/sprites/spr_cloth_tabbard/layers/7c76cecb-d2ce-4f4f-b157-64eba53bc857/91113e17-3a28-4d70-a9e7-e9978ecfe4cb.png and b/sprites/spr_cloth_tabbard/layers/7c76cecb-d2ce-4f4f-b157-64eba53bc857/91113e17-3a28-4d70-a9e7-e9978ecfe4cb.png differ diff --git a/sprites/spr_crux_on_chain/db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d.png b/sprites/spr_crux_on_chain/db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d.png new file mode 100644 index 0000000000..3b1e9beb53 Binary files /dev/null and b/sprites/spr_crux_on_chain/db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d.png differ diff --git a/sprites/spr_crux_on_chain/layers/db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d/614e1026-3d8d-4f05-b722-c00c86a41eb1.png b/sprites/spr_crux_on_chain/layers/db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d/614e1026-3d8d-4f05-b722-c00c86a41eb1.png new file mode 100644 index 0000000000..3b1e9beb53 Binary files /dev/null and b/sprites/spr_crux_on_chain/layers/db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d/614e1026-3d8d-4f05-b722-c00c86a41eb1.png differ diff --git a/sprites/spr_crux_on_chain/spr_crux_on_chain.yy b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy new file mode 100644 index 0000000000..77df87c6fb --- /dev/null +++ b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_crux_on_chain", + "bbox_bottom": 35, + "bbox_left": 0, + "bbox_right": 24, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"614e1026-3d8d-4f05-b722-c00c86a41eb1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "indomitus_complex", + "path": "folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_crux_on_chain", + "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":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},},},"Disabled":false,"id":"eca151ad-2626-4748-b179-608856db3925","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_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png b/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png index a127626556..d02cd42edc 100644 Binary files a/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png and b/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png differ diff --git a/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png b/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png index b63ec140aa..ff2657fd3a 100644 Binary files a/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png and b/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png differ diff --git a/sprites/spr_da_backpack/layers/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec/25a3433d-721c-49ce-8a7a-3513cf831ef5.png b/sprites/spr_da_backpack/layers/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec/25a3433d-721c-49ce-8a7a-3513cf831ef5.png index a127626556..d02cd42edc 100644 Binary files a/sprites/spr_da_backpack/layers/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec/25a3433d-721c-49ce-8a7a-3513cf831ef5.png and b/sprites/spr_da_backpack/layers/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec/25a3433d-721c-49ce-8a7a-3513cf831ef5.png differ diff --git a/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png b/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png index b63ec140aa..ff2657fd3a 100644 Binary files a/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png and b/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png differ diff --git a/sprites/spr_da_backpack/spr_da_backpack.yy b/sprites/spr_da_backpack/spr_da_backpack.yy index 15448b217a..2d60d2187a 100644 --- a/sprites/spr_da_backpack/spr_da_backpack.yy +++ b/sprites/spr_da_backpack/spr_da_backpack.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_da_backpack", - "bbox_bottom": 87, - "bbox_left": 37, - "bbox_right": 143, - "bbox_top": 61, + "bbox_bottom": 131, + "bbox_left": 29, + "bbox_right": 135, + "bbox_top": 8, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -18,7 +18,7 @@ ], "gridX": 0, "gridY": 0, - "height": 272, + "height": 232, "HTile": false, "layers": [ {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"25a3433d-721c-49ce-8a7a-3513cf831ef5","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, @@ -61,8 +61,8 @@ ], "visibleRange": null, "volume": 1.0, - "xorigin": 7, - "yorigin": 51, + "xorigin": 6, + "yorigin": 43, }, "swatchColours": null, "swfPrecision": 2.525, @@ -72,5 +72,5 @@ }, "type": 0, "VTile": false, - "width": 181, + "width": 164, } \ No newline at end of file diff --git a/sprites/spr_dev_pack_complex/e5637504-add9-474b-ae10-1e954d497810.png b/sprites/spr_dev_pack_complex/e5637504-add9-474b-ae10-1e954d497810.png new file mode 100644 index 0000000000..d3f7ae6e88 Binary files /dev/null and b/sprites/spr_dev_pack_complex/e5637504-add9-474b-ae10-1e954d497810.png differ diff --git a/sprites/spr_dev_pack_complex/ee39ecff-a565-42aa-99f0-f549f95bc5a0.png b/sprites/spr_dev_pack_complex/ee39ecff-a565-42aa-99f0-f549f95bc5a0.png new file mode 100644 index 0000000000..c9b1bee2cc Binary files /dev/null and b/sprites/spr_dev_pack_complex/ee39ecff-a565-42aa-99f0-f549f95bc5a0.png differ diff --git a/sprites/spr_dev_pack_complex/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png b/sprites/spr_dev_pack_complex/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png new file mode 100644 index 0000000000..d3f7ae6e88 Binary files /dev/null and b/sprites/spr_dev_pack_complex/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png differ diff --git a/sprites/spr_dev_pack_complex/layers/ee39ecff-a565-42aa-99f0-f549f95bc5a0/330f878c-cc0f-48bf-a507-68961e6c03cd.png b/sprites/spr_dev_pack_complex/layers/ee39ecff-a565-42aa-99f0-f549f95bc5a0/330f878c-cc0f-48bf-a507-68961e6c03cd.png new file mode 100644 index 0000000000..c9b1bee2cc Binary files /dev/null and b/sprites/spr_dev_pack_complex/layers/ee39ecff-a565-42aa-99f0-f549f95bc5a0/330f878c-cc0f-48bf-a507-68961e6c03cd.png differ diff --git a/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy new file mode 100644 index 0000000000..c3c5d7c3e0 --- /dev/null +++ b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy @@ -0,0 +1,76 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_dev_pack_complex", + "bbox_bottom": 37, + "bbox_left": 54, + "bbox_right": 113, + "bbox_top": 5, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e5637504-add9-474b-ae10-1e954d497810",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0",}, + ], + "gridX": 0, + "gridY": 0, + "height": 272, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"330f878c-cc0f-48bf-a507-68961e6c03cd","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "packs", + "path": "folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_dev_pack_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": 2.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":"e5637504-add9-474b-ae10-1e954d497810","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},},},"Disabled":false,"id":"36fcc4b6-c054-4c76-9a1c-67bc678fa11d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","path":"sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy",},},},"Disabled":false,"id":"c77ca9f7-3220-4d01-a6cc-c19084c25a7c","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, + "yorigin": 0, + }, + "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_dreadnought_chasis_colors/643bbde4-1fea-4393-8d81-fd6c3ced5272.png b/sprites/spr_dreadnought_chasis_colors/643bbde4-1fea-4393-8d81-fd6c3ced5272.png index cc0184a778..b6d3bd5416 100644 Binary files a/sprites/spr_dreadnought_chasis_colors/643bbde4-1fea-4393-8d81-fd6c3ced5272.png and b/sprites/spr_dreadnought_chasis_colors/643bbde4-1fea-4393-8d81-fd6c3ced5272.png differ diff --git a/sprites/spr_dreadnought_chasis_colors/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png b/sprites/spr_dreadnought_chasis_colors/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png index 96d0d34036..c274b6dc5e 100644 Binary files a/sprites/spr_dreadnought_chasis_colors/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png and b/sprites/spr_dreadnought_chasis_colors/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png differ diff --git a/sprites/spr_dreadnought_chasis_colors/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dreadnought_chasis_colors/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png index cc0184a778..b6d3bd5416 100644 Binary files a/sprites/spr_dreadnought_chasis_colors/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and b/sprites/spr_dreadnought_chasis_colors/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png differ diff --git a/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy index 6022a94a21..9bf6726fe8 100644 --- a/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy +++ b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy @@ -13,8 +13,6 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"aabebdae-4337-4746-b7cf-292919a40ce4",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272",}, ], "gridX": 0, @@ -46,7 +44,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,9 +55,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":"aabebdae-4337-4746-b7cf-292919a40ce4","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},},},"Disabled":false,"id":"f16c4711-629a-43ed-a5c8-57c7fbc6402c","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},},},"Disabled":false,"id":"bfb32420-43d2-46cf-818f-54bf41a6bec8","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},},},"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},},},"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","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_dreadnought_chasis_colors/113b3a46-7ce2-45a1-87a5-79b52a0f3314.png b/sprites/spr_dreadnought_complex/113b3a46-7ce2-45a1-87a5-79b52a0f3314.png similarity index 97% rename from sprites/spr_dreadnought_chasis_colors/113b3a46-7ce2-45a1-87a5-79b52a0f3314.png rename to sprites/spr_dreadnought_complex/113b3a46-7ce2-45a1-87a5-79b52a0f3314.png index 0f61569a39..34e59827ef 100644 Binary files a/sprites/spr_dreadnought_chasis_colors/113b3a46-7ce2-45a1-87a5-79b52a0f3314.png and b/sprites/spr_dreadnought_complex/113b3a46-7ce2-45a1-87a5-79b52a0f3314.png differ diff --git a/sprites/spr_dreadnought_complex/643bbde4-1fea-4393-8d81-fd6c3ced5272.png b/sprites/spr_dreadnought_complex/643bbde4-1fea-4393-8d81-fd6c3ced5272.png new file mode 100644 index 0000000000..c07197a611 Binary files /dev/null and b/sprites/spr_dreadnought_complex/643bbde4-1fea-4393-8d81-fd6c3ced5272.png differ diff --git a/sprites/spr_dreadnought_chasis_colors/aabebdae-4337-4746-b7cf-292919a40ce4.png b/sprites/spr_dreadnought_complex/aabebdae-4337-4746-b7cf-292919a40ce4.png similarity index 97% rename from sprites/spr_dreadnought_chasis_colors/aabebdae-4337-4746-b7cf-292919a40ce4.png rename to sprites/spr_dreadnought_complex/aabebdae-4337-4746-b7cf-292919a40ce4.png index 57e430e4d6..77166b575a 100644 Binary files a/sprites/spr_dreadnought_chasis_colors/aabebdae-4337-4746-b7cf-292919a40ce4.png and b/sprites/spr_dreadnought_complex/aabebdae-4337-4746-b7cf-292919a40ce4.png differ diff --git a/sprites/spr_dreadnought_chasis_colors/layers/113b3a46-7ce2-45a1-87a5-79b52a0f3314/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png b/sprites/spr_dreadnought_complex/layers/113b3a46-7ce2-45a1-87a5-79b52a0f3314/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png similarity index 100% rename from sprites/spr_dreadnought_chasis_colors/layers/113b3a46-7ce2-45a1-87a5-79b52a0f3314/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png rename to sprites/spr_dreadnought_complex/layers/113b3a46-7ce2-45a1-87a5-79b52a0f3314/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png diff --git a/sprites/spr_dreadnought_chasis_colors/layers/113b3a46-7ce2-45a1-87a5-79b52a0f3314/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dreadnought_complex/layers/113b3a46-7ce2-45a1-87a5-79b52a0f3314/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png similarity index 100% rename from sprites/spr_dreadnought_chasis_colors/layers/113b3a46-7ce2-45a1-87a5-79b52a0f3314/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png rename to sprites/spr_dreadnought_complex/layers/113b3a46-7ce2-45a1-87a5-79b52a0f3314/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png diff --git a/sprites/spr_dreadnought_chasis_colors/layers/aabebdae-4337-4746-b7cf-292919a40ce4/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png b/sprites/spr_dreadnought_complex/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png similarity index 100% rename from sprites/spr_dreadnought_chasis_colors/layers/aabebdae-4337-4746-b7cf-292919a40ce4/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png rename to sprites/spr_dreadnought_complex/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png diff --git a/sprites/spr_dreadnought_complex/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dreadnought_complex/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png new file mode 100644 index 0000000000..cc0184a778 Binary files /dev/null and b/sprites/spr_dreadnought_complex/layers/643bbde4-1fea-4393-8d81-fd6c3ced5272/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png differ diff --git a/sprites/spr_dreadnought_complex/layers/aabebdae-4337-4746-b7cf-292919a40ce4/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png b/sprites/spr_dreadnought_complex/layers/aabebdae-4337-4746-b7cf-292919a40ce4/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png new file mode 100644 index 0000000000..96d0d34036 Binary files /dev/null and b/sprites/spr_dreadnought_complex/layers/aabebdae-4337-4746-b7cf-292919a40ce4/3f5ab5d7-70e5-4bea-8d78-83effe5d97c7.png differ diff --git a/sprites/spr_dreadnought_chasis_colors/layers/aabebdae-4337-4746-b7cf-292919a40ce4/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dreadnought_complex/layers/aabebdae-4337-4746-b7cf-292919a40ce4/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png similarity index 100% rename from sprites/spr_dreadnought_chasis_colors/layers/aabebdae-4337-4746-b7cf-292919a40ce4/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png rename to sprites/spr_dreadnought_complex/layers/aabebdae-4337-4746-b7cf-292919a40ce4/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png diff --git a/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy b/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy new file mode 100644 index 0000000000..c0dc05470d --- /dev/null +++ b/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy @@ -0,0 +1,79 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_dreadnought_complex", + "bbox_bottom": 207, + "bbox_left": 25, + "bbox_right": 182, + "bbox_top": 20, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"aabebdae-4337-4746-b7cf-292919a40ce4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3f5ab5d7-70e5-4bea-8d78-83effe5d97c7","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"818626e5-59b3-4a3c-9f1b-002f98b5e6d3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "dreadnought", + "path": "folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_dreadnought_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": 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":"aabebdae-4337-4746-b7cf-292919a40ce4","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},},},"Disabled":false,"id":"65bae6f8-d3e2-4194-bb96-1b9a164e1363","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},},},"Disabled":false,"id":"6dd38061-8f30-4017-9c12-2a438b531089","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},},},"Disabled":false,"id":"af61cb93-84de-4fd7-8b9f-571f6d621427","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 24, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 197, +} \ No newline at end of file diff --git a/sprites/spr_gear_librarian_term/c686bbde-e480-472c-bb08-d523ecc16fd7.png b/sprites/spr_gear_librarian_term/c686bbde-e480-472c-bb08-d523ecc16fd7.png new file mode 100644 index 0000000000..351242cf67 Binary files /dev/null and b/sprites/spr_gear_librarian_term/c686bbde-e480-472c-bb08-d523ecc16fd7.png differ diff --git a/sprites/spr_gear_librarian_term/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/da293a72-4179-44b2-91ee-3d67ced4a24f.png b/sprites/spr_gear_librarian_term/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/da293a72-4179-44b2-91ee-3d67ced4a24f.png new file mode 100644 index 0000000000..351242cf67 Binary files /dev/null and b/sprites/spr_gear_librarian_term/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/da293a72-4179-44b2-91ee-3d67ced4a24f.png differ diff --git a/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy b/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy new file mode 100644 index 0000000000..4d28e7aab4 --- /dev/null +++ b/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_gear_librarian_term", + "bbox_bottom": 68, + "bbox_left": 11, + "bbox_right": 33, + "bbox_top": 45, + "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_term", + "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_term/spr_gear_librarian_term.yy",},},},"Disabled":false,"id":"667c99aa-306d-4da1-a87a-14e37704f784","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_gear_techb/a3bd7913-7f8a-4295-966a-f682bf92a8c6.png b/sprites/spr_gear_techb/a3bd7913-7f8a-4295-966a-f682bf92a8c6.png deleted file mode 100644 index 74e6481dee..0000000000 Binary files a/sprites/spr_gear_techb/a3bd7913-7f8a-4295-966a-f682bf92a8c6.png and /dev/null differ diff --git a/sprites/spr_gear_techb/c686bbde-e480-472c-bb08-d523ecc16fd7.png b/sprites/spr_gear_techb/c686bbde-e480-472c-bb08-d523ecc16fd7.png deleted file mode 100644 index e2ad026973..0000000000 Binary files a/sprites/spr_gear_techb/c686bbde-e480-472c-bb08-d523ecc16fd7.png and /dev/null differ diff --git a/sprites/spr_gear_techb/layers/a3bd7913-7f8a-4295-966a-f682bf92a8c6/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png b/sprites/spr_gear_techb/layers/a3bd7913-7f8a-4295-966a-f682bf92a8c6/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png deleted file mode 100644 index 74e6481dee..0000000000 Binary files a/sprites/spr_gear_techb/layers/a3bd7913-7f8a-4295-966a-f682bf92a8c6/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png and /dev/null differ diff --git a/sprites/spr_gear_techb/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png b/sprites/spr_gear_techb/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png deleted file mode 100644 index e2ad026973..0000000000 Binary files a/sprites/spr_gear_techb/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png and /dev/null differ diff --git a/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png b/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png new file mode 100644 index 0000000000..04b591eb74 Binary files /dev/null and b/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png differ diff --git a/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png b/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png new file mode 100644 index 0000000000..04b591eb74 Binary files /dev/null and b/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png differ diff --git a/sprites/spr_gladiator_crest/spr_gladiator_crest.yy b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy new file mode 100644 index 0000000000..8b08ed9941 --- /dev/null +++ b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_gladiator_crest", + "bbox_bottom": 70, + "bbox_left": 54, + "bbox_right": 112, + "bbox_top": 29, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ff8c3aa8-dc36-45e8-b043-45038d329396",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"020e45fd-27e1-48c7-801f-deacfe57d9c1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "dark_angels", + "path": "folders/Sprites/Marine Viewer/helms/dark_angels.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_gladiator_crest", + "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":"ff8c3aa8-dc36-45e8-b043-45038d329396","path":"sprites/spr_gladiator_crest/spr_gladiator_crest.yy",},},},"Disabled":false,"id":"9b14dec7-6f59-49b0-8561-5319c7501f32","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": 40, + }, + "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_indomitus_belt/379a95d4-e686-4cd0-bae4-d6538fe00566.png b/sprites/spr_indomitus_belt/379a95d4-e686-4cd0-bae4-d6538fe00566.png new file mode 100644 index 0000000000..f5a857eaf4 Binary files /dev/null and b/sprites/spr_indomitus_belt/379a95d4-e686-4cd0-bae4-d6538fe00566.png differ diff --git a/sprites/spr_indomitus_belt/3974ad3d-d41e-4056-8cc6-6e5d870fd56e.png b/sprites/spr_indomitus_belt/3974ad3d-d41e-4056-8cc6-6e5d870fd56e.png new file mode 100644 index 0000000000..487be43d64 Binary files /dev/null and b/sprites/spr_indomitus_belt/3974ad3d-d41e-4056-8cc6-6e5d870fd56e.png differ diff --git a/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png new file mode 100644 index 0000000000..65c0b2578c Binary files /dev/null and b/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_belt/layers/379a95d4-e686-4cd0-bae4-d6538fe00566/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_belt/layers/379a95d4-e686-4cd0-bae4-d6538fe00566/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..f5a857eaf4 Binary files /dev/null and b/sprites/spr_indomitus_belt/layers/379a95d4-e686-4cd0-bae4-d6538fe00566/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_belt/layers/3974ad3d-d41e-4056-8cc6-6e5d870fd56e/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_belt/layers/3974ad3d-d41e-4056-8cc6-6e5d870fd56e/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..487be43d64 Binary files /dev/null and b/sprites/spr_indomitus_belt/layers/3974ad3d-d41e-4056-8cc6-6e5d870fd56e/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..65c0b2578c Binary files /dev/null and b/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_belt/spr_indomitus_belt.yy b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy new file mode 100644 index 0000000000..8ea8ddfa5e --- /dev/null +++ b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_indomitus_belt", + "bbox_bottom": 136, + "bbox_left": 34, + "bbox_right": 131, + "bbox_top": 46, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7173924c-400c-4ee3-8b3d-0123aa659415",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"379a95d4-e686-4cd0-bae4-d6538fe00566",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e",}, + ], + "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_belt", + "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":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},},},"Disabled":false,"id":"0ad9035b-9bda-4936-9f2e-2ce26793a018","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"379a95d4-e686-4cd0-bae4-d6538fe00566","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},},},"Disabled":false,"id":"4f184b9f-eef4-4a86-a538-61303e8cf300","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},},},"Disabled":false,"id":"36d12149-c9ad-4f8b-9e33-e79eea03b9a1","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/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png index d5353f1bdd..84ca304124 100644 Binary files a/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png and b/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png index d5353f1bdd..84ca304124 100644 Binary files a/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png and b/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_knightly_robe/05afe988-9760-4afd-a9a3-082287887f4a.png b/sprites/spr_indomitus_knightly_robe/05afe988-9760-4afd-a9a3-082287887f4a.png new file mode 100644 index 0000000000..8304d7ac14 Binary files /dev/null and b/sprites/spr_indomitus_knightly_robe/05afe988-9760-4afd-a9a3-082287887f4a.png differ diff --git a/sprites/spr_indomitus_knightly_robe/layers/05afe988-9760-4afd-a9a3-082287887f4a/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_knightly_robe/layers/05afe988-9760-4afd-a9a3-082287887f4a/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..8304d7ac14 Binary files /dev/null and b/sprites/spr_indomitus_knightly_robe/layers/05afe988-9760-4afd-a9a3-082287887f4a/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy new file mode 100644 index 0000000000..bdc71ca959 --- /dev/null +++ b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_indomitus_knightly_robe", + "bbox_bottom": 238, + "bbox_left": 58, + "bbox_right": 126, + "bbox_top": 74, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"05afe988-9760-4afd-a9a3-082287887f4a",}, + ], + "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_knightly_robe", + "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":"05afe988-9760-4afd-a9a3-082287887f4a","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},},},"Disabled":false,"id":"2e9b4aa7-44d1-4787-b28e-c7cd47428006","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_jump_pack_complex/c5bc43cd-b567-4673-92b9-efede7a0b44f.png b/sprites/spr_jump_pack_complex/c5bc43cd-b567-4673-92b9-efede7a0b44f.png new file mode 100644 index 0000000000..0eb23c1554 Binary files /dev/null and b/sprites/spr_jump_pack_complex/c5bc43cd-b567-4673-92b9-efede7a0b44f.png differ diff --git a/sprites/spr_jump_pack_complex/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png b/sprites/spr_jump_pack_complex/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png new file mode 100644 index 0000000000..0eb23c1554 Binary files /dev/null and b/sprites/spr_jump_pack_complex/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png differ diff --git a/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy new file mode 100644 index 0000000000..8d1326fd93 --- /dev/null +++ b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_jump_pack_complex", + "bbox_bottom": 77, + "bbox_left": 10, + "bbox_right": 157, + "bbox_top": 2, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"0e8b239a-6017-4ba5-8cbe-9353a86768ec","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "packs", + "path": "folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_jump_pack_complex", + "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":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy",},},},"Disabled":false,"id":"ee2f8787-456f-461c-b7c9-774ea1070012","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_knightly_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_knightly_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000..647e60fca4 Binary files /dev/null and b/sprites/spr_knightly_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_knightly_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_knightly_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..647e60fca4 Binary files /dev/null and b/sprites/spr_knightly_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_knightly_belt/spr_knightly_belt.yy b/sprites/spr_knightly_belt/spr_knightly_belt.yy new file mode 100644 index 0000000000..5566990ef3 --- /dev/null +++ b/sprites/spr_knightly_belt/spr_knightly_belt.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_knightly_belt", + "bbox_bottom": 114, + "bbox_left": 56, + "bbox_right": 107, + "bbox_top": 82, + "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_knightly_belt", + "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_knightly_belt/spr_knightly_belt.yy",},},},"Disabled":false,"id":"68badb9c-da79-4a80-b8c4-f9962a02da21","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_knightly_personal_livery/024f569c-a0dc-465d-a295-994d80ecdc72.png b/sprites/spr_knightly_personal_livery/024f569c-a0dc-465d-a295-994d80ecdc72.png new file mode 100644 index 0000000000..cd317b0fc1 Binary files /dev/null and b/sprites/spr_knightly_personal_livery/024f569c-a0dc-465d-a295-994d80ecdc72.png differ diff --git a/sprites/spr_knightly_personal_livery/214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c.png b/sprites/spr_knightly_personal_livery/214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c.png new file mode 100644 index 0000000000..a0d83c702e Binary files /dev/null and b/sprites/spr_knightly_personal_livery/214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c.png differ diff --git a/sprites/spr_knightly_personal_livery/2f1a13d5-6930-4af9-8bec-8646b5b779d4.png b/sprites/spr_knightly_personal_livery/2f1a13d5-6930-4af9-8bec-8646b5b779d4.png new file mode 100644 index 0000000000..adb3e8d618 Binary files /dev/null and b/sprites/spr_knightly_personal_livery/2f1a13d5-6930-4af9-8bec-8646b5b779d4.png differ diff --git a/sprites/spr_knightly_personal_livery/aaf65e00-98e5-4655-b105-2c4a6c74b695.png b/sprites/spr_knightly_personal_livery/aaf65e00-98e5-4655-b105-2c4a6c74b695.png new file mode 100644 index 0000000000..4c11e774e2 Binary files /dev/null and b/sprites/spr_knightly_personal_livery/aaf65e00-98e5-4655-b105-2c4a6c74b695.png differ diff --git a/sprites/spr_knightly_personal_livery/e61c9db0-a400-41d3-8c2d-e44ec1ac97dc.png b/sprites/spr_knightly_personal_livery/e61c9db0-a400-41d3-8c2d-e44ec1ac97dc.png new file mode 100644 index 0000000000..9f91534fdf Binary files /dev/null and b/sprites/spr_knightly_personal_livery/e61c9db0-a400-41d3-8c2d-e44ec1ac97dc.png differ diff --git a/sprites/spr_knightly_personal_livery/layers/024f569c-a0dc-465d-a295-994d80ecdc72/4d9f899a-b6d8-49b1-9e76-0086b656f556.png b/sprites/spr_knightly_personal_livery/layers/024f569c-a0dc-465d-a295-994d80ecdc72/4d9f899a-b6d8-49b1-9e76-0086b656f556.png new file mode 100644 index 0000000000..cd317b0fc1 Binary files /dev/null and b/sprites/spr_knightly_personal_livery/layers/024f569c-a0dc-465d-a295-994d80ecdc72/4d9f899a-b6d8-49b1-9e76-0086b656f556.png differ diff --git a/sprites/spr_knightly_personal_livery/layers/214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c/4d9f899a-b6d8-49b1-9e76-0086b656f556.png b/sprites/spr_knightly_personal_livery/layers/214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c/4d9f899a-b6d8-49b1-9e76-0086b656f556.png new file mode 100644 index 0000000000..a0d83c702e Binary files /dev/null and b/sprites/spr_knightly_personal_livery/layers/214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c/4d9f899a-b6d8-49b1-9e76-0086b656f556.png differ diff --git a/sprites/spr_knightly_personal_livery/layers/2f1a13d5-6930-4af9-8bec-8646b5b779d4/4d9f899a-b6d8-49b1-9e76-0086b656f556.png b/sprites/spr_knightly_personal_livery/layers/2f1a13d5-6930-4af9-8bec-8646b5b779d4/4d9f899a-b6d8-49b1-9e76-0086b656f556.png new file mode 100644 index 0000000000..adb3e8d618 Binary files /dev/null and b/sprites/spr_knightly_personal_livery/layers/2f1a13d5-6930-4af9-8bec-8646b5b779d4/4d9f899a-b6d8-49b1-9e76-0086b656f556.png differ diff --git a/sprites/spr_knightly_personal_livery/layers/aaf65e00-98e5-4655-b105-2c4a6c74b695/4d9f899a-b6d8-49b1-9e76-0086b656f556.png b/sprites/spr_knightly_personal_livery/layers/aaf65e00-98e5-4655-b105-2c4a6c74b695/4d9f899a-b6d8-49b1-9e76-0086b656f556.png new file mode 100644 index 0000000000..4c11e774e2 Binary files /dev/null and b/sprites/spr_knightly_personal_livery/layers/aaf65e00-98e5-4655-b105-2c4a6c74b695/4d9f899a-b6d8-49b1-9e76-0086b656f556.png differ diff --git a/sprites/spr_knightly_personal_livery/layers/e61c9db0-a400-41d3-8c2d-e44ec1ac97dc/4d9f899a-b6d8-49b1-9e76-0086b656f556.png b/sprites/spr_knightly_personal_livery/layers/e61c9db0-a400-41d3-8c2d-e44ec1ac97dc/4d9f899a-b6d8-49b1-9e76-0086b656f556.png new file mode 100644 index 0000000000..9f91534fdf Binary files /dev/null and b/sprites/spr_knightly_personal_livery/layers/e61c9db0-a400-41d3-8c2d-e44ec1ac97dc/4d9f899a-b6d8-49b1-9e76-0086b656f556.png differ diff --git a/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy b/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy new file mode 100644 index 0000000000..fa1cc1b942 --- /dev/null +++ b/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy @@ -0,0 +1,82 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_knightly_personal_livery", + "bbox_bottom": 147, + "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":"aaf65e00-98e5-4655-b105-2c4a6c74b695",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"024f569c-a0dc-465d-a295-994d80ecdc72",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc",}, + ], + "gridX": 0, + "gridY": 0, + "height": 272, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4d9f899a-b6d8-49b1-9e76-0086b656f556","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "dark_angels_specials", + "path": "folders/Sprites/Marine Viewer/body_types/specialist/dark_angels_specials.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_knightly_personal_livery", + "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":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},},},"Disabled":false,"id":"98d44b30-9d1d-49f6-a2d8-9a187c5b55eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"024f569c-a0dc-465d-a295-994d80ecdc72","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},},},"Disabled":false,"id":"e0128610-1f4f-4c1f-8ff4-b347f2d3f35b","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},},},"Disabled":false,"id":"c39acfe9-3000-43ce-be3a-b1bb15a4f80a","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},},},"Disabled":false,"id":"43ef9db9-df65-4ceb-9a93-80c7a7f4cd9b","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},},},"Disabled":false,"id":"1474bec5-4278-4ec1-8ff2-9846b8eb8267","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 7, + "yorigin": 51, + }, + "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_knightly_robes/9a188b5e-581b-4e24-a278-56e5c336a324.png b/sprites/spr_knightly_robes/9a188b5e-581b-4e24-a278-56e5c336a324.png new file mode 100644 index 0000000000..e63dcdfa5f Binary files /dev/null and b/sprites/spr_knightly_robes/9a188b5e-581b-4e24-a278-56e5c336a324.png differ diff --git a/sprites/spr_knightly_robes/a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2.png b/sprites/spr_knightly_robes/a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2.png new file mode 100644 index 0000000000..18edd5ffe8 Binary files /dev/null and b/sprites/spr_knightly_robes/a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2.png differ diff --git a/sprites/spr_knightly_robes/d50f61ee-1ed4-4329-a0d3-20176ffc6a71.png b/sprites/spr_knightly_robes/d50f61ee-1ed4-4329-a0d3-20176ffc6a71.png new file mode 100644 index 0000000000..137efe7ae2 Binary files /dev/null and b/sprites/spr_knightly_robes/d50f61ee-1ed4-4329-a0d3-20176ffc6a71.png differ diff --git a/sprites/spr_knightly_robes/layers/9a188b5e-581b-4e24-a278-56e5c336a324/fa0a6f66-bb47-4bd7-b9a2-e04e218716b4.png b/sprites/spr_knightly_robes/layers/9a188b5e-581b-4e24-a278-56e5c336a324/fa0a6f66-bb47-4bd7-b9a2-e04e218716b4.png new file mode 100644 index 0000000000..e63dcdfa5f Binary files /dev/null and b/sprites/spr_knightly_robes/layers/9a188b5e-581b-4e24-a278-56e5c336a324/fa0a6f66-bb47-4bd7-b9a2-e04e218716b4.png differ diff --git a/sprites/spr_knightly_robes/layers/a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2/fa0a6f66-bb47-4bd7-b9a2-e04e218716b4.png b/sprites/spr_knightly_robes/layers/a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2/fa0a6f66-bb47-4bd7-b9a2-e04e218716b4.png new file mode 100644 index 0000000000..18edd5ffe8 Binary files /dev/null and b/sprites/spr_knightly_robes/layers/a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2/fa0a6f66-bb47-4bd7-b9a2-e04e218716b4.png differ diff --git a/sprites/spr_knightly_robes/layers/d50f61ee-1ed4-4329-a0d3-20176ffc6a71/fa0a6f66-bb47-4bd7-b9a2-e04e218716b4.png b/sprites/spr_knightly_robes/layers/d50f61ee-1ed4-4329-a0d3-20176ffc6a71/fa0a6f66-bb47-4bd7-b9a2-e04e218716b4.png new file mode 100644 index 0000000000..137efe7ae2 Binary files /dev/null and b/sprites/spr_knightly_robes/layers/d50f61ee-1ed4-4329-a0d3-20176ffc6a71/fa0a6f66-bb47-4bd7-b9a2-e04e218716b4.png differ diff --git a/sprites/spr_knightly_robes/spr_knightly_robes.yy b/sprites/spr_knightly_robes/spr_knightly_robes.yy new file mode 100644 index 0000000000..55b94f474e --- /dev/null +++ b/sprites/spr_knightly_robes/spr_knightly_robes.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_knightly_robes", + "bbox_bottom": 200, + "bbox_left": 10, + "bbox_right": 145, + "bbox_top": 13, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9a188b5e-581b-4e24-a278-56e5c336a324",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fa0a6f66-bb47-4bd7-b9a2-e04e218716b4","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "dark_angels_specials", + "path": "folders/Sprites/Marine Viewer/body_types/specialist/dark_angels_specials.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_knightly_robes", + "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":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},},},"Disabled":false,"id":"760e0b63-7d42-41be-ab4b-ea3807fb2c02","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9a188b5e-581b-4e24-a278-56e5c336a324","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},},},"Disabled":false,"id":"1f61c39e-e9b8-40cc-8f58-c42eb3501c63","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},},},"Disabled":false,"id":"3ef4e6ac-c7c0-4c77-88e2-b471a1031483","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_lion_belt/dbb220c9-62b6-4ca7-a13f-5951132d0d13.png b/sprites/spr_lion_belt/dbb220c9-62b6-4ca7-a13f-5951132d0d13.png new file mode 100644 index 0000000000..2c3684c730 Binary files /dev/null and b/sprites/spr_lion_belt/dbb220c9-62b6-4ca7-a13f-5951132d0d13.png differ diff --git a/sprites/spr_lion_belt/layers/dbb220c9-62b6-4ca7-a13f-5951132d0d13/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_lion_belt/layers/dbb220c9-62b6-4ca7-a13f-5951132d0d13/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..2c3684c730 Binary files /dev/null and b/sprites/spr_lion_belt/layers/dbb220c9-62b6-4ca7-a13f-5951132d0d13/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_lion_belt/spr_lion_belt.yy b/sprites/spr_lion_belt/spr_lion_belt.yy new file mode 100644 index 0000000000..1538ff34bb --- /dev/null +++ b/sprites/spr_lion_belt/spr_lion_belt.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_lion_belt", + "bbox_bottom": 106, + "bbox_left": 53, + "bbox_right": 113, + "bbox_top": 86, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13",}, + ], + "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_lion_belt", + "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":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_lion_belt/spr_lion_belt.yy",},},},"Disabled":false,"id":"83a8fffe-2541-46cc-9cd5-08e04842f492","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_marksmans_honor/03289b4f-ccaf-48a8-b0b7-c2a4141465d1.png b/sprites/spr_marksmans_honor/03289b4f-ccaf-48a8-b0b7-c2a4141465d1.png new file mode 100644 index 0000000000..c753e3be46 Binary files /dev/null and b/sprites/spr_marksmans_honor/03289b4f-ccaf-48a8-b0b7-c2a4141465d1.png differ diff --git a/sprites/spr_marksmans_honor/6ebea8d5-984d-4402-9aaf-ec60793fd75d.png b/sprites/spr_marksmans_honor/6ebea8d5-984d-4402-9aaf-ec60793fd75d.png new file mode 100644 index 0000000000..b5a468ff55 Binary files /dev/null and b/sprites/spr_marksmans_honor/6ebea8d5-984d-4402-9aaf-ec60793fd75d.png differ diff --git a/sprites/spr_marksmans_honor/layers/03289b4f-ccaf-48a8-b0b7-c2a4141465d1/b13c7b08-3fb1-4c80-9bf8-27a303307288.png b/sprites/spr_marksmans_honor/layers/03289b4f-ccaf-48a8-b0b7-c2a4141465d1/b13c7b08-3fb1-4c80-9bf8-27a303307288.png new file mode 100644 index 0000000000..c753e3be46 Binary files /dev/null and b/sprites/spr_marksmans_honor/layers/03289b4f-ccaf-48a8-b0b7-c2a4141465d1/b13c7b08-3fb1-4c80-9bf8-27a303307288.png differ diff --git a/sprites/spr_marksmans_honor/layers/6ebea8d5-984d-4402-9aaf-ec60793fd75d/b13c7b08-3fb1-4c80-9bf8-27a303307288.png b/sprites/spr_marksmans_honor/layers/6ebea8d5-984d-4402-9aaf-ec60793fd75d/b13c7b08-3fb1-4c80-9bf8-27a303307288.png new file mode 100644 index 0000000000..b5a468ff55 Binary files /dev/null and b/sprites/spr_marksmans_honor/layers/6ebea8d5-984d-4402-9aaf-ec60793fd75d/b13c7b08-3fb1-4c80-9bf8-27a303307288.png differ diff --git a/sprites/spr_marksmans_honor/spr_marksmans_honor.yy b/sprites/spr_marksmans_honor/spr_marksmans_honor.yy new file mode 100644 index 0000000000..63d89398e1 --- /dev/null +++ b/sprites/spr_marksmans_honor/spr_marksmans_honor.yy @@ -0,0 +1,76 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_marksmans_honor", + "bbox_bottom": 26, + "bbox_left": 5, + "bbox_right": 14, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b13c7b08-3fb1-4c80-9bf8-27a303307288","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "specialist", + "path": "folders/Sprites/Marine Viewer/body_types/specialist.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_marksmans_honor", + "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": 2.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":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},},},"Disabled":false,"id":"ccb9b2a6-2d8d-4fe5-8d85-f4cf871046a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},},},"Disabled":false,"id":"399cb25a-d0c4-4928-b1ba-0f988b480254","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, + "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_metal_tabbard/c686bbde-e480-472c-bb08-d523ecc16fd7.png b/sprites/spr_metal_tabbard/c686bbde-e480-472c-bb08-d523ecc16fd7.png new file mode 100644 index 0000000000..9242a9a42e Binary files /dev/null and b/sprites/spr_metal_tabbard/c686bbde-e480-472c-bb08-d523ecc16fd7.png differ diff --git a/sprites/spr_metal_tabbard/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png b/sprites/spr_metal_tabbard/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png new file mode 100644 index 0000000000..9242a9a42e Binary files /dev/null and b/sprites/spr_metal_tabbard/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png differ diff --git a/sprites/spr_gear_techb/spr_gear_techb.yy b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy similarity index 74% rename from sprites/spr_gear_techb/spr_gear_techb.yy rename to sprites/spr_metal_tabbard/spr_metal_tabbard.yy index 492803f84a..ae21103ea0 100644 --- a/sprites/spr_gear_techb/spr_gear_techb.yy +++ b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy @@ -1,11 +1,11 @@ { "resourceType": "GMSprite", "resourceVersion": "1.0", - "name": "spr_gear_techb", + "name": "spr_metal_tabbard", "bbox_bottom": 226, - "bbox_left": 62, - "bbox_right": 104, - "bbox_top": 85, + "bbox_left": 65, + "bbox_right": 103, + "bbox_top": 102, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -14,7 +14,6 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c686bbde-e480-472c-bb08-d523ecc16fd7",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a3bd7913-7f8a-4295-966a-f682bf92a8c6",}, ], "gridX": 0, "gridY": 0, @@ -33,7 +32,7 @@ "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", - "name": "", + "name": "spr_metal_tabbard", "autoRecord": true, "backdropHeight": 1080, "backdropImageOpacity": 0.5, @@ -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, @@ -55,8 +54,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":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_techb/spr_gear_techb.yy",},},},"Disabled":false,"id":"181eb698-17b4-48e0-bf60-e786cc8baaa7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a3bd7913-7f8a-4295-966a-f682bf92a8c6","path":"sprites/spr_gear_techb/spr_gear_techb.yy",},},},"Disabled":false,"id":"43c1207e-c7c6-403a-b684-df028baadd9f","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_metal_tabbard/spr_metal_tabbard.yy",},},},"Disabled":false,"id":"181eb698-17b4-48e0-bf60-e786cc8baaa7","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_mk3_belt/358913f3-25cd-4411-aa3a-01c656c1166c.png b/sprites/spr_mk3_belt/358913f3-25cd-4411-aa3a-01c656c1166c.png new file mode 100644 index 0000000000..cee4f57636 Binary files /dev/null and b/sprites/spr_mk3_belt/358913f3-25cd-4411-aa3a-01c656c1166c.png differ diff --git a/sprites/spr_mk3_head_variants/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_belt/layers/358913f3-25cd-4411-aa3a-01c656c1166c/877a1a45-e091-4686-9968-18df7c72aafe.png similarity index 87% rename from sprites/spr_mk3_head_variants/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png rename to sprites/spr_mk3_belt/layers/358913f3-25cd-4411-aa3a-01c656c1166c/877a1a45-e091-4686-9968-18df7c72aafe.png index 529fd740ee..a72ba9c2c2 100644 Binary files a/sprites/spr_mk3_head_variants/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png and b/sprites/spr_mk3_belt/layers/358913f3-25cd-4411-aa3a-01c656c1166c/877a1a45-e091-4686-9968-18df7c72aafe.png differ diff --git a/sprites/spr_mk3_belt/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_belt/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000..cee4f57636 Binary files /dev/null and b/sprites/spr_mk3_belt/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_belt/spr_mk3_belt.yy b/sprites/spr_mk3_belt/spr_mk3_belt.yy new file mode 100644 index 0000000000..67edc27c33 --- /dev/null +++ b/sprites/spr_mk3_belt/spr_mk3_belt.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_belt", + "bbox_bottom": 133, + "bbox_left": 55, + "bbox_right": 109, + "bbox_top": 89, + "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_belt", + "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_belt/spr_mk3_belt.yy",},},},"Disabled":false,"id":"47d7ef7d-b3f5-48e5-9ee6-d99a5f3de6a8","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_chest/358913f3-25cd-4411-aa3a-01c656c1166c.png b/sprites/spr_mk3_chest/358913f3-25cd-4411-aa3a-01c656c1166c.png new file mode 100644 index 0000000000..51f915f6c2 Binary files /dev/null and b/sprites/spr_mk3_chest/358913f3-25cd-4411-aa3a-01c656c1166c.png differ diff --git a/sprites/spr_mk3_head_variants/006f1fc6-2a40-4299-aedd-c8ec3435711f.png b/sprites/spr_mk3_chest/layers/358913f3-25cd-4411-aa3a-01c656c1166c/877a1a45-e091-4686-9968-18df7c72aafe.png similarity index 87% rename from sprites/spr_mk3_head_variants/006f1fc6-2a40-4299-aedd-c8ec3435711f.png rename to sprites/spr_mk3_chest/layers/358913f3-25cd-4411-aa3a-01c656c1166c/877a1a45-e091-4686-9968-18df7c72aafe.png index 529fd740ee..a72ba9c2c2 100644 Binary files a/sprites/spr_mk3_head_variants/006f1fc6-2a40-4299-aedd-c8ec3435711f.png and b/sprites/spr_mk3_chest/layers/358913f3-25cd-4411-aa3a-01c656c1166c/877a1a45-e091-4686-9968-18df7c72aafe.png differ diff --git a/sprites/spr_mk3_chest/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_chest/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000..51f915f6c2 Binary files /dev/null and b/sprites/spr_mk3_chest/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_chest/spr_mk3_chest.yy b/sprites/spr_mk3_chest/spr_mk3_chest.yy new file mode 100644 index 0000000000..c4b0591d9f --- /dev/null +++ b/sprites/spr_mk3_chest/spr_mk3_chest.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_chest", + "bbox_bottom": 97, + "bbox_left": 50, + "bbox_right": 113, + "bbox_top": 33, + "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_chest", + "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_chest/spr_mk3_chest.yy",},},},"Disabled":false,"id":"d345f07e-7f56-4793-bfd8-1fd4dc286904","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/358913f3-25cd-4411-aa3a-01c656c1166c.png b/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png index 7f0d433f02..aa32a14af3 100644 Binary files a/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png and b/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png differ diff --git a/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png index 7f0d433f02..aa32a14af3 100644 Binary files a/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png and b/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_forehead_variants/006f1fc6-2a40-4299-aedd-c8ec3435711f.png b/sprites/spr_mk3_forehead_variants/006f1fc6-2a40-4299-aedd-c8ec3435711f.png new file mode 100644 index 0000000000..47ff7d6342 Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/006f1fc6-2a40-4299-aedd-c8ec3435711f.png differ diff --git a/sprites/spr_mk3_forehead_variants/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png b/sprites/spr_mk3_forehead_variants/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png new file mode 100644 index 0000000000..636919db7f Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png differ diff --git a/sprites/spr_mk3_forehead_variants/1b4c0911-af1a-4514-8459-35cf7d4f6aeb.png b/sprites/spr_mk3_forehead_variants/1b4c0911-af1a-4514-8459-35cf7d4f6aeb.png new file mode 100644 index 0000000000..82c5238607 Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/1b4c0911-af1a-4514-8459-35cf7d4f6aeb.png differ diff --git a/sprites/spr_mk3_forehead_variants/37c11dd3-1414-4c8d-8d71-e00098819009.png b/sprites/spr_mk3_forehead_variants/37c11dd3-1414-4c8d-8d71-e00098819009.png new file mode 100644 index 0000000000..4d7bce0d89 Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/37c11dd3-1414-4c8d-8d71-e00098819009.png differ diff --git a/sprites/spr_mk3_forehead_variants/3f3d4f82-2879-4b96-9ec5-2fd9414ac048.png b/sprites/spr_mk3_forehead_variants/3f3d4f82-2879-4b96-9ec5-2fd9414ac048.png new file mode 100644 index 0000000000..70ff8ec9e6 Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/3f3d4f82-2879-4b96-9ec5-2fd9414ac048.png differ diff --git a/sprites/spr_mk3_forehead_variants/6b0a122b-cbde-43d7-86fa-09659011d3ce.png b/sprites/spr_mk3_forehead_variants/6b0a122b-cbde-43d7-86fa-09659011d3ce.png new file mode 100644 index 0000000000..0cc401424c Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/6b0a122b-cbde-43d7-86fa-09659011d3ce.png differ diff --git a/sprites/spr_mk3_forehead_variants/ee9859ca-5867-4ea9-9c32-bce41c0bf04d.png b/sprites/spr_mk3_forehead_variants/ee9859ca-5867-4ea9-9c32-bce41c0bf04d.png new file mode 100644 index 0000000000..0f15410d0c Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/ee9859ca-5867-4ea9-9c32-bce41c0bf04d.png differ diff --git a/sprites/spr_mk3_forehead_variants/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_forehead_variants/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..47ff7d6342 Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_forehead_variants/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_forehead_variants/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..636919db7f Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_forehead_variants/layers/1b4c0911-af1a-4514-8459-35cf7d4f6aeb/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_forehead_variants/layers/1b4c0911-af1a-4514-8459-35cf7d4f6aeb/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..82c5238607 Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/layers/1b4c0911-af1a-4514-8459-35cf7d4f6aeb/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_forehead_variants/layers/37c11dd3-1414-4c8d-8d71-e00098819009/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_forehead_variants/layers/37c11dd3-1414-4c8d-8d71-e00098819009/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..4d7bce0d89 Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/layers/37c11dd3-1414-4c8d-8d71-e00098819009/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_forehead_variants/layers/3f3d4f82-2879-4b96-9ec5-2fd9414ac048/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_forehead_variants/layers/3f3d4f82-2879-4b96-9ec5-2fd9414ac048/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..70ff8ec9e6 Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/layers/3f3d4f82-2879-4b96-9ec5-2fd9414ac048/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_forehead_variants/layers/6b0a122b-cbde-43d7-86fa-09659011d3ce/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_forehead_variants/layers/6b0a122b-cbde-43d7-86fa-09659011d3ce/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..0cc401424c Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/layers/6b0a122b-cbde-43d7-86fa-09659011d3ce/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_forehead_variants/layers/ee9859ca-5867-4ea9-9c32-bce41c0bf04d/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_forehead_variants/layers/ee9859ca-5867-4ea9-9c32-bce41c0bf04d/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..0f15410d0c Binary files /dev/null and b/sprites/spr_mk3_forehead_variants/layers/ee9859ca-5867-4ea9-9c32-bce41c0bf04d/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy new file mode 100644 index 0000000000..1f20a69872 --- /dev/null +++ b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy @@ -0,0 +1,86 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_forehead_variants", + "bbox_bottom": 29, + "bbox_left": 69, + "bbox_right": 95, + "bbox_top": 13, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6b0a122b-cbde-43d7-86fa-09659011d3ce",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"37c11dd3-1414-4c8d-8d71-e00098819009",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9457b174-a643-4ea6-8880-a9df6463f668","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_forehead_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": 7.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":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},},},"Disabled":false,"id":"9347642e-46b3-4195-9d03-d2a761f92bc9","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},},},"Disabled":false,"id":"6d57cb6f-4cdd-457e-a37f-9df410e5ea56","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},},},"Disabled":false,"id":"3093b5a7-e27d-48c5-b58b-dc513e7b8e2c","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},},},"Disabled":false,"id":"70daa5bd-729f-4641-a567-78e6da5b3720","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},},},"Disabled":false,"id":"8732fa6e-e469-4750-af0f-1e60cd6e2654","IsCreationKey":false,"Key":4.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_forehead_variants/spr_mk3_forehead_variants.yy",},},},"Disabled":false,"id":"946cb3e6-0dc3-45d2-8897-5093b94d1de2","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"37c11dd3-1414-4c8d-8d71-e00098819009","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},},},"Disabled":false,"id":"9fb25342-066e-479c-8282-263f7dff3763","IsCreationKey":false,"Key":6.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/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png b/sprites/spr_mk3_head_variants/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png index c9f254d981..42fbf5a788 100644 Binary files a/sprites/spr_mk3_head_variants/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png and b/sprites/spr_mk3_head_variants/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png differ diff --git a/sprites/spr_mk3_head_variants/2faf2e83-0803-4ea4-945c-272a0a936425.png b/sprites/spr_mk3_head_variants/2faf2e83-0803-4ea4-945c-272a0a936425.png deleted file mode 100644 index ff819f5a0f..0000000000 Binary files a/sprites/spr_mk3_head_variants/2faf2e83-0803-4ea4-945c-272a0a936425.png and /dev/null differ diff --git a/sprites/spr_mk3_head_variants/6ae95461-420f-49c2-b583-d6fc14c50cb2.png b/sprites/spr_mk3_head_variants/6ae95461-420f-49c2-b583-d6fc14c50cb2.png new file mode 100644 index 0000000000..b328f2572e Binary files /dev/null and b/sprites/spr_mk3_head_variants/6ae95461-420f-49c2-b583-d6fc14c50cb2.png differ diff --git a/sprites/spr_mk3_head_variants/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_head_variants/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png index c9f254d981..42fbf5a788 100644 Binary files a/sprites/spr_mk3_head_variants/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png and b/sprites/spr_mk3_head_variants/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_head_variants/layers/2faf2e83-0803-4ea4-945c-272a0a936425/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_head_variants/layers/2faf2e83-0803-4ea4-945c-272a0a936425/9457b174-a643-4ea6-8880-a9df6463f668.png deleted file mode 100644 index ff819f5a0f..0000000000 Binary files a/sprites/spr_mk3_head_variants/layers/2faf2e83-0803-4ea4-945c-272a0a936425/9457b174-a643-4ea6-8880-a9df6463f668.png and /dev/null differ diff --git a/sprites/spr_mk3_head_variants/layers/6ae95461-420f-49c2-b583-d6fc14c50cb2/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_head_variants/layers/6ae95461-420f-49c2-b583-d6fc14c50cb2/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..b328f2572e Binary files /dev/null and b/sprites/spr_mk3_head_variants/layers/6ae95461-420f-49c2-b583-d6fc14c50cb2/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy index 29c16782a8..b5bfef94f5 100644 --- a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy +++ b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_mk3_head_variants", - "bbox_bottom": 50, + "bbox_bottom": 37, "bbox_left": 66, "bbox_right": 98, "bbox_top": 13, @@ -13,9 +13,8 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"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",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6ae95461-420f-49c2-b583-d6fc14c50cb2",}, ], "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":"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":0.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":1.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":2.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":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},},},"Disabled":false,"id":"0eb1a70a-6aba-4101-a2a0-89b4b569a337","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_mk3_mouth/006f1fc6-2a40-4299-aedd-c8ec3435711f.png b/sprites/spr_mk3_mouth/006f1fc6-2a40-4299-aedd-c8ec3435711f.png new file mode 100644 index 0000000000..14147cb293 Binary files /dev/null and b/sprites/spr_mk3_mouth/006f1fc6-2a40-4299-aedd-c8ec3435711f.png differ diff --git a/sprites/spr_mk3_mouth/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png b/sprites/spr_mk3_mouth/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png new file mode 100644 index 0000000000..69eb8c4207 Binary files /dev/null and b/sprites/spr_mk3_mouth/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png differ diff --git a/sprites/spr_mk3_mouth/e591e43e-d3da-42fb-bc8f-4cbae3aca323.png b/sprites/spr_mk3_mouth/e591e43e-d3da-42fb-bc8f-4cbae3aca323.png new file mode 100644 index 0000000000..f583f6b6a3 Binary files /dev/null and b/sprites/spr_mk3_mouth/e591e43e-d3da-42fb-bc8f-4cbae3aca323.png differ diff --git a/sprites/spr_mk3_mouth/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_mouth/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..14147cb293 Binary files /dev/null and b/sprites/spr_mk3_mouth/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_mouth/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_mouth/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..69eb8c4207 Binary files /dev/null and b/sprites/spr_mk3_mouth/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_mouth/layers/e591e43e-d3da-42fb-bc8f-4cbae3aca323/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_mouth/layers/e591e43e-d3da-42fb-bc8f-4cbae3aca323/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..f583f6b6a3 Binary files /dev/null and b/sprites/spr_mk3_mouth/layers/e591e43e-d3da-42fb-bc8f-4cbae3aca323/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_mouth/spr_mk3_mouth.yy b/sprites/spr_mk3_mouth/spr_mk3_mouth.yy new file mode 100644 index 0000000000..e86f2cc3ef --- /dev/null +++ b/sprites/spr_mk3_mouth/spr_mk3_mouth.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_mouth", + "bbox_bottom": 50, + "bbox_left": 66, + "bbox_right": 98, + "bbox_top": 31, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"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":"e591e43e-d3da-42fb-bc8f-4cbae3aca323",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9457b174-a643-4ea6-8880-a9df6463f668","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_mouth", + "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":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},},},"Disabled":false,"id":"abb8135b-2d67-4017-b74b-93be2b04f4ce","IsCreationKey":false,"Key":0.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_mouth/spr_mk3_mouth.yy",},},},"Disabled":false,"id":"40eb5fb9-2992-48c1-b2be-29e23cb4bd0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},},},"Disabled":false,"id":"c99907f3-988a-4e03-8c62-43e4520f2e1d","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_mk3_mouth_flame_cult/006f1fc6-2a40-4299-aedd-c8ec3435711f.png b/sprites/spr_mk3_mouth_flame_cult/006f1fc6-2a40-4299-aedd-c8ec3435711f.png new file mode 100644 index 0000000000..b2e0a6c2e8 Binary files /dev/null and b/sprites/spr_mk3_mouth_flame_cult/006f1fc6-2a40-4299-aedd-c8ec3435711f.png differ diff --git a/sprites/spr_mk3_mouth_flame_cult/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_mouth_flame_cult/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..b2e0a6c2e8 Binary files /dev/null and b/sprites/spr_mk3_mouth_flame_cult/layers/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy b/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy new file mode 100644 index 0000000000..51f638edac --- /dev/null +++ b/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_mouth_flame_cult", + "bbox_bottom": 50, + "bbox_left": 66, + "bbox_right": 98, + "bbox_top": 31, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9457b174-a643-4ea6-8880-a9df6463f668","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_mouth_flame_cult", + "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":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},},},"Disabled":false,"id":"dafbefe7-5ef7-4c6e-bf41-74e0fc0edf26","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_mouth_prussian/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png b/sprites/spr_mk3_mouth_prussian/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png new file mode 100644 index 0000000000..da1d3e37c6 Binary files /dev/null and b/sprites/spr_mk3_mouth_prussian/120c0dc2-09ee-43e7-8b97-23af2bfa96b6.png differ diff --git a/sprites/spr_mk3_mouth_prussian/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png b/sprites/spr_mk3_mouth_prussian/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png new file mode 100644 index 0000000000..da1d3e37c6 Binary files /dev/null and b/sprites/spr_mk3_mouth_prussian/layers/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png differ diff --git a/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy b/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy new file mode 100644 index 0000000000..8d91046fa7 --- /dev/null +++ b/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk3_mouth_prussian", + "bbox_bottom": 50, + "bbox_left": 64, + "bbox_right": 101, + "bbox_top": 29, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9457b174-a643-4ea6-8880-a9df6463f668","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_mouth_prussian", + "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":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},},},"Disabled":false,"id":"254cb1c4-26aa-429c-8253-fafc878744e7","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_chest_variants/390fa6ba-721f-4bdc-8b11-b7012f417f0e.png b/sprites/spr_mk4_chest_variants/390fa6ba-721f-4bdc-8b11-b7012f417f0e.png new file mode 100644 index 0000000000..1a9919ad1a Binary files /dev/null and b/sprites/spr_mk4_chest_variants/390fa6ba-721f-4bdc-8b11-b7012f417f0e.png differ diff --git a/sprites/spr_mk4_chest_variants/40c77a23-0d91-41c3-865e-885ca7f6df03.png b/sprites/spr_mk4_chest_variants/40c77a23-0d91-41c3-865e-885ca7f6df03.png new file mode 100644 index 0000000000..b2b6d7beab Binary files /dev/null and b/sprites/spr_mk4_chest_variants/40c77a23-0d91-41c3-865e-885ca7f6df03.png differ diff --git a/sprites/spr_mk4_chest_variants/5c7953fd-068f-4680-952f-2bec1899eb37.png b/sprites/spr_mk4_chest_variants/5c7953fd-068f-4680-952f-2bec1899eb37.png deleted file mode 100644 index 7b8fa25f38..0000000000 Binary files a/sprites/spr_mk4_chest_variants/5c7953fd-068f-4680-952f-2bec1899eb37.png and /dev/null differ diff --git a/sprites/spr_mk4_chest_variants/6ea6843d-5734-4b45-8dc0-32fe12108362.png b/sprites/spr_mk4_chest_variants/6ea6843d-5734-4b45-8dc0-32fe12108362.png deleted file mode 100644 index 5a0c9e499c..0000000000 Binary files a/sprites/spr_mk4_chest_variants/6ea6843d-5734-4b45-8dc0-32fe12108362.png and /dev/null differ diff --git a/sprites/spr_mk4_chest_variants/9aa905f2-3241-4fed-97e7-c3b765cc7075.png b/sprites/spr_mk4_chest_variants/9aa905f2-3241-4fed-97e7-c3b765cc7075.png deleted file mode 100644 index 3bdbbabb6a..0000000000 Binary files a/sprites/spr_mk4_chest_variants/9aa905f2-3241-4fed-97e7-c3b765cc7075.png and /dev/null differ diff --git a/sprites/spr_mk4_chest_variants/ab90c4f7-06a6-4afd-ad2c-1b4320ecded3.png b/sprites/spr_mk4_chest_variants/ab90c4f7-06a6-4afd-ad2c-1b4320ecded3.png deleted file mode 100644 index 6ee61b6512..0000000000 Binary files a/sprites/spr_mk4_chest_variants/ab90c4f7-06a6-4afd-ad2c-1b4320ecded3.png and /dev/null differ diff --git a/sprites/spr_mk4_chest_variants/f6982c93-478f-40f5-a81e-71915440e82d.png b/sprites/spr_mk4_chest_variants/f6982c93-478f-40f5-a81e-71915440e82d.png new file mode 100644 index 0000000000..77dc73fa81 Binary files /dev/null and b/sprites/spr_mk4_chest_variants/f6982c93-478f-40f5-a81e-71915440e82d.png differ diff --git a/sprites/spr_mk4_chest_variants/f99c987b-7a91-4dc7-b79f-d53299f70551.png b/sprites/spr_mk4_chest_variants/f99c987b-7a91-4dc7-b79f-d53299f70551.png new file mode 100644 index 0000000000..72df51b5c4 Binary files /dev/null and b/sprites/spr_mk4_chest_variants/f99c987b-7a91-4dc7-b79f-d53299f70551.png differ diff --git a/sprites/spr_mk4_chest_variants/layers/390fa6ba-721f-4bdc-8b11-b7012f417f0e/4700a804-be74-43bd-a3a1-5f2c62f33959.png b/sprites/spr_mk4_chest_variants/layers/390fa6ba-721f-4bdc-8b11-b7012f417f0e/4700a804-be74-43bd-a3a1-5f2c62f33959.png new file mode 100644 index 0000000000..1a9919ad1a Binary files /dev/null and b/sprites/spr_mk4_chest_variants/layers/390fa6ba-721f-4bdc-8b11-b7012f417f0e/4700a804-be74-43bd-a3a1-5f2c62f33959.png differ diff --git a/sprites/spr_mk4_chest_variants/layers/40c77a23-0d91-41c3-865e-885ca7f6df03/4700a804-be74-43bd-a3a1-5f2c62f33959.png b/sprites/spr_mk4_chest_variants/layers/40c77a23-0d91-41c3-865e-885ca7f6df03/4700a804-be74-43bd-a3a1-5f2c62f33959.png new file mode 100644 index 0000000000..b2b6d7beab Binary files /dev/null and b/sprites/spr_mk4_chest_variants/layers/40c77a23-0d91-41c3-865e-885ca7f6df03/4700a804-be74-43bd-a3a1-5f2c62f33959.png differ diff --git a/sprites/spr_mk4_chest_variants/layers/5c7953fd-068f-4680-952f-2bec1899eb37/4700a804-be74-43bd-a3a1-5f2c62f33959.png b/sprites/spr_mk4_chest_variants/layers/5c7953fd-068f-4680-952f-2bec1899eb37/4700a804-be74-43bd-a3a1-5f2c62f33959.png deleted file mode 100644 index 7b8fa25f38..0000000000 Binary files a/sprites/spr_mk4_chest_variants/layers/5c7953fd-068f-4680-952f-2bec1899eb37/4700a804-be74-43bd-a3a1-5f2c62f33959.png and /dev/null differ diff --git a/sprites/spr_mk4_chest_variants/layers/6ea6843d-5734-4b45-8dc0-32fe12108362/4700a804-be74-43bd-a3a1-5f2c62f33959.png b/sprites/spr_mk4_chest_variants/layers/6ea6843d-5734-4b45-8dc0-32fe12108362/4700a804-be74-43bd-a3a1-5f2c62f33959.png deleted file mode 100644 index 5a0c9e499c..0000000000 Binary files a/sprites/spr_mk4_chest_variants/layers/6ea6843d-5734-4b45-8dc0-32fe12108362/4700a804-be74-43bd-a3a1-5f2c62f33959.png and /dev/null differ diff --git a/sprites/spr_mk4_chest_variants/layers/9aa905f2-3241-4fed-97e7-c3b765cc7075/4700a804-be74-43bd-a3a1-5f2c62f33959.png b/sprites/spr_mk4_chest_variants/layers/9aa905f2-3241-4fed-97e7-c3b765cc7075/4700a804-be74-43bd-a3a1-5f2c62f33959.png deleted file mode 100644 index 3bdbbabb6a..0000000000 Binary files a/sprites/spr_mk4_chest_variants/layers/9aa905f2-3241-4fed-97e7-c3b765cc7075/4700a804-be74-43bd-a3a1-5f2c62f33959.png and /dev/null differ diff --git a/sprites/spr_mk4_chest_variants/layers/ab90c4f7-06a6-4afd-ad2c-1b4320ecded3/4700a804-be74-43bd-a3a1-5f2c62f33959.png b/sprites/spr_mk4_chest_variants/layers/ab90c4f7-06a6-4afd-ad2c-1b4320ecded3/4700a804-be74-43bd-a3a1-5f2c62f33959.png deleted file mode 100644 index 6ee61b6512..0000000000 Binary files a/sprites/spr_mk4_chest_variants/layers/ab90c4f7-06a6-4afd-ad2c-1b4320ecded3/4700a804-be74-43bd-a3a1-5f2c62f33959.png and /dev/null differ diff --git a/sprites/spr_mk4_chest_variants/layers/f6982c93-478f-40f5-a81e-71915440e82d/4700a804-be74-43bd-a3a1-5f2c62f33959.png b/sprites/spr_mk4_chest_variants/layers/f6982c93-478f-40f5-a81e-71915440e82d/4700a804-be74-43bd-a3a1-5f2c62f33959.png new file mode 100644 index 0000000000..77dc73fa81 Binary files /dev/null and b/sprites/spr_mk4_chest_variants/layers/f6982c93-478f-40f5-a81e-71915440e82d/4700a804-be74-43bd-a3a1-5f2c62f33959.png differ diff --git a/sprites/spr_mk4_chest_variants/layers/f99c987b-7a91-4dc7-b79f-d53299f70551/4700a804-be74-43bd-a3a1-5f2c62f33959.png b/sprites/spr_mk4_chest_variants/layers/f99c987b-7a91-4dc7-b79f-d53299f70551/4700a804-be74-43bd-a3a1-5f2c62f33959.png new file mode 100644 index 0000000000..72df51b5c4 Binary files /dev/null and b/sprites/spr_mk4_chest_variants/layers/f99c987b-7a91-4dc7-b79f-d53299f70551/4700a804-be74-43bd-a3a1-5f2c62f33959.png differ diff --git a/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy index 865c49bd8b..156ffeceb1 100644 --- a/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy +++ b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_mk4_chest_variants", - "bbox_bottom": 88, - "bbox_left": 0, + "bbox_bottom": 104, + "bbox_left": 48, "bbox_right": 115, - "bbox_top": 0, + "bbox_top": 31, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -13,10 +13,10 @@ "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",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"40c77a23-0d91-41c3-865e-885ca7f6df03",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f99c987b-7a91-4dc7-b79f-d53299f70551",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f6982c93-478f-40f5-a81e-71915440e82d",}, ], "gridX": 0, "gridY": 0, @@ -57,10 +57,10 @@ "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,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"40c77a23-0d91-41c3-865e-885ca7f6df03","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"a66f3f85-cd83-4651-aa90-f25bca60da0e","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"02831958-f299-4f70-8116-3a658fe588dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f99c987b-7a91-4dc7-b79f-d53299f70551","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"fecadf85-a338-45ac-b302-0176bfbe27c0","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f6982c93-478f-40f5-a81e-71915440e82d","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},},},"Disabled":false,"id":"2c0e8c7f-908c-4e0a-a664-d60ff4193682","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_mk4_mongol_chest_variants/2cfc06ab-7db9-40db-8c02-32b555a577e4.png b/sprites/spr_mk4_mongol_chest_variants/2cfc06ab-7db9-40db-8c02-32b555a577e4.png new file mode 100644 index 0000000000..96448ee60f Binary files /dev/null and b/sprites/spr_mk4_mongol_chest_variants/2cfc06ab-7db9-40db-8c02-32b555a577e4.png differ diff --git a/sprites/spr_mk4_mongol_chest_variants/layers/2cfc06ab-7db9-40db-8c02-32b555a577e4/69d8945c-b898-42d3-836d-db042623e4f9.png b/sprites/spr_mk4_mongol_chest_variants/layers/2cfc06ab-7db9-40db-8c02-32b555a577e4/69d8945c-b898-42d3-836d-db042623e4f9.png new file mode 100644 index 0000000000..96448ee60f Binary files /dev/null and b/sprites/spr_mk4_mongol_chest_variants/layers/2cfc06ab-7db9-40db-8c02-32b555a577e4/69d8945c-b898-42d3-836d-db042623e4f9.png differ diff --git a/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy b/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy new file mode 100644 index 0000000000..4e8d932dd7 --- /dev/null +++ b/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_mongol_chest_variants", + "bbox_bottom": 79, + "bbox_left": 50, + "bbox_right": 113, + "bbox_top": 41, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2cfc06ab-7db9-40db-8c02-32b555a577e4",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"69d8945c-b898-42d3-836d-db042623e4f9","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "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_mongol_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": 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":"2cfc06ab-7db9-40db-8c02-32b555a577e4","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},},},"Disabled":false,"id":"f2132b90-0c80-46bb-88ef-de7faad10ae5","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": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_mongol_hat/776f298a-8428-4cd5-8716-592b704fce94.png b/sprites/spr_mk4_mongol_hat/776f298a-8428-4cd5-8716-592b704fce94.png new file mode 100644 index 0000000000..f8f0174aba Binary files /dev/null and b/sprites/spr_mk4_mongol_hat/776f298a-8428-4cd5-8716-592b704fce94.png differ diff --git a/sprites/spr_mk4_mongol_hat/layers/776f298a-8428-4cd5-8716-592b704fce94/c81bab19-ea5f-4600-a74c-b02867788761.png b/sprites/spr_mk4_mongol_hat/layers/776f298a-8428-4cd5-8716-592b704fce94/c81bab19-ea5f-4600-a74c-b02867788761.png new file mode 100644 index 0000000000..f8f0174aba Binary files /dev/null and b/sprites/spr_mk4_mongol_hat/layers/776f298a-8428-4cd5-8716-592b704fce94/c81bab19-ea5f-4600-a74c-b02867788761.png differ diff --git a/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy b/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy new file mode 100644 index 0000000000..adefef7b56 --- /dev/null +++ b/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk4_mongol_hat", + "bbox_bottom": 29, + "bbox_left": 69, + "bbox_right": 94, + "bbox_top": 8, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"776f298a-8428-4cd5-8716-592b704fce94",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c81bab19-ea5f-4600-a74c-b02867788761","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "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_mongol_hat", + "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":"776f298a-8428-4cd5-8716-592b704fce94","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},},},"Disabled":false,"id":"83c1deea-feff-46bd-b99b-36c3d05c4bbb","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": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk5_complex/48f72680-cb96-4361-9276-5e8d8552ae9f.png b/sprites/spr_mk5_complex/48f72680-cb96-4361-9276-5e8d8552ae9f.png index c9cb74f395..e5d2e9575f 100644 Binary files a/sprites/spr_mk5_complex/48f72680-cb96-4361-9276-5e8d8552ae9f.png and b/sprites/spr_mk5_complex/48f72680-cb96-4361-9276-5e8d8552ae9f.png differ diff --git a/sprites/spr_mk5_complex/layers/48f72680-cb96-4361-9276-5e8d8552ae9f/15124376-bb1d-4e68-995a-aae895608450.png b/sprites/spr_mk5_complex/layers/48f72680-cb96-4361-9276-5e8d8552ae9f/15124376-bb1d-4e68-995a-aae895608450.png index c9cb74f395..e5d2e9575f 100644 Binary files a/sprites/spr_mk5_complex/layers/48f72680-cb96-4361-9276-5e8d8552ae9f/15124376-bb1d-4e68-995a-aae895608450.png and b/sprites/spr_mk5_complex/layers/48f72680-cb96-4361-9276-5e8d8552ae9f/15124376-bb1d-4e68-995a-aae895608450.png differ diff --git a/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png b/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png index 2b0635300b..817026341d 100644 Binary files a/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png and b/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png differ diff --git a/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png b/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png index 2b0635300b..817026341d 100644 Binary files a/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png and b/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png differ diff --git a/sprites/spr_mk6_forehead_knightly/184bb9a2-c0f5-488b-9e51-6819cfc3eabf.png b/sprites/spr_mk6_forehead_knightly/184bb9a2-c0f5-488b-9e51-6819cfc3eabf.png new file mode 100644 index 0000000000..f80e1e9c51 Binary files /dev/null and b/sprites/spr_mk6_forehead_knightly/184bb9a2-c0f5-488b-9e51-6819cfc3eabf.png differ diff --git a/sprites/spr_mk6_forehead_knightly/415fcd60-4ea4-4d41-8642-a475ac5f2696.png b/sprites/spr_mk6_forehead_knightly/415fcd60-4ea4-4d41-8642-a475ac5f2696.png new file mode 100644 index 0000000000..49abe7c5dc Binary files /dev/null and b/sprites/spr_mk6_forehead_knightly/415fcd60-4ea4-4d41-8642-a475ac5f2696.png differ diff --git a/sprites/spr_mk6_forehead_knightly/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png b/sprites/spr_mk6_forehead_knightly/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png new file mode 100644 index 0000000000..7b776e521c Binary files /dev/null and b/sprites/spr_mk6_forehead_knightly/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png differ diff --git a/sprites/spr_mk6_forehead_knightly/layers/184bb9a2-c0f5-488b-9e51-6819cfc3eabf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png b/sprites/spr_mk6_forehead_knightly/layers/184bb9a2-c0f5-488b-9e51-6819cfc3eabf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png new file mode 100644 index 0000000000..f80e1e9c51 Binary files /dev/null and b/sprites/spr_mk6_forehead_knightly/layers/184bb9a2-c0f5-488b-9e51-6819cfc3eabf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png differ diff --git a/sprites/spr_mk6_forehead_knightly/layers/415fcd60-4ea4-4d41-8642-a475ac5f2696/2ed2bff2-7b67-49c4-b839-b015f5737a16.png b/sprites/spr_mk6_forehead_knightly/layers/415fcd60-4ea4-4d41-8642-a475ac5f2696/2ed2bff2-7b67-49c4-b839-b015f5737a16.png new file mode 100644 index 0000000000..49abe7c5dc Binary files /dev/null and b/sprites/spr_mk6_forehead_knightly/layers/415fcd60-4ea4-4d41-8642-a475ac5f2696/2ed2bff2-7b67-49c4-b839-b015f5737a16.png differ diff --git a/sprites/spr_mk6_forehead_knightly/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png b/sprites/spr_mk6_forehead_knightly/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png new file mode 100644 index 0000000000..7b776e521c Binary files /dev/null and b/sprites/spr_mk6_forehead_knightly/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png differ diff --git a/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy b/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy new file mode 100644 index 0000000000..c97b5f59af --- /dev/null +++ b/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk6_forehead_knightly", + "bbox_bottom": 29, + "bbox_left": 69, + "bbox_right": 94, + "bbox_top": 12, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"415fcd60-4ea4-4d41-8642-a475ac5f2696",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2ed2bff2-7b67-49c4-b839-b015f5737a16","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_forehead_knightly", + "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":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},},},"Disabled":false,"id":"990daad4-708f-4aff-be58-94b415e06c63","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},},},"Disabled":false,"id":"70d60aec-8edb-4110-af4b-e8f926007ab2","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},},},"Disabled":false,"id":"95e20c38-53de-470d-9550-f0e9435d416a","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_mk6_knightly_mouth_variants/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png b/sprites/spr_mk6_knightly_mouth_variants/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png new file mode 100644 index 0000000000..74952abcef Binary files /dev/null and b/sprites/spr_mk6_knightly_mouth_variants/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png differ diff --git a/sprites/spr_mk6_knightly_mouth_variants/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png b/sprites/spr_mk6_knightly_mouth_variants/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png new file mode 100644 index 0000000000..74952abcef Binary files /dev/null and b/sprites/spr_mk6_knightly_mouth_variants/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png differ diff --git a/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy b/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy new file mode 100644 index 0000000000..e90f0e2aef --- /dev/null +++ b/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk6_knightly_mouth_variants", + "bbox_bottom": 46, + "bbox_left": 71, + "bbox_right": 98, + "bbox_top": 27, + "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":"2ed2bff2-7b67-49c4-b839-b015f5737a16","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_knightly_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": 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_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},},},"Disabled":false,"id":"ed8f7823-887b-4797-b2fc-2c5bebf5c720","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_mongol_chest_variants/be51056f-3c34-44c2-865d-3cb121432582.png b/sprites/spr_mk6_mongol_chest_variants/be51056f-3c34-44c2-865d-3cb121432582.png new file mode 100644 index 0000000000..0aa01905eb Binary files /dev/null and b/sprites/spr_mk6_mongol_chest_variants/be51056f-3c34-44c2-865d-3cb121432582.png differ diff --git a/sprites/spr_mk6_mongol_chest_variants/layers/be51056f-3c34-44c2-865d-3cb121432582/a0e66409-9f1c-43dd-9266-daf2dd5d091a.png b/sprites/spr_mk6_mongol_chest_variants/layers/be51056f-3c34-44c2-865d-3cb121432582/a0e66409-9f1c-43dd-9266-daf2dd5d091a.png new file mode 100644 index 0000000000..0aa01905eb Binary files /dev/null and b/sprites/spr_mk6_mongol_chest_variants/layers/be51056f-3c34-44c2-865d-3cb121432582/a0e66409-9f1c-43dd-9266-daf2dd5d091a.png differ diff --git a/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy b/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy new file mode 100644 index 0000000000..dff173b43d --- /dev/null +++ b/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk6_mongol_chest_variants", + "bbox_bottom": 77, + "bbox_left": 51, + "bbox_right": 114, + "bbox_top": 41, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"be51056f-3c34-44c2-865d-3cb121432582",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a0e66409-9f1c-43dd-9266-daf2dd5d091a","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "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_mongol_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": 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":"be51056f-3c34-44c2-865d-3cb121432582","path":"sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy",},},},"Disabled":false,"id":"6b8a0cec-2320-4e14-9783-f4e8bf0f87d3","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": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk6_mouth_prussian/413c9428-5da2-4ef2-a236-fbbd9ad3d6ab.png b/sprites/spr_mk6_mouth_prussian/413c9428-5da2-4ef2-a236-fbbd9ad3d6ab.png new file mode 100644 index 0000000000..f05274f4e8 Binary files /dev/null and b/sprites/spr_mk6_mouth_prussian/413c9428-5da2-4ef2-a236-fbbd9ad3d6ab.png differ diff --git a/sprites/spr_mk6_mouth_prussian/ef00b133-1edd-4ecd-a7c1-41f2f80c4d01.png b/sprites/spr_mk6_mouth_prussian/ef00b133-1edd-4ecd-a7c1-41f2f80c4d01.png new file mode 100644 index 0000000000..8f7984ad83 Binary files /dev/null and b/sprites/spr_mk6_mouth_prussian/ef00b133-1edd-4ecd-a7c1-41f2f80c4d01.png differ diff --git a/sprites/spr_mk6_mouth_prussian/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png b/sprites/spr_mk6_mouth_prussian/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png new file mode 100644 index 0000000000..24366e6d3d Binary files /dev/null and b/sprites/spr_mk6_mouth_prussian/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png differ diff --git a/sprites/spr_mk6_mouth_prussian/layers/413c9428-5da2-4ef2-a236-fbbd9ad3d6ab/2ed2bff2-7b67-49c4-b839-b015f5737a16.png b/sprites/spr_mk6_mouth_prussian/layers/413c9428-5da2-4ef2-a236-fbbd9ad3d6ab/2ed2bff2-7b67-49c4-b839-b015f5737a16.png new file mode 100644 index 0000000000..f05274f4e8 Binary files /dev/null and b/sprites/spr_mk6_mouth_prussian/layers/413c9428-5da2-4ef2-a236-fbbd9ad3d6ab/2ed2bff2-7b67-49c4-b839-b015f5737a16.png differ diff --git a/sprites/spr_mk6_mouth_prussian/layers/ef00b133-1edd-4ecd-a7c1-41f2f80c4d01/2ed2bff2-7b67-49c4-b839-b015f5737a16.png b/sprites/spr_mk6_mouth_prussian/layers/ef00b133-1edd-4ecd-a7c1-41f2f80c4d01/2ed2bff2-7b67-49c4-b839-b015f5737a16.png new file mode 100644 index 0000000000..8f7984ad83 Binary files /dev/null and b/sprites/spr_mk6_mouth_prussian/layers/ef00b133-1edd-4ecd-a7c1-41f2f80c4d01/2ed2bff2-7b67-49c4-b839-b015f5737a16.png differ diff --git a/sprites/spr_mk6_mouth_prussian/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png b/sprites/spr_mk6_mouth_prussian/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png new file mode 100644 index 0000000000..24366e6d3d Binary files /dev/null and b/sprites/spr_mk6_mouth_prussian/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/2ed2bff2-7b67-49c4-b839-b015f5737a16.png differ diff --git a/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy b/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy new file mode 100644 index 0000000000..732dca8082 --- /dev/null +++ b/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk6_mouth_prussian", + "bbox_bottom": 45, + "bbox_left": 67, + "bbox_right": 96, + "bbox_top": 30, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2ed2bff2-7b67-49c4-b839-b015f5737a16","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_mouth_prussian", + "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":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},},},"Disabled":false,"id":"f8571ae2-19d0-4093-ae0a-e5f864f1c8b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},},},"Disabled":false,"id":"1d33d213-2125-4792-bea1-65c540c83851","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},},},"Disabled":false,"id":"6423fa90-8cbf-47a6-ad5e-e020ea6ae916","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_chest_ultra/4cf35299-781f-4c3c-94e2-4aa3eded03aa.png b/sprites/spr_mk7_chest_ultra/4cf35299-781f-4c3c-94e2-4aa3eded03aa.png new file mode 100644 index 0000000000..4c4244d58a Binary files /dev/null and b/sprites/spr_mk7_chest_ultra/4cf35299-781f-4c3c-94e2-4aa3eded03aa.png differ diff --git a/sprites/spr_mk7_chest_ultra/7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4.png b/sprites/spr_mk7_chest_ultra/7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4.png new file mode 100644 index 0000000000..6ed4e040f8 Binary files /dev/null and b/sprites/spr_mk7_chest_ultra/7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4.png differ diff --git a/sprites/spr_mk7_chest_ultra/81f205c4-d9a8-42c1-956a-0f662dd1fbd1.png b/sprites/spr_mk7_chest_ultra/81f205c4-d9a8-42c1-956a-0f662dd1fbd1.png new file mode 100644 index 0000000000..e7a305ce97 Binary files /dev/null and b/sprites/spr_mk7_chest_ultra/81f205c4-d9a8-42c1-956a-0f662dd1fbd1.png differ diff --git a/sprites/spr_mk7_chest_ultra/layers/4cf35299-781f-4c3c-94e2-4aa3eded03aa/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_ultra/layers/4cf35299-781f-4c3c-94e2-4aa3eded03aa/d0764e38-6f97-4f33-8770-83719dde468f.png new file mode 100644 index 0000000000..4c4244d58a Binary files /dev/null and b/sprites/spr_mk7_chest_ultra/layers/4cf35299-781f-4c3c-94e2-4aa3eded03aa/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_ultra/layers/7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_ultra/layers/7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4/d0764e38-6f97-4f33-8770-83719dde468f.png new file mode 100644 index 0000000000..6ed4e040f8 Binary files /dev/null and b/sprites/spr_mk7_chest_ultra/layers/7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_ultra/layers/81f205c4-d9a8-42c1-956a-0f662dd1fbd1/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_ultra/layers/81f205c4-d9a8-42c1-956a-0f662dd1fbd1/d0764e38-6f97-4f33-8770-83719dde468f.png new file mode 100644 index 0000000000..e7a305ce97 Binary files /dev/null and b/sprites/spr_mk7_chest_ultra/layers/81f205c4-d9a8-42c1-956a-0f662dd1fbd1/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy b/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy new file mode 100644 index 0000000000..626da79a4c --- /dev/null +++ b/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_chest_ultra", + "bbox_bottom": 75, + "bbox_left": 51, + "bbox_right": 112, + "bbox_top": 40, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"81f205c4-d9a8-42c1-956a-0f662dd1fbd1",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d0764e38-6f97-4f33-8770-83719dde468f","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_ultra", + "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":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},},},"Disabled":false,"id":"41ee0869-22a0-48b8-a427-0b83c48f44e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},},},"Disabled":false,"id":"4e528881-8989-4611-9af3-d1fbfb6e801f","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"81f205c4-d9a8-42c1-956a-0f662dd1fbd1","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},},},"Disabled":false,"id":"3449b68a-b374-4b84-88b8-d356d7e88c24","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_chest_variants/611de98f-d588-479c-ab78-87486ae53a43.png b/sprites/spr_mk7_chest_variants/611de98f-d588-479c-ab78-87486ae53a43.png deleted file mode 100644 index 9c2fb385b4..0000000000 Binary files a/sprites/spr_mk7_chest_variants/611de98f-d588-479c-ab78-87486ae53a43.png and /dev/null differ diff --git a/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png b/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png new file mode 100644 index 0000000000..566df37562 Binary files /dev/null and b/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/611de98f-d588-479c-ab78-87486ae53a43/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/611de98f-d588-479c-ab78-87486ae53a43/d0764e38-6f97-4f33-8770-83719dde468f.png deleted file mode 100644 index 9c2fb385b4..0000000000 Binary files a/sprites/spr_mk7_chest_variants/layers/611de98f-d588-479c-ab78-87486ae53a43/d0764e38-6f97-4f33-8770-83719dde468f.png and /dev/null differ diff --git a/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png new file mode 100644 index 0000000000..566df37562 Binary files /dev/null and b/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy index 046d0a8c87..5461c7eb26 100644 --- a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy +++ b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy @@ -16,7 +16,7 @@ {"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":"af74c721-e4c2-4842-b738-a2c688adc317",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0d02faaf-2101-406d-a94f-527d1c7834db",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5769f893-c909-4b88-9856-62d72a0b6130",}, ], @@ -62,7 +62,7 @@ {"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":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"515d67b4-d543-46e6-8846-2c782789fdc0","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,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"efe29eea-b902-49f6-84aa-a2ed325b6df6","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, diff --git a/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index 99430ab11d..8676ca20a8 100644 Binary files a/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and b/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png index 99430ab11d..8676ca20a8 100644 Binary files a/sprites/spr_mk7_complex/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and b/sprites/spr_mk7_complex/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_belt/163be470-f687-42e2-b07c-ad2291c828fa.png b/sprites/spr_mk7_complex_belt/163be470-f687-42e2-b07c-ad2291c828fa.png new file mode 100644 index 0000000000..74ea131db4 Binary files /dev/null and b/sprites/spr_mk7_complex_belt/163be470-f687-42e2-b07c-ad2291c828fa.png differ diff --git a/sprites/spr_mk7_complex_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000..8eccd07e57 Binary files /dev/null and b/sprites/spr_mk7_complex_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_belt/c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b.png b/sprites/spr_mk7_complex_belt/c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b.png new file mode 100644 index 0000000000..ba41096648 Binary files /dev/null and b/sprites/spr_mk7_complex_belt/c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b.png differ diff --git a/sprites/spr_mk7_complex_belt/layers/163be470-f687-42e2-b07c-ad2291c828fa/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_belt/layers/163be470-f687-42e2-b07c-ad2291c828fa/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..7a0985f8b6 Binary files /dev/null and b/sprites/spr_mk7_complex_belt/layers/163be470-f687-42e2-b07c-ad2291c828fa/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..16a54bbe6d Binary files /dev/null and b/sprites/spr_mk7_complex_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_belt/layers/c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_belt/layers/c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..a23bdafdfb Binary files /dev/null and b/sprites/spr_mk7_complex_belt/layers/c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy b/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy new file mode 100644 index 0000000000..08ec1b6362 --- /dev/null +++ b/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_complex_belt", + "bbox_bottom": 104, + "bbox_left": 54, + "bbox_right": 108, + "bbox_top": 88, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"163be470-f687-42e2-b07c-ad2291c828fa",}, + ], + "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_belt", + "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":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},},},"Disabled":false,"id":"9682d976-cfa5-495a-b8f6-5be5477a1db6","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},},},"Disabled":false,"id":"9d12c3e7-cfb3-4825-b44b-5227c2503b2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"163be470-f687-42e2-b07c-ad2291c828fa","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},},},"Disabled":false,"id":"3cb55ce9-9436-4e2c-9d6b-4a81a672efc0","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_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000..0cf1f92a29 Binary files /dev/null and b/sprites/spr_mk7_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..0cf1f92a29 Binary files /dev/null and b/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy b/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy new file mode 100644 index 0000000000..373f136fd8 --- /dev/null +++ b/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_complex_crux_belt", + "bbox_bottom": 107, + "bbox_left": 56, + "bbox_right": 107, + "bbox_top": 86, + "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_crux_belt", + "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_crux_belt/spr_mk7_complex_crux_belt.yy",},},},"Disabled":false,"id":"8516e89a-68d9-460b-8288-a2e0c1a172f2","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_gladiator_chest/058bac9e-56f9-4a9e-8b2e-4ae998099703.png b/sprites/spr_mk7_gladiator_chest/058bac9e-56f9-4a9e-8b2e-4ae998099703.png new file mode 100644 index 0000000000..0ad8e8af0b Binary files /dev/null and b/sprites/spr_mk7_gladiator_chest/058bac9e-56f9-4a9e-8b2e-4ae998099703.png differ diff --git a/sprites/spr_mk7_gladiator_chest/1cdabc8e-5838-4520-bb52-b164914135dd.png b/sprites/spr_mk7_gladiator_chest/1cdabc8e-5838-4520-bb52-b164914135dd.png new file mode 100644 index 0000000000..011c5928e6 Binary files /dev/null and b/sprites/spr_mk7_gladiator_chest/1cdabc8e-5838-4520-bb52-b164914135dd.png differ diff --git a/sprites/spr_mk7_gladiator_chest/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_gladiator_chest/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000..70f78de723 Binary files /dev/null and b/sprites/spr_mk7_gladiator_chest/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_gladiator_chest/layers/058bac9e-56f9-4a9e-8b2e-4ae998099703/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_gladiator_chest/layers/058bac9e-56f9-4a9e-8b2e-4ae998099703/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..0ad8e8af0b Binary files /dev/null and b/sprites/spr_mk7_gladiator_chest/layers/058bac9e-56f9-4a9e-8b2e-4ae998099703/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_gladiator_chest/layers/1cdabc8e-5838-4520-bb52-b164914135dd/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_gladiator_chest/layers/1cdabc8e-5838-4520-bb52-b164914135dd/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..011c5928e6 Binary files /dev/null and b/sprites/spr_mk7_gladiator_chest/layers/1cdabc8e-5838-4520-bb52-b164914135dd/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_gladiator_chest/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_gladiator_chest/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..70f78de723 Binary files /dev/null and b/sprites/spr_mk7_gladiator_chest/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy new file mode 100644 index 0000000000..fb09743eb1 --- /dev/null +++ b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_gladiator_chest", + "bbox_bottom": 88, + "bbox_left": 48, + "bbox_right": 114, + "bbox_top": 41, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1cdabc8e-5838-4520-bb52-b164914135dd",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"058bac9e-56f9-4a9e-8b2e-4ae998099703",}, + ], + "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_gladiator_chest", + "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":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},},},"Disabled":false,"id":"7154fd28-b589-4124-982c-0c705bca0e90","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1cdabc8e-5838-4520-bb52-b164914135dd","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},},},"Disabled":false,"id":"2b623e4d-4d87-4cc2-9ef5-9416c7741aea","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},},},"Disabled":false,"id":"dd2746b7-cdab-4df5-a8c4-ab06ddd6fbef","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_knightly_chest/af4b0687-a18b-4d72-85f6-2dc19b2e74c3.png b/sprites/spr_mk7_knightly_chest/af4b0687-a18b-4d72-85f6-2dc19b2e74c3.png new file mode 100644 index 0000000000..691a69b356 Binary files /dev/null and b/sprites/spr_mk7_knightly_chest/af4b0687-a18b-4d72-85f6-2dc19b2e74c3.png differ diff --git a/sprites/spr_mk7_knightly_chest/layers/af4b0687-a18b-4d72-85f6-2dc19b2e74c3/640b1254-f189-4493-9e59-55a352ffb392.png b/sprites/spr_mk7_knightly_chest/layers/af4b0687-a18b-4d72-85f6-2dc19b2e74c3/640b1254-f189-4493-9e59-55a352ffb392.png new file mode 100644 index 0000000000..691a69b356 Binary files /dev/null and b/sprites/spr_mk7_knightly_chest/layers/af4b0687-a18b-4d72-85f6-2dc19b2e74c3/640b1254-f189-4493-9e59-55a352ffb392.png differ diff --git a/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy b/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy new file mode 100644 index 0000000000..c03e13f2f1 --- /dev/null +++ b/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_knightly_chest", + "bbox_bottom": 73, + "bbox_left": 52, + "bbox_right": 111, + "bbox_top": 40, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"640b1254-f189-4493-9e59-55a352ffb392","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "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_knightly_chest", + "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":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},},},"Disabled":false,"id":"01437ca1-e985-4229-a447-001c9264a235","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": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_mongol_chest_variants/64394992-62c2-494d-9a48-1fdaec945713.png b/sprites/spr_mk7_mongol_chest_variants/64394992-62c2-494d-9a48-1fdaec945713.png new file mode 100644 index 0000000000..282cb6d366 Binary files /dev/null and b/sprites/spr_mk7_mongol_chest_variants/64394992-62c2-494d-9a48-1fdaec945713.png differ diff --git a/sprites/spr_mk7_mongol_chest_variants/b0e3fc64-2159-4eb7-a154-6acda8ba5207.png b/sprites/spr_mk7_mongol_chest_variants/b0e3fc64-2159-4eb7-a154-6acda8ba5207.png new file mode 100644 index 0000000000..714750dbd0 Binary files /dev/null and b/sprites/spr_mk7_mongol_chest_variants/b0e3fc64-2159-4eb7-a154-6acda8ba5207.png differ diff --git a/sprites/spr_mk7_mongol_chest_variants/layers/64394992-62c2-494d-9a48-1fdaec945713/44b77540-a981-430b-b35a-af66bd9cc96e.png b/sprites/spr_mk7_mongol_chest_variants/layers/64394992-62c2-494d-9a48-1fdaec945713/44b77540-a981-430b-b35a-af66bd9cc96e.png new file mode 100644 index 0000000000..282cb6d366 Binary files /dev/null and b/sprites/spr_mk7_mongol_chest_variants/layers/64394992-62c2-494d-9a48-1fdaec945713/44b77540-a981-430b-b35a-af66bd9cc96e.png differ diff --git a/sprites/spr_mk7_mongol_chest_variants/layers/b0e3fc64-2159-4eb7-a154-6acda8ba5207/44b77540-a981-430b-b35a-af66bd9cc96e.png b/sprites/spr_mk7_mongol_chest_variants/layers/b0e3fc64-2159-4eb7-a154-6acda8ba5207/44b77540-a981-430b-b35a-af66bd9cc96e.png new file mode 100644 index 0000000000..714750dbd0 Binary files /dev/null and b/sprites/spr_mk7_mongol_chest_variants/layers/b0e3fc64-2159-4eb7-a154-6acda8ba5207/44b77540-a981-430b-b35a-af66bd9cc96e.png differ diff --git a/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy b/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy new file mode 100644 index 0000000000..5ba34eab09 --- /dev/null +++ b/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy @@ -0,0 +1,76 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_mongol_chest_variants", + "bbox_bottom": 73, + "bbox_left": 52, + "bbox_right": 111, + "bbox_top": 40, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"64394992-62c2-494d-9a48-1fdaec945713",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"44b77540-a981-430b-b35a-af66bd9cc96e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "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_mongol_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": 2.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":"64394992-62c2-494d-9a48-1fdaec945713","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},},},"Disabled":false,"id":"687774f6-25e5-43b9-9644-afb140487387","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},},},"Disabled":false,"id":"bc0888e9-91c0-494a-b193-3ac7bb3db229","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, + "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_prussian/2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc.png b/sprites/spr_mk7_mouth_prussian/2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc.png new file mode 100644 index 0000000000..9f090afce1 Binary files /dev/null and b/sprites/spr_mk7_mouth_prussian/2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc.png differ diff --git a/sprites/spr_mk7_mouth_prussian/39559a84-9ef2-47ad-982c-840f197ffac7.png b/sprites/spr_mk7_mouth_prussian/39559a84-9ef2-47ad-982c-840f197ffac7.png new file mode 100644 index 0000000000..dd459d72f9 Binary files /dev/null and b/sprites/spr_mk7_mouth_prussian/39559a84-9ef2-47ad-982c-840f197ffac7.png differ diff --git a/sprites/spr_mk7_mouth_prussian/67b73bd0-4dda-4f23-b077-dcc3f76cbc45.png b/sprites/spr_mk7_mouth_prussian/67b73bd0-4dda-4f23-b077-dcc3f76cbc45.png new file mode 100644 index 0000000000..291872f960 Binary files /dev/null and b/sprites/spr_mk7_mouth_prussian/67b73bd0-4dda-4f23-b077-dcc3f76cbc45.png differ diff --git a/sprites/spr_mk7_mouth_prussian/layers/2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc/a6b1cbc4-cdba-42ab-b88a-7d772598f35f.png b/sprites/spr_mk7_mouth_prussian/layers/2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc/a6b1cbc4-cdba-42ab-b88a-7d772598f35f.png new file mode 100644 index 0000000000..9f090afce1 Binary files /dev/null and b/sprites/spr_mk7_mouth_prussian/layers/2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc/a6b1cbc4-cdba-42ab-b88a-7d772598f35f.png differ diff --git a/sprites/spr_mk7_mouth_prussian/layers/39559a84-9ef2-47ad-982c-840f197ffac7/a6b1cbc4-cdba-42ab-b88a-7d772598f35f.png b/sprites/spr_mk7_mouth_prussian/layers/39559a84-9ef2-47ad-982c-840f197ffac7/a6b1cbc4-cdba-42ab-b88a-7d772598f35f.png new file mode 100644 index 0000000000..dd459d72f9 Binary files /dev/null and b/sprites/spr_mk7_mouth_prussian/layers/39559a84-9ef2-47ad-982c-840f197ffac7/a6b1cbc4-cdba-42ab-b88a-7d772598f35f.png differ diff --git a/sprites/spr_mk7_mouth_prussian/layers/67b73bd0-4dda-4f23-b077-dcc3f76cbc45/a6b1cbc4-cdba-42ab-b88a-7d772598f35f.png b/sprites/spr_mk7_mouth_prussian/layers/67b73bd0-4dda-4f23-b077-dcc3f76cbc45/a6b1cbc4-cdba-42ab-b88a-7d772598f35f.png new file mode 100644 index 0000000000..291872f960 Binary files /dev/null and b/sprites/spr_mk7_mouth_prussian/layers/67b73bd0-4dda-4f23-b077-dcc3f76cbc45/a6b1cbc4-cdba-42ab-b88a-7d772598f35f.png differ diff --git a/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy b/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy new file mode 100644 index 0000000000..e0c9bc526a --- /dev/null +++ b/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_mouth_prussian", + "bbox_bottom": 48, + "bbox_left": 60, + "bbox_right": 103, + "bbox_top": 27, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"39559a84-9ef2-47ad-982c-840f197ffac7",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a6b1cbc4-cdba-42ab-b88a-7d772598f35f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "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_prussian", + "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":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},},},"Disabled":false,"id":"5d2d40c6-5430-4d09-a305-853a603296d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},},},"Disabled":false,"id":"3160ee19-f37b-4969-bc87-9c858e597b6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"39559a84-9ef2-47ad-982c-840f197ffac7","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},},},"Disabled":false,"id":"58009909-cf0f-4b81-96c4-5fa8378c9091","IsCreationKey":false,"Key":2.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": 164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_prussia_chest/5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441.png b/sprites/spr_mk7_prussia_chest/5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441.png new file mode 100644 index 0000000000..48372985e1 Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441.png differ diff --git a/sprites/spr_mk7_prussia_chest/9cefe8d7-2292-4e91-9b7c-c798eda8297d.png b/sprites/spr_mk7_prussia_chest/9cefe8d7-2292-4e91-9b7c-c798eda8297d.png new file mode 100644 index 0000000000..ff1db5d928 Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/9cefe8d7-2292-4e91-9b7c-c798eda8297d.png differ diff --git a/sprites/spr_mk7_prussia_chest/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_prussia_chest/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000..db8695979d Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_prussia_chest/be47593c-61a3-4f18-94fb-d10377ee52c2.png b/sprites/spr_mk7_prussia_chest/be47593c-61a3-4f18-94fb-d10377ee52c2.png new file mode 100644 index 0000000000..f946be2fde Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/be47593c-61a3-4f18-94fb-d10377ee52c2.png differ diff --git a/sprites/spr_mk7_prussia_chest/f29ddf8f-9b5f-481e-84fc-70def0f52822.png b/sprites/spr_mk7_prussia_chest/f29ddf8f-9b5f-481e-84fc-70def0f52822.png new file mode 100644 index 0000000000..528a522086 Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/f29ddf8f-9b5f-481e-84fc-70def0f52822.png differ diff --git a/sprites/spr_mk7_prussia_chest/layers/5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_prussia_chest/layers/5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..48372985e1 Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/layers/5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_prussia_chest/layers/9cefe8d7-2292-4e91-9b7c-c798eda8297d/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_prussia_chest/layers/9cefe8d7-2292-4e91-9b7c-c798eda8297d/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..ff1db5d928 Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/layers/9cefe8d7-2292-4e91-9b7c-c798eda8297d/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_prussia_chest/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_prussia_chest/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..db8695979d Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_prussia_chest/layers/be47593c-61a3-4f18-94fb-d10377ee52c2/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_prussia_chest/layers/be47593c-61a3-4f18-94fb-d10377ee52c2/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..f946be2fde Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/layers/be47593c-61a3-4f18-94fb-d10377ee52c2/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_prussia_chest/layers/f29ddf8f-9b5f-481e-84fc-70def0f52822/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_prussia_chest/layers/f29ddf8f-9b5f-481e-84fc-70def0f52822/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..528a522086 Binary files /dev/null and b/sprites/spr_mk7_prussia_chest/layers/f29ddf8f-9b5f-481e-84fc-70def0f52822/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy b/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy new file mode 100644 index 0000000000..cb557d1ae9 --- /dev/null +++ b/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy @@ -0,0 +1,82 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_prussia_chest", + "bbox_bottom": 82, + "bbox_left": 48, + "bbox_right": 114, + "bbox_top": 45, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f29ddf8f-9b5f-481e-84fc-70def0f52822",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"be47593c-61a3-4f18-94fb-d10377ee52c2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441",}, + ], + "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_prussia_chest", + "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":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},},},"Disabled":false,"id":"325b6201-0d39-4816-ab63-ff3059baaa71","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},},},"Disabled":false,"id":"8623654c-b493-4e7a-9016-c4cb86b3a5c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"be47593c-61a3-4f18-94fb-d10377ee52c2","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},},},"Disabled":false,"id":"a3a1701a-91b0-42b3-821d-2ca5b311081a","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},},},"Disabled":false,"id":"e60dbbc5-c2af-4409-87fb-f63db8f14b63","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},},},"Disabled":false,"id":"f4db6343-e700-4a31-9305-2b0c40459865","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_rope_belt/dbb220c9-62b6-4ca7-a13f-5951132d0d13.png b/sprites/spr_mk7_rope_belt/dbb220c9-62b6-4ca7-a13f-5951132d0d13.png new file mode 100644 index 0000000000..985379f2e3 Binary files /dev/null and b/sprites/spr_mk7_rope_belt/dbb220c9-62b6-4ca7-a13f-5951132d0d13.png differ diff --git a/sprites/spr_mk7_rope_belt/layers/dbb220c9-62b6-4ca7-a13f-5951132d0d13/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_rope_belt/layers/dbb220c9-62b6-4ca7-a13f-5951132d0d13/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..985379f2e3 Binary files /dev/null and b/sprites/spr_mk7_rope_belt/layers/dbb220c9-62b6-4ca7-a13f-5951132d0d13/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy b/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy new file mode 100644 index 0000000000..0a5a633e35 --- /dev/null +++ b/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_mk7_rope_belt", + "bbox_bottom": 163, + "bbox_left": 51, + "bbox_right": 113, + "bbox_top": 88, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13",}, + ], + "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_rope_belt", + "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":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy",},},},"Disabled":false,"id":"7e921701-e99d-41a9-82a0-24a921a8ed56","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_thorax_variants/2a8cd791-4f7b-4fe6-993f-255b1e395f90.png b/sprites/spr_mk7_thorax_variants/2a8cd791-4f7b-4fe6-993f-255b1e395f90.png index 3e113c2a12..0e2140a2d1 100644 Binary files a/sprites/spr_mk7_thorax_variants/2a8cd791-4f7b-4fe6-993f-255b1e395f90.png and b/sprites/spr_mk7_thorax_variants/2a8cd791-4f7b-4fe6-993f-255b1e395f90.png differ diff --git a/sprites/spr_mk7_thorax_variants/819e247d-9b1e-4fdc-a9d8-b719ed4cd316.png b/sprites/spr_mk7_thorax_variants/819e247d-9b1e-4fdc-a9d8-b719ed4cd316.png index def468bf34..5b87f4d38a 100644 Binary files a/sprites/spr_mk7_thorax_variants/819e247d-9b1e-4fdc-a9d8-b719ed4cd316.png and b/sprites/spr_mk7_thorax_variants/819e247d-9b1e-4fdc-a9d8-b719ed4cd316.png differ diff --git a/sprites/spr_mk7_thorax_variants/979ec1c1-5d04-49f0-bb6c-2260773073c8.png b/sprites/spr_mk7_thorax_variants/979ec1c1-5d04-49f0-bb6c-2260773073c8.png index 3087150611..8d4a855c6b 100644 Binary files a/sprites/spr_mk7_thorax_variants/979ec1c1-5d04-49f0-bb6c-2260773073c8.png and b/sprites/spr_mk7_thorax_variants/979ec1c1-5d04-49f0-bb6c-2260773073c8.png differ diff --git a/sprites/spr_mk7_thorax_variants/d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6.png b/sprites/spr_mk7_thorax_variants/d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6.png index 0a52a60eb2..6ee09b786d 100644 Binary files a/sprites/spr_mk7_thorax_variants/d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6.png and b/sprites/spr_mk7_thorax_variants/d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6.png differ diff --git a/sprites/spr_mk7_thorax_variants/layers/2a8cd791-4f7b-4fe6-993f-255b1e395f90/acc4026b-406b-4bc8-8580-0d5dfad0db54.png b/sprites/spr_mk7_thorax_variants/layers/2a8cd791-4f7b-4fe6-993f-255b1e395f90/acc4026b-406b-4bc8-8580-0d5dfad0db54.png index 3e113c2a12..0e2140a2d1 100644 Binary files a/sprites/spr_mk7_thorax_variants/layers/2a8cd791-4f7b-4fe6-993f-255b1e395f90/acc4026b-406b-4bc8-8580-0d5dfad0db54.png and b/sprites/spr_mk7_thorax_variants/layers/2a8cd791-4f7b-4fe6-993f-255b1e395f90/acc4026b-406b-4bc8-8580-0d5dfad0db54.png differ diff --git a/sprites/spr_mk7_thorax_variants/layers/819e247d-9b1e-4fdc-a9d8-b719ed4cd316/acc4026b-406b-4bc8-8580-0d5dfad0db54.png b/sprites/spr_mk7_thorax_variants/layers/819e247d-9b1e-4fdc-a9d8-b719ed4cd316/acc4026b-406b-4bc8-8580-0d5dfad0db54.png index def468bf34..5b87f4d38a 100644 Binary files a/sprites/spr_mk7_thorax_variants/layers/819e247d-9b1e-4fdc-a9d8-b719ed4cd316/acc4026b-406b-4bc8-8580-0d5dfad0db54.png and b/sprites/spr_mk7_thorax_variants/layers/819e247d-9b1e-4fdc-a9d8-b719ed4cd316/acc4026b-406b-4bc8-8580-0d5dfad0db54.png differ diff --git a/sprites/spr_mk7_thorax_variants/layers/979ec1c1-5d04-49f0-bb6c-2260773073c8/acc4026b-406b-4bc8-8580-0d5dfad0db54.png b/sprites/spr_mk7_thorax_variants/layers/979ec1c1-5d04-49f0-bb6c-2260773073c8/acc4026b-406b-4bc8-8580-0d5dfad0db54.png index 3087150611..8d4a855c6b 100644 Binary files a/sprites/spr_mk7_thorax_variants/layers/979ec1c1-5d04-49f0-bb6c-2260773073c8/acc4026b-406b-4bc8-8580-0d5dfad0db54.png and b/sprites/spr_mk7_thorax_variants/layers/979ec1c1-5d04-49f0-bb6c-2260773073c8/acc4026b-406b-4bc8-8580-0d5dfad0db54.png differ diff --git a/sprites/spr_mk7_thorax_variants/layers/d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6/acc4026b-406b-4bc8-8580-0d5dfad0db54.png b/sprites/spr_mk7_thorax_variants/layers/d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6/acc4026b-406b-4bc8-8580-0d5dfad0db54.png index 0a52a60eb2..6ee09b786d 100644 Binary files a/sprites/spr_mk7_thorax_variants/layers/d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6/acc4026b-406b-4bc8-8580-0d5dfad0db54.png and b/sprites/spr_mk7_thorax_variants/layers/d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6/acc4026b-406b-4bc8-8580-0d5dfad0db54.png differ diff --git a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy index 2b5546178d..8420573c40 100644 --- a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy +++ b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_mk7_thorax_variants", - "bbox_bottom": 90, + "bbox_bottom": 94, "bbox_left": 0, "bbox_right": 99, "bbox_top": 0, diff --git a/sprites/spr_new_ui/237fde07-03da-4332-b471-2f7f691fb003.png b/sprites/spr_new_ui/237fde07-03da-4332-b471-2f7f691fb003.png index a2d392afa4..f4ac8c5bca 100644 Binary files a/sprites/spr_new_ui/237fde07-03da-4332-b471-2f7f691fb003.png and b/sprites/spr_new_ui/237fde07-03da-4332-b471-2f7f691fb003.png differ diff --git a/sprites/spr_new_ui/751eeb13-8d20-4ec3-a112-2614d1d1869c.png b/sprites/spr_new_ui/751eeb13-8d20-4ec3-a112-2614d1d1869c.png index 5a6ab763c5..2eb5ef23ed 100644 Binary files a/sprites/spr_new_ui/751eeb13-8d20-4ec3-a112-2614d1d1869c.png and b/sprites/spr_new_ui/751eeb13-8d20-4ec3-a112-2614d1d1869c.png differ diff --git a/sprites/spr_new_ui/layers/237fde07-03da-4332-b471-2f7f691fb003/33cefcc3-323a-492a-91f6-1f89868a1e47.png b/sprites/spr_new_ui/layers/237fde07-03da-4332-b471-2f7f691fb003/33cefcc3-323a-492a-91f6-1f89868a1e47.png index a2d392afa4..ed48170136 100644 Binary files a/sprites/spr_new_ui/layers/237fde07-03da-4332-b471-2f7f691fb003/33cefcc3-323a-492a-91f6-1f89868a1e47.png and b/sprites/spr_new_ui/layers/237fde07-03da-4332-b471-2f7f691fb003/33cefcc3-323a-492a-91f6-1f89868a1e47.png differ diff --git a/sprites/spr_new_ui/layers/751eeb13-8d20-4ec3-a112-2614d1d1869c/33cefcc3-323a-492a-91f6-1f89868a1e47.png b/sprites/spr_new_ui/layers/751eeb13-8d20-4ec3-a112-2614d1d1869c/33cefcc3-323a-492a-91f6-1f89868a1e47.png index 5a6ab763c5..071a1bf0ed 100644 Binary files a/sprites/spr_new_ui/layers/751eeb13-8d20-4ec3-a112-2614d1d1869c/33cefcc3-323a-492a-91f6-1f89868a1e47.png and b/sprites/spr_new_ui/layers/751eeb13-8d20-4ec3-a112-2614d1d1869c/33cefcc3-323a-492a-91f6-1f89868a1e47.png differ diff --git a/sprites/spr_pa_hands/03fa6ac5-772e-4580-9e7e-3eaf30b21491.png b/sprites/spr_pa_hands/03fa6ac5-772e-4580-9e7e-3eaf30b21491.png index f35ea258a9..8cccd02e45 100644 Binary files a/sprites/spr_pa_hands/03fa6ac5-772e-4580-9e7e-3eaf30b21491.png and b/sprites/spr_pa_hands/03fa6ac5-772e-4580-9e7e-3eaf30b21491.png differ diff --git a/sprites/spr_pa_hands/155b1984-8759-413d-8092-2796ab1a3a09.png b/sprites/spr_pa_hands/155b1984-8759-413d-8092-2796ab1a3a09.png index 5b5ac5eed2..d2b0864223 100644 Binary files a/sprites/spr_pa_hands/155b1984-8759-413d-8092-2796ab1a3a09.png and b/sprites/spr_pa_hands/155b1984-8759-413d-8092-2796ab1a3a09.png differ diff --git a/sprites/spr_pa_hands/20c640ed-d95e-40ec-bbda-7300bdb69b68.png b/sprites/spr_pa_hands/20c640ed-d95e-40ec-bbda-7300bdb69b68.png index d90cb2038d..489b1911c0 100644 Binary files a/sprites/spr_pa_hands/20c640ed-d95e-40ec-bbda-7300bdb69b68.png and b/sprites/spr_pa_hands/20c640ed-d95e-40ec-bbda-7300bdb69b68.png differ diff --git a/sprites/spr_pa_hands/50dac15c-77fd-4ed1-8285-b9ad17031b87.png b/sprites/spr_pa_hands/50dac15c-77fd-4ed1-8285-b9ad17031b87.png index 06e70e114f..77bbee6c88 100644 Binary files a/sprites/spr_pa_hands/50dac15c-77fd-4ed1-8285-b9ad17031b87.png and b/sprites/spr_pa_hands/50dac15c-77fd-4ed1-8285-b9ad17031b87.png differ diff --git a/sprites/spr_pa_hands/6eff66f0-db00-47d5-b4be-d57184964002.png b/sprites/spr_pa_hands/6eff66f0-db00-47d5-b4be-d57184964002.png index 18d28c066c..2ab40cc5b4 100644 Binary files a/sprites/spr_pa_hands/6eff66f0-db00-47d5-b4be-d57184964002.png and b/sprites/spr_pa_hands/6eff66f0-db00-47d5-b4be-d57184964002.png differ diff --git a/sprites/spr_pa_hands/84bcd5f4-d5f6-4fab-a2ae-15204455599d.png b/sprites/spr_pa_hands/84bcd5f4-d5f6-4fab-a2ae-15204455599d.png index fc72593fd4..20e7ca6bdc 100644 Binary files a/sprites/spr_pa_hands/84bcd5f4-d5f6-4fab-a2ae-15204455599d.png and b/sprites/spr_pa_hands/84bcd5f4-d5f6-4fab-a2ae-15204455599d.png differ diff --git a/sprites/spr_pa_hands/9dd4e8a9-3493-4422-8009-b60fa5153b4d.png b/sprites/spr_pa_hands/9dd4e8a9-3493-4422-8009-b60fa5153b4d.png index 6070eed7b3..3068d9fb51 100644 Binary files a/sprites/spr_pa_hands/9dd4e8a9-3493-4422-8009-b60fa5153b4d.png and b/sprites/spr_pa_hands/9dd4e8a9-3493-4422-8009-b60fa5153b4d.png differ diff --git a/sprites/spr_pa_hands/a35b258a-44c7-430f-99de-c54f836b592a.png b/sprites/spr_pa_hands/a35b258a-44c7-430f-99de-c54f836b592a.png index 65e28a3bf1..ec6dab2879 100644 Binary files a/sprites/spr_pa_hands/a35b258a-44c7-430f-99de-c54f836b592a.png and b/sprites/spr_pa_hands/a35b258a-44c7-430f-99de-c54f836b592a.png differ diff --git a/sprites/spr_pa_hands/b6827b9c-6f8a-4700-91e5-b7b0cf730f8a.png b/sprites/spr_pa_hands/b6827b9c-6f8a-4700-91e5-b7b0cf730f8a.png index 79b608ab45..134e6cf76c 100644 Binary files a/sprites/spr_pa_hands/b6827b9c-6f8a-4700-91e5-b7b0cf730f8a.png and b/sprites/spr_pa_hands/b6827b9c-6f8a-4700-91e5-b7b0cf730f8a.png differ diff --git a/sprites/spr_pa_hands/c85b1159-fa0f-48ec-93eb-753cf138faf3.png b/sprites/spr_pa_hands/c85b1159-fa0f-48ec-93eb-753cf138faf3.png index 846f39e2bf..ca366e6286 100644 Binary files a/sprites/spr_pa_hands/c85b1159-fa0f-48ec-93eb-753cf138faf3.png and b/sprites/spr_pa_hands/c85b1159-fa0f-48ec-93eb-753cf138faf3.png differ diff --git a/sprites/spr_pa_hands/layers/03fa6ac5-772e-4580-9e7e-3eaf30b21491/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/03fa6ac5-772e-4580-9e7e-3eaf30b21491/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index f35ea258a9..8cccd02e45 100644 Binary files a/sprites/spr_pa_hands/layers/03fa6ac5-772e-4580-9e7e-3eaf30b21491/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/03fa6ac5-772e-4580-9e7e-3eaf30b21491/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_pa_hands/layers/155b1984-8759-413d-8092-2796ab1a3a09/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/155b1984-8759-413d-8092-2796ab1a3a09/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index 5b5ac5eed2..d2b0864223 100644 Binary files a/sprites/spr_pa_hands/layers/155b1984-8759-413d-8092-2796ab1a3a09/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/155b1984-8759-413d-8092-2796ab1a3a09/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_pa_hands/layers/20c640ed-d95e-40ec-bbda-7300bdb69b68/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/20c640ed-d95e-40ec-bbda-7300bdb69b68/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index d90cb2038d..489b1911c0 100644 Binary files a/sprites/spr_pa_hands/layers/20c640ed-d95e-40ec-bbda-7300bdb69b68/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/20c640ed-d95e-40ec-bbda-7300bdb69b68/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_pa_hands/layers/50dac15c-77fd-4ed1-8285-b9ad17031b87/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/50dac15c-77fd-4ed1-8285-b9ad17031b87/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index 06e70e114f..77bbee6c88 100644 Binary files a/sprites/spr_pa_hands/layers/50dac15c-77fd-4ed1-8285-b9ad17031b87/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/50dac15c-77fd-4ed1-8285-b9ad17031b87/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_pa_hands/layers/6eff66f0-db00-47d5-b4be-d57184964002/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/6eff66f0-db00-47d5-b4be-d57184964002/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index 18d28c066c..2ab40cc5b4 100644 Binary files a/sprites/spr_pa_hands/layers/6eff66f0-db00-47d5-b4be-d57184964002/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/6eff66f0-db00-47d5-b4be-d57184964002/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_pa_hands/layers/84bcd5f4-d5f6-4fab-a2ae-15204455599d/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/84bcd5f4-d5f6-4fab-a2ae-15204455599d/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index dc9f848df7..20e7ca6bdc 100644 Binary files a/sprites/spr_pa_hands/layers/84bcd5f4-d5f6-4fab-a2ae-15204455599d/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/84bcd5f4-d5f6-4fab-a2ae-15204455599d/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_pa_hands/layers/9dd4e8a9-3493-4422-8009-b60fa5153b4d/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/9dd4e8a9-3493-4422-8009-b60fa5153b4d/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index 6070eed7b3..3068d9fb51 100644 Binary files a/sprites/spr_pa_hands/layers/9dd4e8a9-3493-4422-8009-b60fa5153b4d/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/9dd4e8a9-3493-4422-8009-b60fa5153b4d/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_pa_hands/layers/a35b258a-44c7-430f-99de-c54f836b592a/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/a35b258a-44c7-430f-99de-c54f836b592a/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index 65e28a3bf1..ec6dab2879 100644 Binary files a/sprites/spr_pa_hands/layers/a35b258a-44c7-430f-99de-c54f836b592a/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/a35b258a-44c7-430f-99de-c54f836b592a/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_pa_hands/layers/b6827b9c-6f8a-4700-91e5-b7b0cf730f8a/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/b6827b9c-6f8a-4700-91e5-b7b0cf730f8a/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index 79b608ab45..134e6cf76c 100644 Binary files a/sprites/spr_pa_hands/layers/b6827b9c-6f8a-4700-91e5-b7b0cf730f8a/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/b6827b9c-6f8a-4700-91e5-b7b0cf730f8a/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_pa_hands/layers/c85b1159-fa0f-48ec-93eb-753cf138faf3/93f64352-b53f-4c51-9e4d-9bc00b19174b.png b/sprites/spr_pa_hands/layers/c85b1159-fa0f-48ec-93eb-753cf138faf3/93f64352-b53f-4c51-9e4d-9bc00b19174b.png index 846f39e2bf..ca366e6286 100644 Binary files a/sprites/spr_pa_hands/layers/c85b1159-fa0f-48ec-93eb-753cf138faf3/93f64352-b53f-4c51-9e4d-9bc00b19174b.png and b/sprites/spr_pa_hands/layers/c85b1159-fa0f-48ec-93eb-753cf138faf3/93f64352-b53f-4c51-9e4d-9bc00b19174b.png differ diff --git a/sprites/spr_prussian_spike/15b2950d-a703-41a5-9fda-cf6e20097872.png b/sprites/spr_prussian_spike/15b2950d-a703-41a5-9fda-cf6e20097872.png new file mode 100644 index 0000000000..3153675e99 Binary files /dev/null and b/sprites/spr_prussian_spike/15b2950d-a703-41a5-9fda-cf6e20097872.png differ diff --git a/sprites/spr_prussian_spike/441fec2f-4b09-4221-8c3f-ea3cd809adeb.png b/sprites/spr_prussian_spike/441fec2f-4b09-4221-8c3f-ea3cd809adeb.png new file mode 100644 index 0000000000..0082a16198 Binary files /dev/null and b/sprites/spr_prussian_spike/441fec2f-4b09-4221-8c3f-ea3cd809adeb.png differ diff --git a/sprites/spr_prussian_spike/5a405388-8efb-49b6-a38f-f27ec42f29e3.png b/sprites/spr_prussian_spike/5a405388-8efb-49b6-a38f-f27ec42f29e3.png new file mode 100644 index 0000000000..1f417f38b1 Binary files /dev/null and b/sprites/spr_prussian_spike/5a405388-8efb-49b6-a38f-f27ec42f29e3.png differ diff --git a/sprites/spr_prussian_spike/cae929a5-f374-473f-a6d0-cf192764bb7e.png b/sprites/spr_prussian_spike/cae929a5-f374-473f-a6d0-cf192764bb7e.png new file mode 100644 index 0000000000..c15f83a804 Binary files /dev/null and b/sprites/spr_prussian_spike/cae929a5-f374-473f-a6d0-cf192764bb7e.png differ diff --git a/sprites/spr_prussian_spike/f63f419a-507b-4755-ad2f-88e97c7be7f9.png b/sprites/spr_prussian_spike/f63f419a-507b-4755-ad2f-88e97c7be7f9.png new file mode 100644 index 0000000000..16b751846e Binary files /dev/null and b/sprites/spr_prussian_spike/f63f419a-507b-4755-ad2f-88e97c7be7f9.png differ diff --git a/sprites/spr_prussian_spike/layers/15b2950d-a703-41a5-9fda-cf6e20097872/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png b/sprites/spr_prussian_spike/layers/15b2950d-a703-41a5-9fda-cf6e20097872/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png new file mode 100644 index 0000000000..3153675e99 Binary files /dev/null and b/sprites/spr_prussian_spike/layers/15b2950d-a703-41a5-9fda-cf6e20097872/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png differ diff --git a/sprites/spr_prussian_spike/layers/441fec2f-4b09-4221-8c3f-ea3cd809adeb/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png b/sprites/spr_prussian_spike/layers/441fec2f-4b09-4221-8c3f-ea3cd809adeb/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png new file mode 100644 index 0000000000..0082a16198 Binary files /dev/null and b/sprites/spr_prussian_spike/layers/441fec2f-4b09-4221-8c3f-ea3cd809adeb/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png differ diff --git a/sprites/spr_prussian_spike/layers/5a405388-8efb-49b6-a38f-f27ec42f29e3/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png b/sprites/spr_prussian_spike/layers/5a405388-8efb-49b6-a38f-f27ec42f29e3/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png new file mode 100644 index 0000000000..1f417f38b1 Binary files /dev/null and b/sprites/spr_prussian_spike/layers/5a405388-8efb-49b6-a38f-f27ec42f29e3/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png differ diff --git a/sprites/spr_prussian_spike/layers/cae929a5-f374-473f-a6d0-cf192764bb7e/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png b/sprites/spr_prussian_spike/layers/cae929a5-f374-473f-a6d0-cf192764bb7e/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png new file mode 100644 index 0000000000..c15f83a804 Binary files /dev/null and b/sprites/spr_prussian_spike/layers/cae929a5-f374-473f-a6d0-cf192764bb7e/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png differ diff --git a/sprites/spr_prussian_spike/layers/f63f419a-507b-4755-ad2f-88e97c7be7f9/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png b/sprites/spr_prussian_spike/layers/f63f419a-507b-4755-ad2f-88e97c7be7f9/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png new file mode 100644 index 0000000000..16b751846e Binary files /dev/null and b/sprites/spr_prussian_spike/layers/f63f419a-507b-4755-ad2f-88e97c7be7f9/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png differ diff --git a/sprites/spr_prussian_spike/spr_prussian_spike.yy b/sprites/spr_prussian_spike/spr_prussian_spike.yy new file mode 100644 index 0000000000..757988fc5c --- /dev/null +++ b/sprites/spr_prussian_spike/spr_prussian_spike.yy @@ -0,0 +1,82 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_prussian_spike", + "bbox_bottom": 64, + "bbox_left": 0, + "bbox_right": 86, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cae929a5-f374-473f-a6d0-cf192764bb7e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f63f419a-507b-4755-ad2f-88e97c7be7f9",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"15b2950d-a703-41a5-9fda-cf6e20097872",}, + ], + "gridX": 0, + "gridY": 0, + "height": 322, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bec54e42-2d69-41b0-a1d3-e3624a334ed8","blendMode":0,"displayName":"default","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_prussian_spike", + "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":"5a405388-8efb-49b6-a38f-f27ec42f29e3","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},},},"Disabled":false,"id":"7710b0d4-f532-4e1b-9547-19ebdc6eba63","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},},},"Disabled":false,"id":"6cd9f835-bb5b-4f5a-ac74-9bba33318a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cae929a5-f374-473f-a6d0-cf192764bb7e","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},},},"Disabled":false,"id":"c2a07b9a-97cc-468f-8185-eed5040dcffe","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},},},"Disabled":false,"id":"d774d0a5-b13e-404b-be5a-1c394506d7c7","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"15b2950d-a703-41a5-9fda-cf6e20097872","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},},},"Disabled":false,"id":"d2053dfa-4aca-4c73-b641-8710602b8f93","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": 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_psy_hood_complex/da4d2ca5-ded6-4a96-bef4-a1c048f10f67.png b/sprites/spr_psy_hood_complex/da4d2ca5-ded6-4a96-bef4-a1c048f10f67.png index 108e507b25..f2fb69297c 100644 Binary files a/sprites/spr_psy_hood_complex/da4d2ca5-ded6-4a96-bef4-a1c048f10f67.png and b/sprites/spr_psy_hood_complex/da4d2ca5-ded6-4a96-bef4-a1c048f10f67.png differ diff --git a/sprites/spr_psy_hood_complex/layers/da4d2ca5-ded6-4a96-bef4-a1c048f10f67/0b5e7fba-d4a1-441e-a726-f45a72c56663.png b/sprites/spr_psy_hood_complex/layers/da4d2ca5-ded6-4a96-bef4-a1c048f10f67/0b5e7fba-d4a1-441e-a726-f45a72c56663.png index 108e507b25..f2fb69297c 100644 Binary files a/sprites/spr_psy_hood_complex/layers/da4d2ca5-ded6-4a96-bef4-a1c048f10f67/0b5e7fba-d4a1-441e-a726-f45a72c56663.png and b/sprites/spr_psy_hood_complex/layers/da4d2ca5-ded6-4a96-bef4-a1c048f10f67/0b5e7fba-d4a1-441e-a726-f45a72c56663.png differ diff --git a/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy index fec7bc25a2..2056feefb0 100644 --- a/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy +++ b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy @@ -3,8 +3,8 @@ "resourceVersion": "1.0", "name": "spr_psy_hood_complex", "bbox_bottom": 51, - "bbox_left": 58, - "bbox_right": 108, + "bbox_left": 56, + "bbox_right": 106, "bbox_top": 7, "bboxMode": 0, "collisionKind": 1, diff --git a/sprites/spr_purity_seal/39dc5d62-01e8-4a52-99be-1d12790fcbfc.png b/sprites/spr_purity_seal/39dc5d62-01e8-4a52-99be-1d12790fcbfc.png index 955052ef45..83306a43f8 100644 Binary files a/sprites/spr_purity_seal/39dc5d62-01e8-4a52-99be-1d12790fcbfc.png and b/sprites/spr_purity_seal/39dc5d62-01e8-4a52-99be-1d12790fcbfc.png differ diff --git a/sprites/spr_purity_seal/40957cfc-9310-4d3e-82de-89b771ac8e99.png b/sprites/spr_purity_seal/40957cfc-9310-4d3e-82de-89b771ac8e99.png index 6f301946c2..e3f45a03ec 100644 Binary files a/sprites/spr_purity_seal/40957cfc-9310-4d3e-82de-89b771ac8e99.png and b/sprites/spr_purity_seal/40957cfc-9310-4d3e-82de-89b771ac8e99.png differ diff --git a/sprites/spr_purity_seal/595ff173-4df7-4f84-aebc-576f91f18c23.png b/sprites/spr_purity_seal/595ff173-4df7-4f84-aebc-576f91f18c23.png index fa92130fbf..85c4acb7d9 100644 Binary files a/sprites/spr_purity_seal/595ff173-4df7-4f84-aebc-576f91f18c23.png and b/sprites/spr_purity_seal/595ff173-4df7-4f84-aebc-576f91f18c23.png differ diff --git a/sprites/spr_purity_seal/cd65f936-1dae-4e5a-a681-a5d359010378.png b/sprites/spr_purity_seal/cd65f936-1dae-4e5a-a681-a5d359010378.png index b3d4c7c278..0f839395ee 100644 Binary files a/sprites/spr_purity_seal/cd65f936-1dae-4e5a-a681-a5d359010378.png and b/sprites/spr_purity_seal/cd65f936-1dae-4e5a-a681-a5d359010378.png differ diff --git a/sprites/spr_purity_seal/layers/39dc5d62-01e8-4a52-99be-1d12790fcbfc/ede525ce-e717-4c24-94ca-22f1785afcf9.png b/sprites/spr_purity_seal/layers/39dc5d62-01e8-4a52-99be-1d12790fcbfc/ede525ce-e717-4c24-94ca-22f1785afcf9.png index 6283b28ae3..83306a43f8 100644 Binary files a/sprites/spr_purity_seal/layers/39dc5d62-01e8-4a52-99be-1d12790fcbfc/ede525ce-e717-4c24-94ca-22f1785afcf9.png and b/sprites/spr_purity_seal/layers/39dc5d62-01e8-4a52-99be-1d12790fcbfc/ede525ce-e717-4c24-94ca-22f1785afcf9.png differ diff --git a/sprites/spr_purity_seal/layers/40957cfc-9310-4d3e-82de-89b771ac8e99/ede525ce-e717-4c24-94ca-22f1785afcf9.png b/sprites/spr_purity_seal/layers/40957cfc-9310-4d3e-82de-89b771ac8e99/ede525ce-e717-4c24-94ca-22f1785afcf9.png index 6f301946c2..e3f45a03ec 100644 Binary files a/sprites/spr_purity_seal/layers/40957cfc-9310-4d3e-82de-89b771ac8e99/ede525ce-e717-4c24-94ca-22f1785afcf9.png and b/sprites/spr_purity_seal/layers/40957cfc-9310-4d3e-82de-89b771ac8e99/ede525ce-e717-4c24-94ca-22f1785afcf9.png differ diff --git a/sprites/spr_purity_seal/layers/595ff173-4df7-4f84-aebc-576f91f18c23/ede525ce-e717-4c24-94ca-22f1785afcf9.png b/sprites/spr_purity_seal/layers/595ff173-4df7-4f84-aebc-576f91f18c23/ede525ce-e717-4c24-94ca-22f1785afcf9.png index fa92130fbf..85c4acb7d9 100644 Binary files a/sprites/spr_purity_seal/layers/595ff173-4df7-4f84-aebc-576f91f18c23/ede525ce-e717-4c24-94ca-22f1785afcf9.png and b/sprites/spr_purity_seal/layers/595ff173-4df7-4f84-aebc-576f91f18c23/ede525ce-e717-4c24-94ca-22f1785afcf9.png differ diff --git a/sprites/spr_purity_seal/layers/cd65f936-1dae-4e5a-a681-a5d359010378/ede525ce-e717-4c24-94ca-22f1785afcf9.png b/sprites/spr_purity_seal/layers/cd65f936-1dae-4e5a-a681-a5d359010378/ede525ce-e717-4c24-94ca-22f1785afcf9.png index b3d4c7c278..0f839395ee 100644 Binary files a/sprites/spr_purity_seal/layers/cd65f936-1dae-4e5a-a681-a5d359010378/ede525ce-e717-4c24-94ca-22f1785afcf9.png and b/sprites/spr_purity_seal/layers/cd65f936-1dae-4e5a-a681-a5d359010378/ede525ce-e717-4c24-94ca-22f1785afcf9.png differ diff --git a/sprites/spr_purity_seal/spr_purity_seal.yy b/sprites/spr_purity_seal/spr_purity_seal.yy index df11348ee6..4e216f14e4 100644 --- a/sprites/spr_purity_seal/spr_purity_seal.yy +++ b/sprites/spr_purity_seal/spr_purity_seal.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_purity_seal", - "bbox_bottom": 95, - "bbox_left": 63, - "bbox_right": 112, - "bbox_top": 61, + "bbox_bottom": 34, + "bbox_left": 1, + "bbox_right": 23, + "bbox_top": 1, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, diff --git a/sprites/spr_roman_centurian_crest/93ba81df-88f2-4d08-9f82-8e78097802e9.png b/sprites/spr_roman_centurian_crest/93ba81df-88f2-4d08-9f82-8e78097802e9.png new file mode 100644 index 0000000000..0943435a5f Binary files /dev/null and b/sprites/spr_roman_centurian_crest/93ba81df-88f2-4d08-9f82-8e78097802e9.png differ diff --git a/sprites/spr_roman_centurian_crest/dd649fd8-7e35-4852-a36d-a78f4f914d36.png b/sprites/spr_roman_centurian_crest/dd649fd8-7e35-4852-a36d-a78f4f914d36.png new file mode 100644 index 0000000000..1457703b17 Binary files /dev/null and b/sprites/spr_roman_centurian_crest/dd649fd8-7e35-4852-a36d-a78f4f914d36.png differ diff --git a/sprites/spr_roman_centurian_crest/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e.png b/sprites/spr_roman_centurian_crest/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e.png new file mode 100644 index 0000000000..306f9d6d46 Binary files /dev/null and b/sprites/spr_roman_centurian_crest/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e.png differ diff --git a/sprites/spr_roman_centurian_crest/layers/93ba81df-88f2-4d08-9f82-8e78097802e9/64b58388-e289-40ea-a052-9e4c81b52b82.png b/sprites/spr_roman_centurian_crest/layers/93ba81df-88f2-4d08-9f82-8e78097802e9/64b58388-e289-40ea-a052-9e4c81b52b82.png new file mode 100644 index 0000000000..0943435a5f Binary files /dev/null and b/sprites/spr_roman_centurian_crest/layers/93ba81df-88f2-4d08-9f82-8e78097802e9/64b58388-e289-40ea-a052-9e4c81b52b82.png differ diff --git a/sprites/spr_roman_centurian_crest/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/64b58388-e289-40ea-a052-9e4c81b52b82.png b/sprites/spr_roman_centurian_crest/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/64b58388-e289-40ea-a052-9e4c81b52b82.png new file mode 100644 index 0000000000..1457703b17 Binary files /dev/null and b/sprites/spr_roman_centurian_crest/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/64b58388-e289-40ea-a052-9e4c81b52b82.png differ diff --git a/sprites/spr_roman_centurian_crest/layers/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e/64b58388-e289-40ea-a052-9e4c81b52b82.png b/sprites/spr_roman_centurian_crest/layers/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e/64b58388-e289-40ea-a052-9e4c81b52b82.png new file mode 100644 index 0000000000..306f9d6d46 Binary files /dev/null and b/sprites/spr_roman_centurian_crest/layers/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e/64b58388-e289-40ea-a052-9e4c81b52b82.png differ diff --git a/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy new file mode 100644 index 0000000000..71f4123489 --- /dev/null +++ b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_roman_centurian_crest", + "bbox_bottom": 87, + "bbox_left": 18, + "bbox_right": 105, + "bbox_top": 14, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dd649fd8-7e35-4852-a36d-a78f4f914d36",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"93ba81df-88f2-4d08-9f82-8e78097802e9",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"64b58388-e289-40ea-a052-9e4c81b52b82","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "roman_theme", + "path": "folders/Sprites/Marine Viewer/body_types/specialist/roman_theme.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_roman_centurian_crest", + "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":"dd649fd8-7e35-4852-a36d-a78f4f914d36","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},},},"Disabled":false,"id":"508f7cdc-6556-4fd2-ae19-caa00fdda7cd","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},},},"Disabled":false,"id":"081e45b1-f437-4ec9-bca2-4b4d5bd6000f","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"93ba81df-88f2-4d08-9f82-8e78097802e9","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},},},"Disabled":false,"id":"2c11e64b-0ad4-4a34-a388-29e5e02054b8","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 40, + }, + "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_roman_cloak/a480dd5e-cfcb-474b-a59c-731ac71985a6.png b/sprites/spr_roman_cloak/a480dd5e-cfcb-474b-a59c-731ac71985a6.png new file mode 100644 index 0000000000..c5b2619717 Binary files /dev/null and b/sprites/spr_roman_cloak/a480dd5e-cfcb-474b-a59c-731ac71985a6.png differ diff --git a/sprites/spr_roman_cloak/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png b/sprites/spr_roman_cloak/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_roman_cloak/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png differ diff --git a/sprites/spr_roman_cloak/layers/a480dd5e-cfcb-474b-a59c-731ac71985a6/130451fb-16f0-4265-878c-26960bb8d8fe.png b/sprites/spr_roman_cloak/layers/a480dd5e-cfcb-474b-a59c-731ac71985a6/130451fb-16f0-4265-878c-26960bb8d8fe.png new file mode 100644 index 0000000000..c5b2619717 Binary files /dev/null and b/sprites/spr_roman_cloak/layers/a480dd5e-cfcb-474b-a59c-731ac71985a6/130451fb-16f0-4265-878c-26960bb8d8fe.png differ diff --git a/sprites/spr_roman_cloak/layers/a480dd5e-cfcb-474b-a59c-731ac71985a6/18d7475b-a064-4b1b-bea9-2c3c1f2bc16e.png b/sprites/spr_roman_cloak/layers/a480dd5e-cfcb-474b-a59c-731ac71985a6/18d7475b-a064-4b1b-bea9-2c3c1f2bc16e.png new file mode 100644 index 0000000000..e12010b660 Binary files /dev/null and b/sprites/spr_roman_cloak/layers/a480dd5e-cfcb-474b-a59c-731ac71985a6/18d7475b-a064-4b1b-bea9-2c3c1f2bc16e.png differ diff --git a/sprites/spr_roman_cloak/layers/a480dd5e-cfcb-474b-a59c-731ac71985a6/d5f7f970-d1f9-4276-b02b-f60f6067c9b6.png b/sprites/spr_roman_cloak/layers/a480dd5e-cfcb-474b-a59c-731ac71985a6/d5f7f970-d1f9-4276-b02b-f60f6067c9b6.png new file mode 100644 index 0000000000..cb8665b605 Binary files /dev/null and b/sprites/spr_roman_cloak/layers/a480dd5e-cfcb-474b-a59c-731ac71985a6/d5f7f970-d1f9-4276-b02b-f60f6067c9b6.png differ diff --git a/sprites/spr_roman_cloak/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png b/sprites/spr_roman_cloak/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_roman_cloak/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png differ diff --git a/sprites/spr_roman_cloak/spr_roman_cloak.yy b/sprites/spr_roman_cloak/spr_roman_cloak.yy new file mode 100644 index 0000000000..fec12be437 --- /dev/null +++ b/sprites/spr_roman_cloak/spr_roman_cloak.yy @@ -0,0 +1,75 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_roman_cloak", + "bbox_bottom": 198, + "bbox_left": 13, + "bbox_right": 57, + "bbox_top": 74, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"18d7475b-a064-4b1b-bea9-2c3c1f2bc16e","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"130451fb-16f0-4265-878c-26960bb8d8fe","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "specialist", + "path": "folders/Sprites/Marine Viewer/body_types/specialist.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_roman_cloak", + "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":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_roman_cloak/spr_roman_cloak.yy",},},},"Disabled":false,"id":"60ec27ae-3716-4f2f-bedd-ecb89a562808","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_roman_tabbard/438faf08-020c-4bdf-a878-8a0b45400e3a.png b/sprites/spr_roman_tabbard/438faf08-020c-4bdf-a878-8a0b45400e3a.png new file mode 100644 index 0000000000..2b764e38ee Binary files /dev/null and b/sprites/spr_roman_tabbard/438faf08-020c-4bdf-a878-8a0b45400e3a.png differ diff --git a/sprites/spr_roman_tabbard/b829e070-a074-46e9-8d94-6507222cc796.png b/sprites/spr_roman_tabbard/b829e070-a074-46e9-8d94-6507222cc796.png new file mode 100644 index 0000000000..668c5626f7 Binary files /dev/null and b/sprites/spr_roman_tabbard/b829e070-a074-46e9-8d94-6507222cc796.png differ diff --git a/sprites/spr_roman_tabbard/e4a11296-f2eb-4f90-9581-bbca8ab08d78.png b/sprites/spr_roman_tabbard/e4a11296-f2eb-4f90-9581-bbca8ab08d78.png new file mode 100644 index 0000000000..ebed9ca97c Binary files /dev/null and b/sprites/spr_roman_tabbard/e4a11296-f2eb-4f90-9581-bbca8ab08d78.png differ diff --git a/sprites/spr_roman_tabbard/ecc8abbc-4261-4c83-9cc1-81689ab505bf.png b/sprites/spr_roman_tabbard/ecc8abbc-4261-4c83-9cc1-81689ab505bf.png new file mode 100644 index 0000000000..8b9aa69bee Binary files /dev/null and b/sprites/spr_roman_tabbard/ecc8abbc-4261-4c83-9cc1-81689ab505bf.png differ diff --git a/sprites/spr_roman_tabbard/layers/438faf08-020c-4bdf-a878-8a0b45400e3a/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png b/sprites/spr_roman_tabbard/layers/438faf08-020c-4bdf-a878-8a0b45400e3a/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png new file mode 100644 index 0000000000..2b764e38ee Binary files /dev/null and b/sprites/spr_roman_tabbard/layers/438faf08-020c-4bdf-a878-8a0b45400e3a/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png differ diff --git a/sprites/spr_roman_tabbard/layers/b829e070-a074-46e9-8d94-6507222cc796/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png b/sprites/spr_roman_tabbard/layers/b829e070-a074-46e9-8d94-6507222cc796/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png new file mode 100644 index 0000000000..668c5626f7 Binary files /dev/null and b/sprites/spr_roman_tabbard/layers/b829e070-a074-46e9-8d94-6507222cc796/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png differ diff --git a/sprites/spr_roman_tabbard/layers/e4a11296-f2eb-4f90-9581-bbca8ab08d78/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png b/sprites/spr_roman_tabbard/layers/e4a11296-f2eb-4f90-9581-bbca8ab08d78/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png new file mode 100644 index 0000000000..ebed9ca97c Binary files /dev/null and b/sprites/spr_roman_tabbard/layers/e4a11296-f2eb-4f90-9581-bbca8ab08d78/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png differ diff --git a/sprites/spr_roman_tabbard/layers/ecc8abbc-4261-4c83-9cc1-81689ab505bf/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png b/sprites/spr_roman_tabbard/layers/ecc8abbc-4261-4c83-9cc1-81689ab505bf/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png new file mode 100644 index 0000000000..8b9aa69bee Binary files /dev/null and b/sprites/spr_roman_tabbard/layers/ecc8abbc-4261-4c83-9cc1-81689ab505bf/b00ddda6-7ce3-4484-8c3b-5e586ff90ac1.png differ diff --git a/sprites/spr_roman_tabbard/spr_roman_tabbard.yy b/sprites/spr_roman_tabbard/spr_roman_tabbard.yy new file mode 100644 index 0000000000..58eba2ba35 --- /dev/null +++ b/sprites/spr_roman_tabbard/spr_roman_tabbard.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_roman_tabbard", + "bbox_bottom": 167, + "bbox_left": 2, + "bbox_right": 103, + "bbox_top": 30, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"438faf08-020c-4bdf-a878-8a0b45400e3a",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b829e070-a074-46e9-8d94-6507222cc796",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b00ddda6-7ce3-4484-8c3b-5e586ff90ac1","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "decorations", + "path": "folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_roman_tabbard", + "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":"438faf08-020c-4bdf-a878-8a0b45400e3a","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},},},"Disabled":false,"id":"4e16b319-3f1e-426c-b41e-a1334b774b27","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},},},"Disabled":false,"id":"dc2b5276-f541-4905-907d-6ff1d1db896d","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b829e070-a074-46e9-8d94-6507222cc796","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},},},"Disabled":false,"id":"236d0bfc-7eb0-434a-936b-b17f5ed52954","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","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, + }, + "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_scout_complex/2462092a-8f18-48d4-9694-48ea1de535d9.png b/sprites/spr_scout_complex/2462092a-8f18-48d4-9694-48ea1de535d9.png new file mode 100644 index 0000000000..4b3f0b9f77 Binary files /dev/null and b/sprites/spr_scout_complex/2462092a-8f18-48d4-9694-48ea1de535d9.png differ diff --git a/sprites/spr_scout_complex/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_complex/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png new file mode 100644 index 0000000000..4b3f0b9f77 Binary files /dev/null and b/sprites/spr_scout_complex/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png differ diff --git a/sprites/spr_scout_complex/spr_scout_complex.yy b/sprites/spr_scout_complex/spr_scout_complex.yy new file mode 100644 index 0000000000..022c3e8615 --- /dev/null +++ b/sprites/spr_scout_complex/spr_scout_complex.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_scout_complex", + "bbox_bottom": 231, + "bbox_left": 26, + "bbox_right": 144, + "bbox_top": 41, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2462092a-8f18-48d4-9694-48ea1de535d9",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"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, + "parent": { + "name": "body_types", + "path": "folders/Sprites/Marine Viewer/body_types.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_scout_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":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_complex/spr_scout_complex.yy",},},},"Disabled":false,"id":"c74f3d25-50a8-4016-8372-0d7a2c479225","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_scout_colors2/2462092a-8f18-48d4-9694-48ea1de535d9.png b/sprites/spr_scout_new/2462092a-8f18-48d4-9694-48ea1de535d9.png similarity index 97% rename from sprites/spr_scout_colors2/2462092a-8f18-48d4-9694-48ea1de535d9.png rename to sprites/spr_scout_new/2462092a-8f18-48d4-9694-48ea1de535d9.png index 25f5745bfc..ec7d10e6c7 100644 Binary files a/sprites/spr_scout_colors2/2462092a-8f18-48d4-9694-48ea1de535d9.png and b/sprites/spr_scout_new/2462092a-8f18-48d4-9694-48ea1de535d9.png differ diff --git a/sprites/spr_scout_colors2/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374.png b/sprites/spr_scout_new/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374.png similarity index 85% rename from sprites/spr_scout_colors2/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374.png rename to sprites/spr_scout_new/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374.png index 224160cc6c..88271533bc 100644 Binary files a/sprites/spr_scout_colors2/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374.png and b/sprites/spr_scout_new/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374.png differ diff --git a/sprites/spr_scout_colors2/5fec1b1d-b8d8-4670-a500-898e3a451f83.png b/sprites/spr_scout_new/5fec1b1d-b8d8-4670-a500-898e3a451f83.png similarity index 97% rename from sprites/spr_scout_colors2/5fec1b1d-b8d8-4670-a500-898e3a451f83.png rename to sprites/spr_scout_new/5fec1b1d-b8d8-4670-a500-898e3a451f83.png index 79f627bfcf..a5ffc562d1 100644 Binary files a/sprites/spr_scout_colors2/5fec1b1d-b8d8-4670-a500-898e3a451f83.png and b/sprites/spr_scout_new/5fec1b1d-b8d8-4670-a500-898e3a451f83.png differ diff --git a/sprites/spr_scout_colors2/64729cc4-00dc-45e2-9ea3-69e9224b631a.png b/sprites/spr_scout_new/64729cc4-00dc-45e2-9ea3-69e9224b631a.png similarity index 97% rename from sprites/spr_scout_colors2/64729cc4-00dc-45e2-9ea3-69e9224b631a.png rename to sprites/spr_scout_new/64729cc4-00dc-45e2-9ea3-69e9224b631a.png index 6d68024092..8f82b04124 100644 Binary files a/sprites/spr_scout_colors2/64729cc4-00dc-45e2-9ea3-69e9224b631a.png and b/sprites/spr_scout_new/64729cc4-00dc-45e2-9ea3-69e9224b631a.png differ diff --git a/sprites/spr_scout_colors2/7d0becbe-30f8-4a46-bedf-3d9495863023.png b/sprites/spr_scout_new/7d0becbe-30f8-4a46-bedf-3d9495863023.png similarity index 82% rename from sprites/spr_scout_colors2/7d0becbe-30f8-4a46-bedf-3d9495863023.png rename to sprites/spr_scout_new/7d0becbe-30f8-4a46-bedf-3d9495863023.png index 1fd29e4c06..1cfdc483bd 100644 Binary files a/sprites/spr_scout_colors2/7d0becbe-30f8-4a46-bedf-3d9495863023.png and b/sprites/spr_scout_new/7d0becbe-30f8-4a46-bedf-3d9495863023.png differ diff --git a/sprites/spr_scout_colors2/82f2cb7a-a266-4656-8a58-99ba2e420640.png b/sprites/spr_scout_new/82f2cb7a-a266-4656-8a58-99ba2e420640.png similarity index 83% rename from sprites/spr_scout_colors2/82f2cb7a-a266-4656-8a58-99ba2e420640.png rename to sprites/spr_scout_new/82f2cb7a-a266-4656-8a58-99ba2e420640.png index 8ef7892a6a..29617fa5f4 100644 Binary files a/sprites/spr_scout_colors2/82f2cb7a-a266-4656-8a58-99ba2e420640.png and b/sprites/spr_scout_new/82f2cb7a-a266-4656-8a58-99ba2e420640.png differ diff --git a/sprites/spr_scout_colors2/929493f8-01f3-4199-a6ce-a69c82f7cdf0.png b/sprites/spr_scout_new/929493f8-01f3-4199-a6ce-a69c82f7cdf0.png similarity index 59% rename from sprites/spr_scout_colors2/929493f8-01f3-4199-a6ce-a69c82f7cdf0.png rename to sprites/spr_scout_new/929493f8-01f3-4199-a6ce-a69c82f7cdf0.png index 8283d86b4e..3cdce6ba88 100644 Binary files a/sprites/spr_scout_colors2/929493f8-01f3-4199-a6ce-a69c82f7cdf0.png and b/sprites/spr_scout_new/929493f8-01f3-4199-a6ce-a69c82f7cdf0.png differ diff --git a/sprites/spr_scout_colors2/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62.png b/sprites/spr_scout_new/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62.png similarity index 97% rename from sprites/spr_scout_colors2/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62.png rename to sprites/spr_scout_new/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62.png index 6a962fb367..3d52dec7d5 100644 Binary files a/sprites/spr_scout_colors2/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62.png and b/sprites/spr_scout_new/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62.png differ diff --git a/sprites/spr_scout_colors2/df188ab0-15cc-489f-be4e-3c05681254e5.png b/sprites/spr_scout_new/df188ab0-15cc-489f-be4e-3c05681254e5.png similarity index 82% rename from sprites/spr_scout_colors2/df188ab0-15cc-489f-be4e-3c05681254e5.png rename to sprites/spr_scout_new/df188ab0-15cc-489f-be4e-3c05681254e5.png index 181eda4147..dc153f80cd 100644 Binary files a/sprites/spr_scout_colors2/df188ab0-15cc-489f-be4e-3c05681254e5.png and b/sprites/spr_scout_new/df188ab0-15cc-489f-be4e-3c05681254e5.png differ diff --git a/sprites/spr_scout_colors2/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_new/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png similarity index 100% rename from sprites/spr_scout_colors2/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png rename to sprites/spr_scout_new/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png diff --git a/sprites/spr_scout_colors2/layers/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_new/layers/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374/6875771f-a0b5-4a59-8928-4f649aaa9035.png similarity index 100% rename from sprites/spr_scout_colors2/layers/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374/6875771f-a0b5-4a59-8928-4f649aaa9035.png rename to sprites/spr_scout_new/layers/5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374/6875771f-a0b5-4a59-8928-4f649aaa9035.png diff --git a/sprites/spr_scout_colors2/layers/5fec1b1d-b8d8-4670-a500-898e3a451f83/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_new/layers/5fec1b1d-b8d8-4670-a500-898e3a451f83/6875771f-a0b5-4a59-8928-4f649aaa9035.png similarity index 100% rename from sprites/spr_scout_colors2/layers/5fec1b1d-b8d8-4670-a500-898e3a451f83/6875771f-a0b5-4a59-8928-4f649aaa9035.png rename to sprites/spr_scout_new/layers/5fec1b1d-b8d8-4670-a500-898e3a451f83/6875771f-a0b5-4a59-8928-4f649aaa9035.png diff --git a/sprites/spr_scout_colors2/layers/64729cc4-00dc-45e2-9ea3-69e9224b631a/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_new/layers/64729cc4-00dc-45e2-9ea3-69e9224b631a/6875771f-a0b5-4a59-8928-4f649aaa9035.png similarity index 100% rename from sprites/spr_scout_colors2/layers/64729cc4-00dc-45e2-9ea3-69e9224b631a/6875771f-a0b5-4a59-8928-4f649aaa9035.png rename to sprites/spr_scout_new/layers/64729cc4-00dc-45e2-9ea3-69e9224b631a/6875771f-a0b5-4a59-8928-4f649aaa9035.png diff --git a/sprites/spr_scout_colors2/layers/7d0becbe-30f8-4a46-bedf-3d9495863023/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_new/layers/7d0becbe-30f8-4a46-bedf-3d9495863023/6875771f-a0b5-4a59-8928-4f649aaa9035.png similarity index 100% rename from sprites/spr_scout_colors2/layers/7d0becbe-30f8-4a46-bedf-3d9495863023/6875771f-a0b5-4a59-8928-4f649aaa9035.png rename to sprites/spr_scout_new/layers/7d0becbe-30f8-4a46-bedf-3d9495863023/6875771f-a0b5-4a59-8928-4f649aaa9035.png diff --git a/sprites/spr_scout_colors2/layers/82f2cb7a-a266-4656-8a58-99ba2e420640/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_new/layers/82f2cb7a-a266-4656-8a58-99ba2e420640/6875771f-a0b5-4a59-8928-4f649aaa9035.png similarity index 100% rename from sprites/spr_scout_colors2/layers/82f2cb7a-a266-4656-8a58-99ba2e420640/6875771f-a0b5-4a59-8928-4f649aaa9035.png rename to sprites/spr_scout_new/layers/82f2cb7a-a266-4656-8a58-99ba2e420640/6875771f-a0b5-4a59-8928-4f649aaa9035.png diff --git a/sprites/spr_scout_colors2/layers/929493f8-01f3-4199-a6ce-a69c82f7cdf0/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_new/layers/929493f8-01f3-4199-a6ce-a69c82f7cdf0/6875771f-a0b5-4a59-8928-4f649aaa9035.png similarity index 100% rename from sprites/spr_scout_colors2/layers/929493f8-01f3-4199-a6ce-a69c82f7cdf0/6875771f-a0b5-4a59-8928-4f649aaa9035.png rename to sprites/spr_scout_new/layers/929493f8-01f3-4199-a6ce-a69c82f7cdf0/6875771f-a0b5-4a59-8928-4f649aaa9035.png diff --git a/sprites/spr_scout_colors2/layers/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_new/layers/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62/6875771f-a0b5-4a59-8928-4f649aaa9035.png similarity index 100% rename from sprites/spr_scout_colors2/layers/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62/6875771f-a0b5-4a59-8928-4f649aaa9035.png rename to sprites/spr_scout_new/layers/d5936ecb-6646-4a4a-a4a3-d5ef0e835c62/6875771f-a0b5-4a59-8928-4f649aaa9035.png diff --git a/sprites/spr_scout_colors2/layers/df188ab0-15cc-489f-be4e-3c05681254e5/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_new/layers/df188ab0-15cc-489f-be4e-3c05681254e5/6875771f-a0b5-4a59-8928-4f649aaa9035.png similarity index 100% rename from sprites/spr_scout_colors2/layers/df188ab0-15cc-489f-be4e-3c05681254e5/6875771f-a0b5-4a59-8928-4f649aaa9035.png rename to sprites/spr_scout_new/layers/df188ab0-15cc-489f-be4e-3c05681254e5/6875771f-a0b5-4a59-8928-4f649aaa9035.png diff --git a/sprites/spr_scout_colors2/spr_scout_colors2.yy b/sprites/spr_scout_new/spr_scout_new.yy similarity index 71% rename from sprites/spr_scout_colors2/spr_scout_colors2.yy rename to sprites/spr_scout_new/spr_scout_new.yy index 31e6958d54..6f40f3799a 100644 --- a/sprites/spr_scout_colors2/spr_scout_colors2.yy +++ b/sprites/spr_scout_new/spr_scout_new.yy @@ -1,7 +1,7 @@ { "resourceType": "GMSprite", "resourceVersion": "1.0", - "name": "spr_scout_colors2", + "name": "spr_scout_new", "bbox_bottom": 231, "bbox_left": 0, "bbox_right": 144, @@ -40,7 +40,7 @@ "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", - "name": "spr_scout_colors2", + "name": "spr_scout_new", "autoRecord": true, "backdropHeight": 768, "backdropImageOpacity": 0.5, @@ -62,15 +62,15 @@ "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":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},},},"Disabled":false,"id":"c74f3d25-50a8-4016-8372-0d7a2c479225","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},},},"Disabled":false,"id":"df759ea1-1762-439e-a31b-d561e150409f","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},},},"Disabled":false,"id":"12a3bc41-03ea-4458-9a45-bb3e977e4d8b","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},},},"Disabled":false,"id":"2b238ca1-556c-4b3a-bc55-ddac68382936","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},},},"Disabled":false,"id":"8b563f16-042c-4864-b2c0-dd83fc9214df","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},},},"Disabled":false,"id":"86c69da2-f254-4775-b403-3d0e95603e38","IsCreationKey":false,"Key":6.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},},},"Disabled":false,"id":"7eed20f2-e830-4d66-b460-4fe125b48d55","IsCreationKey":false,"Key":7.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"82f2cb7a-a266-4656-8a58-99ba2e420640","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},},},"Disabled":false,"id":"6509e854-2d7c-4c16-88ff-362e9e4052b4","IsCreationKey":false,"Key":8.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"df188ab0-15cc-489f-be4e-3c05681254e5","path":"sprites/spr_scout_colors2/spr_scout_colors2.yy",},},},"Disabled":false,"id":"88f87605-6563-4f49-862a-12f27e325859","IsCreationKey":false,"Key":9.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_new/spr_scout_new.yy",},},},"Disabled":false,"id":"b31af662-ba1d-4d27-9df0-c883a9cb9df0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","path":"sprites/spr_scout_new/spr_scout_new.yy",},},},"Disabled":false,"id":"6b9777d1-7fcc-4592-8be4-75b3800b827d","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","path":"sprites/spr_scout_new/spr_scout_new.yy",},},},"Disabled":false,"id":"162b08ca-f2e2-49d1-9537-d39b34544a88","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","path":"sprites/spr_scout_new/spr_scout_new.yy",},},},"Disabled":false,"id":"bb4566d4-91b3-4db5-afc7-614fdcb9f276","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","path":"sprites/spr_scout_new/spr_scout_new.yy",},},},"Disabled":false,"id":"4849c4a7-07d6-40bc-99df-fba446ffb063","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_new/spr_scout_new.yy",},},},"Disabled":false,"id":"321ec812-a02f-41e5-b397-5d2b32198c0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_new/spr_scout_new.yy",},},},"Disabled":false,"id":"a2c8eee3-df35-4327-9c95-9f658774bdfa","IsCreationKey":false,"Key":6.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"82f2cb7a-a266-4656-8a58-99ba2e420640","path":"sprites/spr_scout_new/spr_scout_new.yy",},},},"Disabled":false,"id":"31a14009-85d3-47a8-bdfb-d9f082fbb6da","IsCreationKey":false,"Key":7.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"df188ab0-15cc-489f-be4e-3c05681254e5","path":"sprites/spr_scout_new/spr_scout_new.yy",},},},"Disabled":false,"id":"9c225af2-ada9-46d5-8d46-9959e85fc393","IsCreationKey":false,"Key":8.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, diff --git a/sprites/spr_skull_on_chain/0926bad1-dfb3-41bb-b6ee-7732d3036688.png b/sprites/spr_skull_on_chain/0926bad1-dfb3-41bb-b6ee-7732d3036688.png new file mode 100644 index 0000000000..3c1cdc93a1 Binary files /dev/null and b/sprites/spr_skull_on_chain/0926bad1-dfb3-41bb-b6ee-7732d3036688.png differ diff --git a/sprites/spr_skull_on_chain/layers/0926bad1-dfb3-41bb-b6ee-7732d3036688/b8755925-a425-4dbe-9903-b38b3c4a0e8e.png b/sprites/spr_skull_on_chain/layers/0926bad1-dfb3-41bb-b6ee-7732d3036688/b8755925-a425-4dbe-9903-b38b3c4a0e8e.png new file mode 100644 index 0000000000..3c1cdc93a1 Binary files /dev/null and b/sprites/spr_skull_on_chain/layers/0926bad1-dfb3-41bb-b6ee-7732d3036688/b8755925-a425-4dbe-9903-b38b3c4a0e8e.png differ diff --git a/sprites/spr_skull_on_chain/spr_skull_on_chain.yy b/sprites/spr_skull_on_chain/spr_skull_on_chain.yy new file mode 100644 index 0000000000..52af985130 --- /dev/null +++ b/sprites/spr_skull_on_chain/spr_skull_on_chain.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_skull_on_chain", + "bbox_bottom": 39, + "bbox_left": 0, + "bbox_right": 20, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b8755925-a425-4dbe-9903-b38b3c4a0e8e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "decorations", + "path": "folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_skull_on_chain", + "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":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},},},"Disabled":false,"id":"6d6e7ff8-cb18-4100-9159-42068b16e4c3","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_skulls_belt/dbb220c9-62b6-4ca7-a13f-5951132d0d13.png b/sprites/spr_skulls_belt/dbb220c9-62b6-4ca7-a13f-5951132d0d13.png new file mode 100644 index 0000000000..9d55b32aed Binary files /dev/null and b/sprites/spr_skulls_belt/dbb220c9-62b6-4ca7-a13f-5951132d0d13.png differ diff --git a/sprites/spr_skulls_belt/layers/dbb220c9-62b6-4ca7-a13f-5951132d0d13/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_skulls_belt/layers/dbb220c9-62b6-4ca7-a13f-5951132d0d13/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..9d55b32aed Binary files /dev/null and b/sprites/spr_skulls_belt/layers/dbb220c9-62b6-4ca7-a13f-5951132d0d13/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_skulls_belt/spr_skulls_belt.yy b/sprites/spr_skulls_belt/spr_skulls_belt.yy new file mode 100644 index 0000000000..8e3189c165 --- /dev/null +++ b/sprites/spr_skulls_belt/spr_skulls_belt.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_skulls_belt", + "bbox_bottom": 104, + "bbox_left": 54, + "bbox_right": 113, + "bbox_top": 81, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13",}, + ], + "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_skulls_belt", + "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":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},},},"Disabled":false,"id":"037f80d3-2475-45e9-9eea-477515faed6d","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_sword_pendant/0926bad1-dfb3-41bb-b6ee-7732d3036688.png b/sprites/spr_sword_pendant/0926bad1-dfb3-41bb-b6ee-7732d3036688.png new file mode 100644 index 0000000000..9d7060b37e Binary files /dev/null and b/sprites/spr_sword_pendant/0926bad1-dfb3-41bb-b6ee-7732d3036688.png differ diff --git a/sprites/spr_sword_pendant/layers/0926bad1-dfb3-41bb-b6ee-7732d3036688/b8755925-a425-4dbe-9903-b38b3c4a0e8e.png b/sprites/spr_sword_pendant/layers/0926bad1-dfb3-41bb-b6ee-7732d3036688/b8755925-a425-4dbe-9903-b38b3c4a0e8e.png new file mode 100644 index 0000000000..9d7060b37e Binary files /dev/null and b/sprites/spr_sword_pendant/layers/0926bad1-dfb3-41bb-b6ee-7732d3036688/b8755925-a425-4dbe-9903-b38b3c4a0e8e.png differ diff --git a/sprites/spr_sword_pendant/spr_sword_pendant.yy b/sprites/spr_sword_pendant/spr_sword_pendant.yy new file mode 100644 index 0000000000..a1cb938baa --- /dev/null +++ b/sprites/spr_sword_pendant/spr_sword_pendant.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_sword_pendant", + "bbox_bottom": 25, + "bbox_left": 5, + "bbox_right": 17, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b8755925-a425-4dbe-9903-b38b3c4a0e8e","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "decorations", + "path": "folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_sword_pendant", + "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":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},},},"Disabled":false,"id":"fce0aede-094a-47b8-be8e-8f04a9807531","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_tech_belt/6f5f8280-1432-4189-ba71-5cb47411b603.png b/sprites/spr_tech_belt/6f5f8280-1432-4189-ba71-5cb47411b603.png new file mode 100644 index 0000000000..5e14d9a9f9 Binary files /dev/null and b/sprites/spr_tech_belt/6f5f8280-1432-4189-ba71-5cb47411b603.png differ diff --git a/sprites/spr_tech_belt/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png b/sprites/spr_tech_belt/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png new file mode 100644 index 0000000000..5e14d9a9f9 Binary files /dev/null and b/sprites/spr_tech_belt/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png differ diff --git a/sprites/spr_tech_belt/spr_tech_belt.yy b/sprites/spr_tech_belt/spr_tech_belt.yy new file mode 100644 index 0000000000..ccb9e4b565 --- /dev/null +++ b/sprites/spr_tech_belt/spr_tech_belt.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_tech_belt", + "bbox_bottom": 113, + "bbox_left": 56, + "bbox_right": 108, + "bbox_top": 82, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6f5f8280-1432-4189-ba71-5cb47411b603",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dbe27ba7-9000-4566-81f3-7688029dd83a","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "techmarine_complex", + "path": "folders/Sprites/Marine Viewer/body_types/techmarine_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_tech_belt", + "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":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},},},"Disabled":false,"id":"e80f57ce-b07a-4131-bc96-09b91013c0e2","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": 164, +} \ No newline at end of file diff --git a/sprites/spr_tech_face_plate/6f5f8280-1432-4189-ba71-5cb47411b603.png b/sprites/spr_tech_face_plate/6f5f8280-1432-4189-ba71-5cb47411b603.png new file mode 100644 index 0000000000..2a77344fa2 Binary files /dev/null and b/sprites/spr_tech_face_plate/6f5f8280-1432-4189-ba71-5cb47411b603.png differ diff --git a/sprites/spr_tech_face_plate/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png b/sprites/spr_tech_face_plate/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png new file mode 100644 index 0000000000..2a77344fa2 Binary files /dev/null and b/sprites/spr_tech_face_plate/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png differ diff --git a/sprites/spr_tech_face_plate/spr_tech_face_plate.yy b/sprites/spr_tech_face_plate/spr_tech_face_plate.yy new file mode 100644 index 0000000000..03fc316ebd --- /dev/null +++ b/sprites/spr_tech_face_plate/spr_tech_face_plate.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_tech_face_plate", + "bbox_bottom": 44, + "bbox_left": 69, + "bbox_right": 95, + "bbox_top": 28, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6f5f8280-1432-4189-ba71-5cb47411b603",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"dbe27ba7-9000-4566-81f3-7688029dd83a","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "techmarine_complex", + "path": "folders/Sprites/Marine Viewer/body_types/techmarine_complex.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_tech_face_plate", + "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":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.yy",},},},"Disabled":false,"id":"3a68cfe1-8533-4723-9fc1-c27fb8484d51","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": 164, +} \ No newline at end of file diff --git a/sprites/spr_techmarine_complex/6f5f8280-1432-4189-ba71-5cb47411b603.png b/sprites/spr_techmarine_complex/6f5f8280-1432-4189-ba71-5cb47411b603.png index 829b2fbb9d..bd8182d550 100644 Binary files a/sprites/spr_techmarine_complex/6f5f8280-1432-4189-ba71-5cb47411b603.png and b/sprites/spr_techmarine_complex/6f5f8280-1432-4189-ba71-5cb47411b603.png differ diff --git a/sprites/spr_techmarine_complex/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png b/sprites/spr_techmarine_complex/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png index 829b2fbb9d..bd8182d550 100644 Binary files a/sprites/spr_techmarine_complex/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png and b/sprites/spr_techmarine_complex/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png differ diff --git a/sprites/spr_techmarine_complex/spr_techmarine_complex.yy b/sprites/spr_techmarine_complex/spr_techmarine_complex.yy index f9941925a9..52f5257b15 100644 --- a/sprites/spr_techmarine_complex/spr_techmarine_complex.yy +++ b/sprites/spr_techmarine_complex/spr_techmarine_complex.yy @@ -3,8 +3,8 @@ "resourceVersion": "1.0", "name": "spr_techmarine_complex", "bbox_bottom": 220, - "bbox_left": 10, - "bbox_right": 153, + "bbox_left": 11, + "bbox_right": 154, "bbox_top": 13, "bboxMode": 0, "collisionKind": 1, diff --git a/sprites/spr_teeth/0314e59f-510c-49f1-aa68-e46181aa4b51.png b/sprites/spr_teeth/0314e59f-510c-49f1-aa68-e46181aa4b51.png new file mode 100644 index 0000000000..1a3d5f75be Binary files /dev/null and b/sprites/spr_teeth/0314e59f-510c-49f1-aa68-e46181aa4b51.png differ diff --git a/sprites/spr_teeth/9e2e4772-e0b4-40d5-93de-3eeb449e4cc3.png b/sprites/spr_teeth/9e2e4772-e0b4-40d5-93de-3eeb449e4cc3.png new file mode 100644 index 0000000000..b8f686430c Binary files /dev/null and b/sprites/spr_teeth/9e2e4772-e0b4-40d5-93de-3eeb449e4cc3.png differ diff --git a/sprites/spr_teeth/layers/0314e59f-510c-49f1-aa68-e46181aa4b51/7b0759e5-a904-40ad-8749-17c90d61f9fa.png b/sprites/spr_teeth/layers/0314e59f-510c-49f1-aa68-e46181aa4b51/7b0759e5-a904-40ad-8749-17c90d61f9fa.png new file mode 100644 index 0000000000..1a3d5f75be Binary files /dev/null and b/sprites/spr_teeth/layers/0314e59f-510c-49f1-aa68-e46181aa4b51/7b0759e5-a904-40ad-8749-17c90d61f9fa.png differ diff --git a/sprites/spr_teeth/layers/9e2e4772-e0b4-40d5-93de-3eeb449e4cc3/7b0759e5-a904-40ad-8749-17c90d61f9fa.png b/sprites/spr_teeth/layers/9e2e4772-e0b4-40d5-93de-3eeb449e4cc3/7b0759e5-a904-40ad-8749-17c90d61f9fa.png new file mode 100644 index 0000000000..b8f686430c Binary files /dev/null and b/sprites/spr_teeth/layers/9e2e4772-e0b4-40d5-93de-3eeb449e4cc3/7b0759e5-a904-40ad-8749-17c90d61f9fa.png differ diff --git a/sprites/spr_teeth/spr_teeth.yy b/sprites/spr_teeth/spr_teeth.yy new file mode 100644 index 0000000000..a0537233ec --- /dev/null +++ b/sprites/spr_teeth/spr_teeth.yy @@ -0,0 +1,76 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_teeth", + "bbox_bottom": 36, + "bbox_left": 2, + "bbox_right": 16, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0314e59f-510c-49f1-aa68-e46181aa4b51",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7b0759e5-a904-40ad-8749-17c90d61f9fa","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "decorations", + "path": "folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_teeth", + "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": 2.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":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","path":"sprites/spr_teeth/spr_teeth.yy",},},},"Disabled":false,"id":"e66df479-4ca7-4bf7-822b-3fc0248a8aa3","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0314e59f-510c-49f1-aa68-e46181aa4b51","path":"sprites/spr_teeth/spr_teeth.yy",},},},"Disabled":false,"id":"69b23246-750d-4901-9bbc-be89ea989385","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, + "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_terminator_complex_arm_hidden_left/213953e7-d335-4a83-a9b8-496335dda7be.png b/sprites/spr_terminator_complex_arm_hidden_left/213953e7-d335-4a83-a9b8-496335dda7be.png new file mode 100644 index 0000000000..a45fcf33b9 Binary files /dev/null and b/sprites/spr_terminator_complex_arm_hidden_left/213953e7-d335-4a83-a9b8-496335dda7be.png differ diff --git a/sprites/spr_terminator_complex_arm_hidden_left/layers/213953e7-d335-4a83-a9b8-496335dda7be/35a49b5e-7bad-4a28-be81-1e39d481638f.png b/sprites/spr_terminator_complex_arm_hidden_left/layers/213953e7-d335-4a83-a9b8-496335dda7be/35a49b5e-7bad-4a28-be81-1e39d481638f.png new file mode 100644 index 0000000000..a45fcf33b9 Binary files /dev/null and b/sprites/spr_terminator_complex_arm_hidden_left/layers/213953e7-d335-4a83-a9b8-496335dda7be/35a49b5e-7bad-4a28-be81-1e39d481638f.png differ diff --git a/sprites/spr_terminator_complex_arm_hidden_left/layers/213953e7-d335-4a83-a9b8-496335dda7be/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png b/sprites/spr_terminator_complex_arm_hidden_left/layers/213953e7-d335-4a83-a9b8-496335dda7be/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png new file mode 100644 index 0000000000..768848d383 Binary files /dev/null and b/sprites/spr_terminator_complex_arm_hidden_left/layers/213953e7-d335-4a83-a9b8-496335dda7be/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png differ diff --git a/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy b/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy new file mode 100644 index 0000000000..eba31cdade --- /dev/null +++ b/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy @@ -0,0 +1,75 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_terminator_complex_arm_hidden_left", + "bbox_bottom": 111, + "bbox_left": 132, + "bbox_right": 165, + "bbox_top": 91, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"213953e7-d335-4a83-a9b8-496335dda7be",}, + ], + "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,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "arms_hands", + "path": "folders/Sprites/Marine Viewer/arms_hands.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_terminator_complex_arm_hidden_left", + "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":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy",},},},"Disabled":false,"id":"cf842654-6328-43ef-8ca1-e08413ff4d7f","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_complex_arm_hidden_right/213953e7-d335-4a83-a9b8-496335dda7be.png b/sprites/spr_terminator_complex_arm_hidden_right/213953e7-d335-4a83-a9b8-496335dda7be.png new file mode 100644 index 0000000000..8cdbfdd9d5 Binary files /dev/null and b/sprites/spr_terminator_complex_arm_hidden_right/213953e7-d335-4a83-a9b8-496335dda7be.png differ diff --git a/sprites/spr_terminator_complex_arm_hidden_right/layers/213953e7-d335-4a83-a9b8-496335dda7be/35a49b5e-7bad-4a28-be81-1e39d481638f.png b/sprites/spr_terminator_complex_arm_hidden_right/layers/213953e7-d335-4a83-a9b8-496335dda7be/35a49b5e-7bad-4a28-be81-1e39d481638f.png new file mode 100644 index 0000000000..8cdbfdd9d5 Binary files /dev/null and b/sprites/spr_terminator_complex_arm_hidden_right/layers/213953e7-d335-4a83-a9b8-496335dda7be/35a49b5e-7bad-4a28-be81-1e39d481638f.png differ diff --git a/sprites/spr_terminator_complex_arm_hidden_right/layers/213953e7-d335-4a83-a9b8-496335dda7be/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png b/sprites/spr_terminator_complex_arm_hidden_right/layers/213953e7-d335-4a83-a9b8-496335dda7be/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png new file mode 100644 index 0000000000..51d94297c1 Binary files /dev/null and b/sprites/spr_terminator_complex_arm_hidden_right/layers/213953e7-d335-4a83-a9b8-496335dda7be/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png differ diff --git a/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy b/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy new file mode 100644 index 0000000000..d56b8ee53f --- /dev/null +++ b/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy @@ -0,0 +1,75 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_terminator_complex_arm_hidden_right", + "bbox_bottom": 111, + "bbox_left": 15, + "bbox_right": 48, + "bbox_top": 91, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"213953e7-d335-4a83-a9b8-496335dda7be",}, + ], + "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,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "arms_hands", + "path": "folders/Sprites/Marine Viewer/arms_hands.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_terminator_complex_arm_hidden_right", + "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":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy",},},},"Disabled":false,"id":"94ffb408-3cda-47a2-a578-63fe4f6cbb8c","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_complex_arms_upper_left/26935846-dc87-49ea-95f0-8d93e784b6b3.png b/sprites/spr_terminator_complex_arms_upper_left/26935846-dc87-49ea-95f0-8d93e784b6b3.png new file mode 100644 index 0000000000..3080652ea8 Binary files /dev/null and b/sprites/spr_terminator_complex_arms_upper_left/26935846-dc87-49ea-95f0-8d93e784b6b3.png differ diff --git a/sprites/spr_terminator_complex_arms_upper_left/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/35a49b5e-7bad-4a28-be81-1e39d481638f.png b/sprites/spr_terminator_complex_arms_upper_left/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/35a49b5e-7bad-4a28-be81-1e39d481638f.png new file mode 100644 index 0000000000..3080652ea8 Binary files /dev/null and b/sprites/spr_terminator_complex_arms_upper_left/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/35a49b5e-7bad-4a28-be81-1e39d481638f.png differ diff --git a/sprites/spr_terminator_complex_arms_upper_left/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png b/sprites/spr_terminator_complex_arms_upper_left/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png new file mode 100644 index 0000000000..3d42089e5e Binary files /dev/null and b/sprites/spr_terminator_complex_arms_upper_left/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png differ diff --git a/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy b/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy new file mode 100644 index 0000000000..41e05e6c0b --- /dev/null +++ b/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy @@ -0,0 +1,75 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_terminator_complex_arms_upper_left", + "bbox_bottom": 119, + "bbox_left": 131, + "bbox_right": 169, + "bbox_top": 87, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"26935846-dc87-49ea-95f0-8d93e784b6b3",}, + ], + "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,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "arms_hands", + "path": "folders/Sprites/Marine Viewer/arms_hands.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_terminator_complex_arms_upper_left", + "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":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy",},},},"Disabled":false,"id":"164674aa-5a00-48ec-8be0-d61e90a3902e","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_complex_arms_upper_right/26935846-dc87-49ea-95f0-8d93e784b6b3.png b/sprites/spr_terminator_complex_arms_upper_right/26935846-dc87-49ea-95f0-8d93e784b6b3.png new file mode 100644 index 0000000000..f75145b7a8 Binary files /dev/null and b/sprites/spr_terminator_complex_arms_upper_right/26935846-dc87-49ea-95f0-8d93e784b6b3.png differ diff --git a/sprites/spr_terminator_complex_arms_upper_right/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/35a49b5e-7bad-4a28-be81-1e39d481638f.png b/sprites/spr_terminator_complex_arms_upper_right/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/35a49b5e-7bad-4a28-be81-1e39d481638f.png new file mode 100644 index 0000000000..f75145b7a8 Binary files /dev/null and b/sprites/spr_terminator_complex_arms_upper_right/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/35a49b5e-7bad-4a28-be81-1e39d481638f.png differ diff --git a/sprites/spr_terminator_complex_arms_upper_right/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png b/sprites/spr_terminator_complex_arms_upper_right/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png new file mode 100644 index 0000000000..51d94297c1 Binary files /dev/null and b/sprites/spr_terminator_complex_arms_upper_right/layers/26935846-dc87-49ea-95f0-8d93e784b6b3/fe74dd0c-ec84-46ac-bcbb-df531ec42d24.png differ diff --git a/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy b/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy new file mode 100644 index 0000000000..733fc868a8 --- /dev/null +++ b/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy @@ -0,0 +1,75 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_terminator_complex_arms_upper_right", + "bbox_bottom": 119, + "bbox_left": 11, + "bbox_right": 49, + "bbox_top": 87, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"26935846-dc87-49ea-95f0-8d93e784b6b3",}, + ], + "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,}, + ], + "nineSlice": null, + "origin": 9, + "parent": { + "name": "arms_hands", + "path": "folders/Sprites/Marine Viewer/arms_hands.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_terminator_complex_arms_upper_right", + "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":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy",},},},"Disabled":false,"id":"3b4c9688-dfe5-4837-b62a-be5562d846e3","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_hands/1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba.png b/sprites/spr_terminator_hands/1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba.png index 3aed3d3b6e..bdc093be18 100644 Binary files a/sprites/spr_terminator_hands/1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba.png and b/sprites/spr_terminator_hands/1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba.png differ diff --git a/sprites/spr_terminator_hands/261d6f69-5b51-4493-84f5-5d0a6adfe813.png b/sprites/spr_terminator_hands/261d6f69-5b51-4493-84f5-5d0a6adfe813.png index 864dd3b936..2bbe9120ff 100644 Binary files a/sprites/spr_terminator_hands/261d6f69-5b51-4493-84f5-5d0a6adfe813.png and b/sprites/spr_terminator_hands/261d6f69-5b51-4493-84f5-5d0a6adfe813.png differ diff --git a/sprites/spr_terminator_hands/2d84098c-5069-4226-bf10-452f97e7bc36.png b/sprites/spr_terminator_hands/2d84098c-5069-4226-bf10-452f97e7bc36.png index 98e966ac15..9a88d41ae8 100644 Binary files a/sprites/spr_terminator_hands/2d84098c-5069-4226-bf10-452f97e7bc36.png and b/sprites/spr_terminator_hands/2d84098c-5069-4226-bf10-452f97e7bc36.png differ diff --git a/sprites/spr_terminator_hands/60a62808-3182-4af9-8fd4-270907296914.png b/sprites/spr_terminator_hands/60a62808-3182-4af9-8fd4-270907296914.png index f9e353ca11..2bbe9120ff 100644 Binary files a/sprites/spr_terminator_hands/60a62808-3182-4af9-8fd4-270907296914.png and b/sprites/spr_terminator_hands/60a62808-3182-4af9-8fd4-270907296914.png differ diff --git a/sprites/spr_terminator_hands/a27c954e-44c1-40a3-bcf2-5aacdd344336.png b/sprites/spr_terminator_hands/a27c954e-44c1-40a3-bcf2-5aacdd344336.png index 3813ba0798..82952b8e36 100644 Binary files a/sprites/spr_terminator_hands/a27c954e-44c1-40a3-bcf2-5aacdd344336.png and b/sprites/spr_terminator_hands/a27c954e-44c1-40a3-bcf2-5aacdd344336.png differ diff --git a/sprites/spr_terminator_hands/c9be93fb-8a44-449a-9b86-8579b9a9f1b7.png b/sprites/spr_terminator_hands/c9be93fb-8a44-449a-9b86-8579b9a9f1b7.png index 69507eb1d3..82952b8e36 100644 Binary files a/sprites/spr_terminator_hands/c9be93fb-8a44-449a-9b86-8579b9a9f1b7.png and b/sprites/spr_terminator_hands/c9be93fb-8a44-449a-9b86-8579b9a9f1b7.png differ diff --git a/sprites/spr_terminator_hands/e7f88754-373e-4c98-b38b-01592d149b7f.png b/sprites/spr_terminator_hands/e7f88754-373e-4c98-b38b-01592d149b7f.png index b4d7b7b40f..9a88d41ae8 100644 Binary files a/sprites/spr_terminator_hands/e7f88754-373e-4c98-b38b-01592d149b7f.png and b/sprites/spr_terminator_hands/e7f88754-373e-4c98-b38b-01592d149b7f.png differ diff --git a/sprites/spr_terminator_hands/f139d01c-05ed-4a48-a7c8-d338729ebbe1.png b/sprites/spr_terminator_hands/f139d01c-05ed-4a48-a7c8-d338729ebbe1.png index 2af176ef3a..0a4f95d911 100644 Binary files a/sprites/spr_terminator_hands/f139d01c-05ed-4a48-a7c8-d338729ebbe1.png and b/sprites/spr_terminator_hands/f139d01c-05ed-4a48-a7c8-d338729ebbe1.png differ diff --git a/sprites/spr_terminator_hands/f25745b4-f637-4dc0-b247-5ed451b3d993.png b/sprites/spr_terminator_hands/f25745b4-f637-4dc0-b247-5ed451b3d993.png index 5e78dff041..0a4f95d911 100644 Binary files a/sprites/spr_terminator_hands/f25745b4-f637-4dc0-b247-5ed451b3d993.png and b/sprites/spr_terminator_hands/f25745b4-f637-4dc0-b247-5ed451b3d993.png differ diff --git a/sprites/spr_terminator_hands/f69d1ae6-a10b-417d-8b85-05d7bc54cd18.png b/sprites/spr_terminator_hands/f69d1ae6-a10b-417d-8b85-05d7bc54cd18.png index eafb8078d4..bdc093be18 100644 Binary files a/sprites/spr_terminator_hands/f69d1ae6-a10b-417d-8b85-05d7bc54cd18.png and b/sprites/spr_terminator_hands/f69d1ae6-a10b-417d-8b85-05d7bc54cd18.png differ diff --git a/sprites/spr_terminator_hands/layers/1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index b5585701e7..bdc093be18 100644 Binary files a/sprites/spr_terminator_hands/layers/1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_hands/layers/261d6f69-5b51-4493-84f5-5d0a6adfe813/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/261d6f69-5b51-4493-84f5-5d0a6adfe813/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index 323e53e69d..2bbe9120ff 100644 Binary files a/sprites/spr_terminator_hands/layers/261d6f69-5b51-4493-84f5-5d0a6adfe813/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/261d6f69-5b51-4493-84f5-5d0a6adfe813/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_hands/layers/2d84098c-5069-4226-bf10-452f97e7bc36/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/2d84098c-5069-4226-bf10-452f97e7bc36/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index 76584369f2..9a88d41ae8 100644 Binary files a/sprites/spr_terminator_hands/layers/2d84098c-5069-4226-bf10-452f97e7bc36/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/2d84098c-5069-4226-bf10-452f97e7bc36/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_hands/layers/60a62808-3182-4af9-8fd4-270907296914/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/60a62808-3182-4af9-8fd4-270907296914/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index 7d7369bc67..2bbe9120ff 100644 Binary files a/sprites/spr_terminator_hands/layers/60a62808-3182-4af9-8fd4-270907296914/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/60a62808-3182-4af9-8fd4-270907296914/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_hands/layers/a27c954e-44c1-40a3-bcf2-5aacdd344336/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/a27c954e-44c1-40a3-bcf2-5aacdd344336/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index 3813ba0798..82952b8e36 100644 Binary files a/sprites/spr_terminator_hands/layers/a27c954e-44c1-40a3-bcf2-5aacdd344336/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/a27c954e-44c1-40a3-bcf2-5aacdd344336/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_hands/layers/c9be93fb-8a44-449a-9b86-8579b9a9f1b7/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/c9be93fb-8a44-449a-9b86-8579b9a9f1b7/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index 69507eb1d3..82952b8e36 100644 Binary files a/sprites/spr_terminator_hands/layers/c9be93fb-8a44-449a-9b86-8579b9a9f1b7/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/c9be93fb-8a44-449a-9b86-8579b9a9f1b7/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_hands/layers/e7f88754-373e-4c98-b38b-01592d149b7f/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/e7f88754-373e-4c98-b38b-01592d149b7f/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index a47b46622f..9a88d41ae8 100644 Binary files a/sprites/spr_terminator_hands/layers/e7f88754-373e-4c98-b38b-01592d149b7f/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/e7f88754-373e-4c98-b38b-01592d149b7f/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_hands/layers/f139d01c-05ed-4a48-a7c8-d338729ebbe1/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/f139d01c-05ed-4a48-a7c8-d338729ebbe1/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index 463b926e74..0a4f95d911 100644 Binary files a/sprites/spr_terminator_hands/layers/f139d01c-05ed-4a48-a7c8-d338729ebbe1/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/f139d01c-05ed-4a48-a7c8-d338729ebbe1/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_hands/layers/f25745b4-f637-4dc0-b247-5ed451b3d993/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/f25745b4-f637-4dc0-b247-5ed451b3d993/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index 1536ff834f..0a4f95d911 100644 Binary files a/sprites/spr_terminator_hands/layers/f25745b4-f637-4dc0-b247-5ed451b3d993/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/f25745b4-f637-4dc0-b247-5ed451b3d993/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_hands/layers/f69d1ae6-a10b-417d-8b85-05d7bc54cd18/34b4cf34-da25-4f45-9f1a-8dc884db941e.png b/sprites/spr_terminator_hands/layers/f69d1ae6-a10b-417d-8b85-05d7bc54cd18/34b4cf34-da25-4f45-9f1a-8dc884db941e.png index eb8f73cf7a..bdc093be18 100644 Binary files a/sprites/spr_terminator_hands/layers/f69d1ae6-a10b-417d-8b85-05d7bc54cd18/34b4cf34-da25-4f45-9f1a-8dc884db941e.png and b/sprites/spr_terminator_hands/layers/f69d1ae6-a10b-417d-8b85-05d7bc54cd18/34b4cf34-da25-4f45-9f1a-8dc884db941e.png differ diff --git a/sprites/spr_terminator_metal_tabbard/2d32fdf3-ec18-40a7-85c8-10ec10ae01b8.png b/sprites/spr_terminator_metal_tabbard/2d32fdf3-ec18-40a7-85c8-10ec10ae01b8.png new file mode 100644 index 0000000000..8964eaacd4 Binary files /dev/null and b/sprites/spr_terminator_metal_tabbard/2d32fdf3-ec18-40a7-85c8-10ec10ae01b8.png differ diff --git a/sprites/spr_terminator_metal_tabbard/layers/2d32fdf3-ec18-40a7-85c8-10ec10ae01b8/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_terminator_metal_tabbard/layers/2d32fdf3-ec18-40a7-85c8-10ec10ae01b8/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..8964eaacd4 Binary files /dev/null and b/sprites/spr_terminator_metal_tabbard/layers/2d32fdf3-ec18-40a7-85c8-10ec10ae01b8/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy b/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy new file mode 100644 index 0000000000..393b227012 --- /dev/null +++ b/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_terminator_metal_tabbard", + "bbox_bottom": 242, + "bbox_left": 67, + "bbox_right": 113, + "bbox_top": 99, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8",}, + ], + "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_terminator_metal_tabbard", + "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":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","path":"sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy",},},},"Disabled":false,"id":"1b74fa8a-8bb3-4e09-9855-486e46b09445","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_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png b/sprites/spr_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png new file mode 100644 index 0000000000..a93adbc8b6 Binary files /dev/null and b/sprites/spr_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png differ diff --git a/sprites/spr_ultra_backpack/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png b/sprites/spr_ultra_backpack/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_ultra_backpack/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png differ diff --git a/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png new file mode 100644 index 0000000000..a93adbc8b6 Binary files /dev/null and b/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png differ diff --git a/sprites/spr_ultra_backpack/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png b/sprites/spr_ultra_backpack/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_ultra_backpack/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png differ diff --git a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy new file mode 100644 index 0000000000..a5e447a1e0 --- /dev/null +++ b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_ultra_backpack", + "bbox_bottom": 37, + "bbox_left": 20, + "bbox_right": 145, + "bbox_top": 10, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8e269d92-a1bd-4360-9ab3-d9310feae634",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a3482820-22c0-4934-a6c1-87b382d13fad","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "specialist", + "path": "folders/Sprites/Marine Viewer/body_types/specialist.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_ultra_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":"8e269d92-a1bd-4360-9ab3-d9310feae634","path":"sprites/spr_ultra_backpack/spr_ultra_backpack.yy",},},},"Disabled":false,"id":"0b49ae84-efc3-48ec-9248-151c7c19f24c","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_ultra_belt/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png b/sprites/spr_ultra_belt/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png new file mode 100644 index 0000000000..baf12ee718 Binary files /dev/null and b/sprites/spr_ultra_belt/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png differ diff --git a/sprites/spr_ultra_belt/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png b/sprites/spr_ultra_belt/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_ultra_belt/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png differ diff --git a/sprites/spr_ultra_belt/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_ultra_belt/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png new file mode 100644 index 0000000000..baf12ee718 Binary files /dev/null and b/sprites/spr_ultra_belt/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png differ diff --git a/sprites/spr_ultra_belt/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png b/sprites/spr_ultra_belt/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_ultra_belt/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png differ diff --git a/sprites/spr_ultra_belt/spr_ultra_belt.yy b/sprites/spr_ultra_belt/spr_ultra_belt.yy new file mode 100644 index 0000000000..6c5efc533c --- /dev/null +++ b/sprites/spr_ultra_belt/spr_ultra_belt.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_ultra_belt", + "bbox_bottom": 164, + "bbox_left": 3, + "bbox_right": 109, + "bbox_top": 21, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a3482820-22c0-4934-a6c1-87b382d13fad","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "specialist", + "path": "folders/Sprites/Marine Viewer/body_types/specialist.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_ultra_belt", + "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":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_belt/spr_ultra_belt.yy",},},},"Disabled":false,"id":"9b724e95-f10f-4ea0-888a-549bb453f7be","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_ultra_right_shoulder_hanging/88b996d0-3ce9-4c6f-bc17-518446f0995d.png b/sprites/spr_ultra_right_shoulder_hanging/88b996d0-3ce9-4c6f-bc17-518446f0995d.png new file mode 100644 index 0000000000..8892fed75a Binary files /dev/null and b/sprites/spr_ultra_right_shoulder_hanging/88b996d0-3ce9-4c6f-bc17-518446f0995d.png differ diff --git a/sprites/spr_ultra_right_shoulder_hanging/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png b/sprites/spr_ultra_right_shoulder_hanging/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_ultra_right_shoulder_hanging/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png differ diff --git a/sprites/spr_ultra_right_shoulder_hanging/layers/88b996d0-3ce9-4c6f-bc17-518446f0995d/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_ultra_right_shoulder_hanging/layers/88b996d0-3ce9-4c6f-bc17-518446f0995d/a3482820-22c0-4934-a6c1-87b382d13fad.png new file mode 100644 index 0000000000..8892fed75a Binary files /dev/null and b/sprites/spr_ultra_right_shoulder_hanging/layers/88b996d0-3ce9-4c6f-bc17-518446f0995d/a3482820-22c0-4934-a6c1-87b382d13fad.png differ diff --git a/sprites/spr_ultra_right_shoulder_hanging/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png b/sprites/spr_ultra_right_shoulder_hanging/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_ultra_right_shoulder_hanging/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png differ diff --git a/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy new file mode 100644 index 0000000000..dab9e20be4 --- /dev/null +++ b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_ultra_right_shoulder_hanging", + "bbox_bottom": 73, + "bbox_left": 13, + "bbox_right": 55, + "bbox_top": 25, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a3482820-22c0-4934-a6c1-87b382d13fad","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "specialist", + "path": "folders/Sprites/Marine Viewer/body_types/specialist.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_ultra_right_shoulder_hanging", + "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":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},},},"Disabled":false,"id":"b9642de9-3f72-4a7c-b92b-bbb1da41f352","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_ultra_tassels/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png b/sprites/spr_ultra_tassels/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_ultra_tassels/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png differ diff --git a/sprites/spr_ultra_tassels/f40bb243-5f2e-4891-8cb0-e9ef181276bf.png b/sprites/spr_ultra_tassels/f40bb243-5f2e-4891-8cb0-e9ef181276bf.png new file mode 100644 index 0000000000..e578b2dedc Binary files /dev/null and b/sprites/spr_ultra_tassels/f40bb243-5f2e-4891-8cb0-e9ef181276bf.png differ diff --git a/sprites/spr_ultra_tassels/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png b/sprites/spr_ultra_tassels/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_ultra_tassels/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png differ diff --git a/sprites/spr_ultra_tassels/layers/f40bb243-5f2e-4891-8cb0-e9ef181276bf/1ac06901-0a6d-4a8a-bf43-de3260b63605.png b/sprites/spr_ultra_tassels/layers/f40bb243-5f2e-4891-8cb0-e9ef181276bf/1ac06901-0a6d-4a8a-bf43-de3260b63605.png new file mode 100644 index 0000000000..8a51ee78cd Binary files /dev/null and b/sprites/spr_ultra_tassels/layers/f40bb243-5f2e-4891-8cb0-e9ef181276bf/1ac06901-0a6d-4a8a-bf43-de3260b63605.png differ diff --git a/sprites/spr_ultra_tassels/layers/f40bb243-5f2e-4891-8cb0-e9ef181276bf/38ebe760-33c8-4a56-95f4-567b3d672839.png b/sprites/spr_ultra_tassels/layers/f40bb243-5f2e-4891-8cb0-e9ef181276bf/38ebe760-33c8-4a56-95f4-567b3d672839.png new file mode 100644 index 0000000000..e578b2dedc Binary files /dev/null and b/sprites/spr_ultra_tassels/layers/f40bb243-5f2e-4891-8cb0-e9ef181276bf/38ebe760-33c8-4a56-95f4-567b3d672839.png differ diff --git a/sprites/spr_ultra_tassels/layers/f40bb243-5f2e-4891-8cb0-e9ef181276bf/d5f7f970-d1f9-4276-b02b-f60f6067c9b6.png b/sprites/spr_ultra_tassels/layers/f40bb243-5f2e-4891-8cb0-e9ef181276bf/d5f7f970-d1f9-4276-b02b-f60f6067c9b6.png new file mode 100644 index 0000000000..16b29c5068 Binary files /dev/null and b/sprites/spr_ultra_tassels/layers/f40bb243-5f2e-4891-8cb0-e9ef181276bf/d5f7f970-d1f9-4276-b02b-f60f6067c9b6.png differ diff --git a/sprites/spr_ultra_tassels/spr_ultra_tassels.yy b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy new file mode 100644 index 0000000000..919cf5b054 --- /dev/null +++ b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy @@ -0,0 +1,75 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_ultra_tassels", + "bbox_bottom": 23, + "bbox_left": 7, + "bbox_right": 13, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf",}, + ], + "gridX": 0, + "gridY": 0, + "height": 232, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"38ebe760-33c8-4a56-95f4-567b3d672839","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1ac06901-0a6d-4a8a-bf43-de3260b63605","blendMode":0,"displayName":"pasteLayer","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "specialist", + "path": "folders/Sprites/Marine Viewer/body_types/specialist.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_ultra_tassels", + "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":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","path":"sprites/spr_ultra_tassels/spr_ultra_tassels.yy",},},},"Disabled":false,"id":"3b63153c-72b6-4b61-a54e-91c447e89091","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