Merge pull request #38 from EttyKitty/pr/mk8-adjustments

feat(sprite): complex MK8 adjustments

ChapterMaster.yyp

@@ -567,7 +567,6 @@
     {"id":{"name":"spr_loadbar","path":"sprites/spr_loadbar/spr_loadbar.yy",},},
     {"id":{"name":"scr_mission_functions","path":"scripts/scr_mission_functions/scr_mission_functions.yy",},},
     {"id":{"name":"spr_loadbar_empty","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},},
-    {"id":{"name":"spr_mk8_right_arm","path":"sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy",},},
     {"id":{"name":"spr_loadbar_cover","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},},
     {"id":{"name":"scr_ground_ai_helpers","path":"scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.yy",},},
     {"id":{"name":"spr_load_text","path":"sprites/spr_load_text/spr_load_text.yy",},},
@@ -758,7 +757,6 @@
     {"id":{"name":"spr_ship_castellan","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},},
     {"id":{"name":"spr_manta","path":"sprites/spr_manta/spr_manta.yy",},},
     {"id":{"name":"spr_ship_leviathan","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},},
-    {"id":{"name":"spr_mk8_complex","path":"sprites/spr_mk8_complex/spr_mk8_complex.yy",},},
     {"id":{"name":"spr_ship_razorfiend","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},},
     {"id":{"name":"spr_mk7_right_arm","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},},
     {"id":{"name":"spr_artificer_left_trim","path":"sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy",},},
@@ -994,10 +992,8 @@
     {"id":{"name":"scr_specialist_points","path":"scripts/scr_specialist_points/scr_specialist_points.yy",},},
     {"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},},
     {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},},
-    {"id":{"name":"spr_mk8_left_arm","path":"sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy",},},
     {"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},},
     {"id":{"name":"spr_um_mk6_helm","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},},
-    {"id":{"name":"spr_mk8_gorget","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},
     {"id":{"name":"scr_count_forces","path":"scripts/scr_count_forces/scr_count_forces.yy",},},
     {"id":{"name":"spr_weapon_powmace","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},},
     {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},},
@@ -1067,7 +1063,6 @@
     {"id":{"name":"spr_dreadnought_chasis_colors","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},},
     {"id":{"name":"scr_vehicle_count","path":"scripts/scr_vehicle_count/scr_vehicle_count.yy",},},
     {"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},},
-    {"id":{"name":"spr_mk8_complex_backpack","path":"sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy",},},
     {"id":{"name":"scr_ship_count","path":"scripts/scr_ship_count/scr_ship_count.yy",},},
     {"id":{"name":"scr_ship_occupants","path":"scripts/scr_ship_occupants/scr_ship_occupants.yy",},},
     {"id":{"name":"spr_leopard_sprite","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},},
@@ -1229,6 +1224,7 @@
     {"id":{"name":"spr_mk4_complex","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},},
     {"id":{"name":"obj_fleet_spawner","path":"objects/obj_fleet_spawner/obj_fleet_spawner.yy",},},
     {"id":{"name":"spr_tartaros_gorget","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},},
+    {"id":{"name":"spr_mk8_gorget","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},
     {"id":{"name":"obj_fleet_controller","path":"objects/obj_fleet_controller/obj_fleet_controller.yy",},},
     {"id":{"name":"obj_p_ship","path":"objects/obj_p_ship/obj_p_ship.yy",},},
     {"id":{"name":"scr_kill_unit","path":"scripts/scr_kill_unit/scr_kill_unit.yy",},},
@@ -1306,7 +1302,6 @@
     {"id":{"name":"obj_p1_bullet","path":"objects/obj_p1_bullet/obj_p1_bullet.yy",},},
     {"id":{"name":"obj_p1_bullet_miss","path":"objects/obj_p1_bullet_miss/obj_p1_bullet_miss.yy",},},
     {"id":{"name":"obj_main_menu","path":"objects/obj_main_menu/obj_main_menu.yy",},},
-    {"id":{"name":"spr_mk8_chest","path":"sprites/spr_mk8_chest/spr_mk8_chest.yy",},},
     {"id":{"name":"spr_mk5_complex","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},},
     {"id":{"name":"obj_cuicons","path":"objects/obj_cuicons/obj_cuicons.yy",},},
     {"id":{"name":"obj_img","path":"objects/obj_img/obj_img.yy",},},

scripts/scr_draw_unit_image/scr_draw_unit_image.gml

@@ -118,10 +118,10 @@ function get_complex_set(set = eARMOUR_SET.MK7){
         });    
     }else if (set == eARMOUR_SET.MK8){
         set_pieces.add_group({
-            armour : spr_mk8_complex,
-            backpack : spr_mk8_complex_backpack,
-            left_arm : spr_mk8_left_arm,
-            right_arm : spr_mk8_right_arm,
+            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,
@@ -130,7 +130,6 @@ function get_complex_set(set = eARMOUR_SET.MK7){
             leg_variants : spr_mk7_leg_variants,
             gorget : spr_mk8_gorget,        
         });
-        set_pieces.add_to_area("chest_variants", spr_mk8_chest);                      
     }else if (set == eARMOUR_SET.Indomitus){
          set_pieces.add_group({
             armour : spr_indomitus_complex,