feat: A bunch of changes to sprites (Adeptus-Dominus#147)

* Separate MK5 helmet from the main body and draw it as a head variant.
* Lower MK5 helmet by 1 pixel down, to keep eye level consistent across all armour marks.
* Add missing -2 x origin to some complex sprites, that was causing them to be misplaced.
* Add a new pauldron decal for Librarians (just a horned skull made by Equilibrium).
* Separate chaplain skull helms for normal and terminator armour.
* New Chain Axe, Chainsword and Knife sprites, made by Abomination.
* Flipped autocannon to stand vertically, like in chapter generator. I think this looks much better and less funny.
* New drawing method to the above-mentioned weapons and: Power Maul and Power Spear.

ChapterMaster.yyp

@@ -80,6 +80,7 @@
     {"resourceType":"GMFolder","resourceVersion":"1.0","name":"helms","folderPath":"folders/Sprites/Marine Viewer/helms.yy",},
     {"resourceType":"GMFolder","resourceVersion":"1.0","name":"dark_angels","folderPath":"folders/Sprites/Marine Viewer/helms/dark_angels.yy",},
     {"resourceType":"GMFolder","resourceVersion":"1.0","name":"packs","folderPath":"folders/Sprites/Marine Viewer/packs.yy",},
+    {"resourceType":"GMFolder","resourceVersion":"1.0","name":"unused","folderPath":"folders/Sprites/Marine Viewer/unused.yy",},
     {"resourceType":"GMFolder","resourceVersion":"1.0","name":"weapons_terminator","folderPath":"folders/Sprites/Marine Viewer/weapons_terminator.yy",},
     {"resourceType":"GMFolder","resourceVersion":"1.0","name":"weapons","folderPath":"folders/Sprites/Marine Viewer/weapons.yy",},
     {"resourceType":"GMFolder","resourceVersion":"1.0","name":"heavy_ranged","folderPath":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy",},
@@ -704,6 +705,7 @@
     {"id":{"name":"spr_helm_decorations","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},},
     {"id":{"name":"spr_ws_mk7_scar_of_the_ancients","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},},
     {"id":{"name":"spr_ship_ammer","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},},
+    {"id":{"name":"spr_weapon_autocannon2","path":"sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy",},},
     {"id":{"name":"scr_diplomacy_helpers","path":"scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.yy",},},
     {"id":{"name":"spr_dread_iron_clad","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},},
     {"id":{"name":"scr_has_adv","path":"scripts/scr_has_adv/scr_has_adv.yy",},},
@@ -1103,6 +1105,7 @@
     {"id":{"name":"spr_ws_mk4_monovisor","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},},
     {"id":{"name":"scr_chapter_new","path":"scripts/scr_chapter_new/scr_chapter_new.yy",},},
     {"id":{"name":"scr_chapter_random","path":"scripts/scr_chapter_random/scr_chapter_random.yy",},},
+    {"id":{"name":"spr_gear_librarian","path":"sprites/spr_gear_librarian/spr_gear_librarian.yy",},},
     {"id":{"name":"scr_vehicle_order","path":"scripts/scr_vehicle_order/scr_vehicle_order.yy",},},
     {"id":{"name":"scr_icon","path":"scripts/scr_icon/scr_icon.yy",},},
     {"id":{"name":"scr_initialize_custom","path":"scripts/scr_initialize_custom/scr_initialize_custom.yy",},},
@@ -1272,6 +1275,7 @@
     {"id":{"name":"obj_defeat","path":"objects/obj_defeat/obj_defeat.yy",},},
     {"id":{"name":"spr_marine_head","path":"sprites/spr_marine_head/spr_marine_head.yy",},},
     {"id":{"name":"scr_player_fleet_combat_functions","path":"scripts/scr_player_fleet_combat_functions/scr_player_fleet_combat_functions.yy",},},
+    {"id":{"name":"spr_mk5_head_variants","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},},
     {"id":{"name":"obj_ini","path":"objects/obj_ini/obj_ini.yy",},},
     {"id":{"name":"spr_weapon_hthhammer","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},},
     {"id":{"name":"obj_controller","path":"objects/obj_controller/obj_controller.yy",},},

scripts/scr_draw_unit_image/scr_draw_unit_image.gml

@@ -70,7 +70,8 @@ function get_complex_set(set = eARMOUR_SET.MK7){
         set_pieces.left_arm = spr_mk5_left_arm;
         set_pieces.right_arm = spr_mk5_right_arm;
         set_pieces.left_trim = spr_mk7_left_trim;
-        set_pieces.right_trim = spr_mk7_right_trim;        
+        set_pieces.right_trim = spr_mk7_right_trim;
+		set_pieces.head = spr_mk5_head_variants;
     }else if (set == eARMOUR_SET.MK4){
         set_pieces.chest_variants = spr_mk4_chest_variants;
         set_pieces.armour = spr_mk4_complex;
@@ -1334,6 +1335,15 @@ function scr_draw_unit_image(_background=false){
                         }
                     }
                 }
+
+				// 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 (psy_hood>0){
@@ -1363,13 +1373,11 @@ function scr_draw_unit_image(_background=false){
 
                 //Chaplain head and Terminator version
                 if (skull_mask>0){
-                    if (unit_armour!="Terminator"){
-                      //if (_armour_type==ArType.Tart || _armour_type==ArType.Term) then draw_sprite(spr_terminator_chap,1,0-2,0-11);
-                    }
-                    shader_reset();
-                    if (armour_type == ArmourType.Normal || unit_armour=="Terminator Armour") then draw_sprite(spr_chaplain_skull_helm,0,x_surface_offset,y_surface_offset);
-                    if (unit_armour=="Tartaros") then draw_sprite(spr_chaplain_skull_helm,0,x_surface_offset,y_surface_offset);
-                    shader_set(sReplaceColor);
+                    if (armour_type == ArmourType.Normal) {
+						draw_sprite(spr_chaplain_skull_helm,0,x_surface_offset,y_surface_offset);
+					} else if (armour_type == ArmourType.Terminator) {
+						draw_sprite(spr_chaplain_skull_helm,1,x_surface_offset,y_surface_offset);
+					}
                 }
             }
             //purity seals/decorations

scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml

@@ -100,7 +100,6 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu
             "Multi-Melta":spr_weapon_mmelta,
             "Heavy Flamer":spr_weapon_hflamer,
 			"Plasma Cannon":spr_weapon_plasc,
-			"Autocannon":spr_weapon_autocannon,
             "Grav-Cannon":spr_weapon_grav_cannon,
         }
         var heavy_ranged_names=struct_get_names(heavy_ranged);
@@ -190,6 +189,7 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu
     if (!sprite_found){
         var special_ranged ={
             "Sniper Rifle":spr_weapon_sniper,
+            "Autocannon":spr_weapon_autocannon2,
         }
         var special_ranged_names=struct_get_names(special_ranged);
         for (var i=0;i<array_length(special_ranged_names);i++){
@@ -320,17 +320,17 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu
         hand_on_top[2]=true;
     }
 
-    if (array_contains(["Power Mace", "Mace of Absolution"], equiped_weapon)) {
+    if (array_contains(["Power Mace", "Mace of Absolution", "Power Axe", "Shock Maul", "Chain Axe"], equiped_weapon)) {
         hand_variant[left_or_right] = 3;
     }
 
-    if (array_contains(["Sniper Rifle", "Force Staff", "Power Sword", "Thunder Hammer"], equiped_weapon)) {
+    if (array_contains(["Sniper Rifle", "Force Staff", "Power Sword", "Thunder Hammer", "Autocannon", "Combat Knife", "Power Spear", "Chainsword"], equiped_weapon)) {
         hand_variant[left_or_right] = 2;
         hand_on_top[left_or_right] = true;
     }
 
     // New weapon draw method
-    if (array_contains(["Force Staff", "Mace of Absolution", "Power Mace", "Power Axe", "Power Sword"], equiped_weapon)) {
+    if (array_contains(["Force Staff", "Mace of Absolution", "Power Mace", "Power Axe", "Power Sword", "Autocannon", "Combat Knife", "Power Spear", "Shock Maul", "Chainsword", "Chain Axe"], equiped_weapon)) {
         new_weapon_draw[left_or_right] = true;
     }