feat: Separate armor heads (#367)

Adeptus-Dominus · Jan 12, 2025 · 89afaa2 · 89afaa2
1 parent ad38d53
commit 89afaa2
Show file tree

Hide file tree

Showing 55 changed files with 256 additions and 29 deletions.
diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp
@@ -465,6 +465,7 @@
     {"id":{"name":"spr_maximus_colors","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},},
     {"id":{"name":"spr_noarmour_colors","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},},
     {"id":{"name":"spr_da_mk8","path":"sprites/spr_da_mk8/spr_da_mk8.yy",},},
+    {"id":{"name":"spr_mk7_head_variants","path":"sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy",},},
     {"id":{"name":"spr_scout_colors","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},},
     {"id":{"name":"spr_tartaros_colors","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},},
     {"id":{"name":"spr_generic_sgt_mk5","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},},
@@ -612,6 +613,7 @@
     {"id":{"name":"JsonFileListLoader","path":"scripts/JsonFileListLoader/JsonFileListLoader.yy",},},
     {"id":{"name":"spr_popup_medium","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},},
     {"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_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",},},
@@ -1161,7 +1163,7 @@
     {"id":{"name":"scr_add_artifact","path":"scripts/scr_add_artifact/scr_add_artifact.yy",},},
     {"id":{"name":"scr_add_stc_fragment","path":"scripts/scr_add_stc_fragment/scr_add_stc_fragment.yy",},},
     {"id":{"name":"action_another_room","path":"scripts/action_another_room/action_another_room.yy",},},
-    {"id":{"name":"spr_tartaros_head","path":"sprites/spr_tartaros_head/spr_tartaros_head.yy",},},
+    {"id":{"name":"spr_tartaros_head_variants","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},},
     {"id":{"name":"action_color","path":"scripts/action_color/action_color.yy",},},
     {"id":{"name":"action_draw_ellipse","path":"scripts/action_draw_ellipse/action_draw_ellipse.yy",},},
     {"id":{"name":"action_if_number","path":"scripts/action_if_number/action_if_number.yy",},},
@@ -1188,6 +1190,7 @@
     {"id":{"name":"__init_global","path":"scripts/__init_global/__init_global.yy",},},
     {"id":{"name":"__global_object_depths","path":"scripts/__global_object_depths/__global_object_depths.yy",},},
     {"id":{"name":"sReplaceColor","path":"shaders/sReplaceColor/sReplaceColor.yy",},},
+    {"id":{"name":"spr_mk4_head_variants","path":"sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy",},},
     {"id":{"name":"fnt_cul_14","path":"fonts/fnt_cul_14/fnt_cul_14.yy",},},
     {"id":{"name":"fnt_cul_18","path":"fonts/fnt_cul_18/fnt_cul_18.yy",},},
     {"id":{"name":"spr_mk4_leg_variants","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},},

diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml
@@ -76,6 +76,7 @@ function get_complex_set(set = eARMOUR_SET.MK7){
             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({
@@ -85,6 +86,7 @@ function get_complex_set(set = eARMOUR_SET.MK7){
             right_arm: spr_mk6_right_arm,
             left_trim :spr_mk7_left_trim,
             right_trim: spr_mk7_right_trim,
+            head : spr_mk6_head_variants,
         });
     }else if (set == eARMOUR_SET.MK5){
         set_pieces.add_group({
@@ -107,6 +109,7 @@ function get_complex_set(set = eARMOUR_SET.MK7){
             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({
@@ -128,7 +131,8 @@ function get_complex_set(set = eARMOUR_SET.MK7){
             thorax_variants : spr_mk7_thorax_variants,
             chest_variants : spr_mk7_chest_variants,
             leg_variants : spr_mk7_leg_variants,
-            gorget : spr_mk8_gorget,        
+            gorget : spr_mk8_gorget,
+            head : spr_mk7_head_variants,
         });
     }else if (set == eARMOUR_SET.Indomitus){
          set_pieces.add_group({
@@ -149,7 +153,7 @@ function get_complex_set(set = eARMOUR_SET.MK7){
             chest_variants : spr_tartaros_chest,
             gorget : spr_tartaros_gorget,
             mouth_variants : spr_tartaros_faceplate,
-            head : spr_tartaros_head,
+            head : spr_tartaros_head_variants,
             left_trim : spr_tartaros_left_trim,
             right_trim : spr_tartaros_right_trim,
 

diff --git a/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png b/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png
diff --git a/...s/358913f3-25cd-4411-aa3a-01c656c1166c/877a1a45-e091-4686-9968-18df7c72aafe.png b/...s/358913f3-25cd-4411-aa3a-01c656c1166c/877a1a45-e091-4686-9968-18df7c72aafe.png
diff --git a/...s/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/...s/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png
diff --git a/sprites/spr_mk3_complex/spr_mk3_complex.yy b/sprites/spr_mk3_complex/spr_mk3_complex.yy
diff --git a/sprites/spr_mk3_head_variants/006f1fc6-2a40-4299-aedd-c8ec3435711f.png b/sprites/spr_mk3_head_variants/006f1fc6-2a40-4299-aedd-c8ec3435711f.png
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
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
diff --git a/sprites/spr_mk3_head_variants/52c73332-e685-4491-bf62-c232947cb455.png b/sprites/spr_mk3_head_variants/52c73332-e685-4491-bf62-c232947cb455.png
diff --git a/...s/006f1fc6-2a40-4299-aedd-c8ec3435711f/11966306-2c72-4664-be9f-563bdc23de41.png b/...s/006f1fc6-2a40-4299-aedd-c8ec3435711f/11966306-2c72-4664-be9f-563bdc23de41.png
diff --git a/...s/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png b/...s/006f1fc6-2a40-4299-aedd-c8ec3435711f/9457b174-a643-4ea6-8880-a9df6463f668.png
diff --git a/...s/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/11966306-2c72-4664-be9f-563bdc23de41.png b/...s/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/11966306-2c72-4664-be9f-563bdc23de41.png
diff --git a/...s/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png b/...s/120c0dc2-09ee-43e7-8b97-23af2bfa96b6/9457b174-a643-4ea6-8880-a9df6463f668.png
diff --git a/...s/2faf2e83-0803-4ea4-945c-272a0a936425/11966306-2c72-4664-be9f-563bdc23de41.png b/...s/2faf2e83-0803-4ea4-945c-272a0a936425/11966306-2c72-4664-be9f-563bdc23de41.png
diff --git a/...s/2faf2e83-0803-4ea4-945c-272a0a936425/9457b174-a643-4ea6-8880-a9df6463f668.png b/...s/2faf2e83-0803-4ea4-945c-272a0a936425/9457b174-a643-4ea6-8880-a9df6463f668.png
diff --git a/...s/52c73332-e685-4491-bf62-c232947cb455/11966306-2c72-4664-be9f-563bdc23de41.png b/...s/52c73332-e685-4491-bf62-c232947cb455/11966306-2c72-4664-be9f-563bdc23de41.png
diff --git a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy
diff --git a/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png b/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png
diff --git a/...s/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png b/...s/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png
diff --git a/sprites/spr_mk4_complex/spr_mk4_complex.yy b/sprites/spr_mk4_complex/spr_mk4_complex.yy
diff --git a/sprites/spr_mk4_head_variants/4b8ef32c-78f9-46d9-8e67-7f619d1c5356.png b/sprites/spr_mk4_head_variants/4b8ef32c-78f9-46d9-8e67-7f619d1c5356.png
diff --git a/...s/4b8ef32c-78f9-46d9-8e67-7f619d1c5356/2cb5f869-a4b3-4c23-b542-b699f7d4d7d0.png b/...s/4b8ef32c-78f9-46d9-8e67-7f619d1c5356/2cb5f869-a4b3-4c23-b542-b699f7d4d7d0.png
diff --git a/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy b/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy
diff --git a/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png b/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png
diff --git a/...s/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png b/...s/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png
diff --git a/sprites/spr_mk6_complex/spr_mk6_complex.yy b/sprites/spr_mk6_complex/spr_mk6_complex.yy
diff --git a/sprites/spr_mk6_head_variants/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png b/sprites/spr_mk6_head_variants/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png
diff --git a/...s/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/1936fff1-2221-481b-afee-a2bb2a3607ab.png b/...s/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/1936fff1-2221-481b-afee-a2bb2a3607ab.png
diff --git a/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy b/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy
diff --git a/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png
diff --git a/...s/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/...s/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png
diff --git a/sprites/spr_mk7_complex/spr_mk7_complex.yy b/sprites/spr_mk7_complex/spr_mk7_complex.yy
diff --git a/sprites/spr_mk7_head_variants/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_head_variants/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png
diff --git a/...s/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/f470b20a-870a-42f4-9f20-168ec933590c.png b/...s/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/f470b20a-870a-42f4-9f20-168ec933590c.png
diff --git a/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy b/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy
diff --git a/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png b/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png
diff --git a/...s/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png b/...s/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png
diff --git a/sprites/spr_tartaros_head/40bc99d5-36c6-494f-ac41-97db7b1af50a.png b/sprites/spr_tartaros_head/40bc99d5-36c6-494f-ac41-97db7b1af50a.png
diff --git a/sprites/spr_tartaros_head/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png b/sprites/spr_tartaros_head/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png
diff --git a/sprites/spr_tartaros_head/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png b/sprites/spr_tartaros_head/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png
diff --git a/sprites/spr_tartaros_head/fd6650e0-331d-4ca5-8853-0b5406c4134d.png b/sprites/spr_tartaros_head/fd6650e0-331d-4ca5-8853-0b5406c4134d.png
diff --git a/...s/40bc99d5-36c6-494f-ac41-97db7b1af50a/229b5182-d233-4896-9f67-630367846af5.png b/...s/40bc99d5-36c6-494f-ac41-97db7b1af50a/229b5182-d233-4896-9f67-630367846af5.png
diff --git a/...s/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/229b5182-d233-4896-9f67-630367846af5.png b/...s/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/229b5182-d233-4896-9f67-630367846af5.png
diff --git a/...s/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/229b5182-d233-4896-9f67-630367846af5.png b/...s/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/229b5182-d233-4896-9f67-630367846af5.png
diff --git a/...s/fd6650e0-331d-4ca5-8853-0b5406c4134d/229b5182-d233-4896-9f67-630367846af5.png b/...s/fd6650e0-331d-4ca5-8853-0b5406c4134d/229b5182-d233-4896-9f67-630367846af5.png
diff --git a/sprites/spr_tartaros_head_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png b/sprites/spr_tartaros_head_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png
diff --git a/sprites/spr_tartaros_head_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png b/sprites/spr_tartaros_head_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png
diff --git a/sprites/spr_tartaros_head_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png b/sprites/spr_tartaros_head_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png
diff --git a/sprites/spr_tartaros_head_variants/fd6650e0-331d-4ca5-8853-0b5406c4134d.png b/sprites/spr_tartaros_head_variants/fd6650e0-331d-4ca5-8853-0b5406c4134d.png
diff --git a/...s/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/...s/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png
diff --git a/...s/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/...s/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png
diff --git a/...s/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/...s/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png
diff --git a/...s/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/...s/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png