fix: highlight and shadow and multi-part weapons

ChapterMaster.yyp

@@ -576,7 +576,7 @@
   "isEcma":false,
   "LibraryEmitters":[],
   "MetaData":{
-    "IDEVersion":"2024.1400.0.815",
+    "IDEVersion":"2024.1400.0.884",
   },
   "name":"ChapterMaster",
   "resources":[
@@ -761,6 +761,7 @@
     {"id":{"name":"scr_chapter_master","path":"scripts/scr_chapter_master/scr_chapter_master.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":"scr_ChapterTraits","path":"scripts/scr_ChapterTraits/scr_ChapterTraits.yy",},},
     {"id":{"name":"scr_cheatcode","path":"scripts/scr_cheatcode/scr_cheatcode.yy",},},
     {"id":{"name":"scr_check_equip","path":"scripts/scr_check_equip/scr_check_equip.yy",},},
     {"id":{"name":"scr_choose_weighted","path":"scripts/scr_choose_weighted/scr_choose_weighted.yy",},},
@@ -1282,6 +1283,9 @@
     {"id":{"name":"spr_indomitus_backpack_variants","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},},
     {"id":{"name":"spr_indomitus_belt","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},},
     {"id":{"name":"spr_indomitus_chest_variants","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},},
+    {"id":{"name":"spr_indomitus_complex_psy_hood_cables","path":"sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy",},},
+    {"id":{"name":"spr_indomitus_complex_psy_hood_crown","path":"sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy",},},
+    {"id":{"name":"spr_indomitus_complex_psy_hood","path":"sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy",},},
     {"id":{"name":"spr_indomitus_complex","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},},
     {"id":{"name":"spr_indomitus_head_variants","path":"sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy",},},
     {"id":{"name":"spr_indomitus_knightly_robe","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},},
@@ -1290,6 +1294,7 @@
     {"id":{"name":"spr_indomitus_left_eye_bionic","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},},
     {"id":{"name":"spr_indomitus_left_knee_crux","path":"sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy",},},
     {"id":{"name":"spr_indomitus_left_leg_bionic","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},},
+    {"id":{"name":"spr_indomitus_left_shin_shadow","path":"sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy",},},
     {"id":{"name":"spr_indomitus_left_shin","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},},
     {"id":{"name":"spr_indomitus_leg_variants","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},
     {"id":{"name":"spr_indomitus_right_arm_bionic","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},},
@@ -1355,6 +1360,7 @@
     {"id":{"name":"spr_maximus_colors2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},},
     {"id":{"name":"spr_medicine_icon","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},},
     {"id":{"name":"spr_melta","path":"sprites/spr_melta/spr_melta.yy",},},
+    {"id":{"name":"spr_metal_tabbard_shadow","path":"sprites/spr_metal_tabbard_shadow/spr_metal_tabbard_shadow.yy",},},
     {"id":{"name":"spr_metal_tabbard","path":"sprites/spr_metal_tabbard/spr_metal_tabbard.yy",},},
     {"id":{"name":"spr_mk3_belt","path":"sprites/spr_mk3_belt/spr_mk3_belt.yy",},},
     {"id":{"name":"spr_mk3_chest","path":"sprites/spr_mk3_chest/spr_mk3_chest.yy",},},
@@ -1409,13 +1415,16 @@
     {"id":{"name":"spr_mk7_chest_ultra","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},},
     {"id":{"name":"spr_mk7_chest_variants","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},
     {"id":{"name":"spr_mk7_colors","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},},
+    {"id":{"name":"spr_mk7_complex_backpack_shadow","path":"sprites/spr_mk7_complex_backpack_shadow/spr_mk7_complex_backpack_shadow.yy",},},
     {"id":{"name":"spr_mk7_complex_backpack","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},},
     {"id":{"name":"spr_mk7_complex_belt","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},},
     {"id":{"name":"spr_mk7_complex_crux_belt","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy",},},
     {"id":{"name":"spr_mk7_complex_knees","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},},
     {"id":{"name":"spr_mk7_complex_left_knee_1","path":"sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy",},},
+    {"id":{"name":"spr_mk7_complex_left_pauldron_shadow","path":"sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy",},},
     {"id":{"name":"spr_mk7_complex_left_pauldron","path":"sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy",},},
     {"id":{"name":"spr_mk7_complex_right_knee","path":"sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy",},},
+    {"id":{"name":"spr_mk7_complex_right_pauldron_shadow","path":"sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy",},},
     {"id":{"name":"spr_mk7_complex_right_pauldron","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},},
     {"id":{"name":"spr_mk7_complex","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},},
     {"id":{"name":"spr_mk7_full_colour","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},
@@ -1424,6 +1433,7 @@
     {"id":{"name":"spr_mk7_knightly_chest","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},},
     {"id":{"name":"spr_mk7_left_arm","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},},
     {"id":{"name":"spr_mk7_left_trim","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},},
+    {"id":{"name":"spr_mk7_leg_variants_shadows","path":"sprites/spr_mk7_leg_variants_shadows/spr_mk7_leg_variants_shadows.yy",},},
     {"id":{"name":"spr_mk7_leg_variants","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},},
     {"id":{"name":"spr_mk7_mongol_chest_variants","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},},
     {"id":{"name":"spr_mk7_mouth_prussian","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},},
@@ -1439,6 +1449,7 @@
     {"id":{"name":"spr_mk7_wolf_cult_chest_variants","path":"sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy",},},
     {"id":{"name":"spr_mk8_colors","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},},
     {"id":{"name":"spr_mk8_gorget","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},
+    {"id":{"name":"spr_mk8_gorgot_shadows","path":"sprites/spr_mk8_gorgot_shadows/spr_mk8_gorgot_shadows.yy",},},
     {"id":{"name":"spr_mm_butts_small","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},},
     {"id":{"name":"spr_mm_butts","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},},
     {"id":{"name":"spr_mm_glow","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},},
@@ -1488,10 +1499,13 @@
     {"id":{"name":"spr_popup","path":"sprites/spr_popup/spr_popup.yy",},},
     {"id":{"name":"spr_postbattle_space","path":"sprites/spr_postbattle_space/spr_postbattle_space.yy",},},
     {"id":{"name":"spr_postbattle","path":"sprites/spr_postbattle/spr_postbattle.yy",},},
+    {"id":{"name":"spr_pow_sword_blade_additions","path":"sprites/spr_pow_sword_blade_additions/spr_pow_sword_blade_additions.yy",},},
+    {"id":{"name":"spr_pow_sword_cross_guard","path":"sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy",},},
     {"id":{"name":"spr_prussian_spike","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},},
     {"id":{"name":"spr_psy_hood_alpha","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},},
     {"id":{"name":"spr_psy_hood_alpha2","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},},
     {"id":{"name":"spr_psy_hood_complex","path":"sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy",},},
+    {"id":{"name":"spr_psy_hood_components","path":"sprites/spr_psy_hood_components/spr_psy_hood_components.yy",},},
     {"id":{"name":"spr_psy_hood","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},},
     {"id":{"name":"spr_pulse","path":"sprites/spr_pulse/spr_pulse.yy",},},
     {"id":{"name":"spr_purge_1","path":"sprites/spr_purge_1/spr_purge_1.yy",},},
@@ -1634,13 +1648,16 @@
     {"id":{"name":"spr_tartaros2_colors","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},},
     {"id":{"name":"spr_tech_area_pad","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},},
     {"id":{"name":"spr_tech_belt","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},},
+    {"id":{"name":"spr_tech_face_plate_shadow","path":"sprites/spr_tech_face_plate_shadow/spr_tech_face_plate_shadow.yy",},},
     {"id":{"name":"spr_tech_face_plate","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.yy",},},
     {"id":{"name":"spr_techmarine_chest","path":"sprites/spr_techmarine_chest/spr_techmarine_chest.yy",},},
     {"id":{"name":"spr_techmarine_complex","path":"sprites/spr_techmarine_complex/spr_techmarine_complex.yy",},},
     {"id":{"name":"spr_techmarine_core","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},},
     {"id":{"name":"spr_techmarine_head","path":"sprites/spr_techmarine_head/spr_techmarine_head.yy",},},
+    {"id":{"name":"spr_techmarine_left_leg_shadow","path":"sprites/spr_techmarine_left_leg_shadow/spr_techmarine_left_leg_shadow.yy",},},
     {"id":{"name":"spr_techmarine_left_leg","path":"sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy",},},
     {"id":{"name":"spr_techmarine_left_trim","path":"sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy",},},
+    {"id":{"name":"spr_techmarine_right_leg_shadow","path":"sprites/spr_techmarine_right_leg_shadow/spr_techmarine_right_leg_shadow.yy",},},
     {"id":{"name":"spr_techmarine_right_leg","path":"sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy",},},
     {"id":{"name":"spr_techmarine_right_trim","path":"sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy",},},
     {"id":{"name":"spr_technology_icon","path":"sprites/spr_technology_icon/spr_technology_icon.yy",},},
@@ -1776,6 +1793,8 @@
     {"id":{"name":"spr_weapon_volkite_culverin_term","path":"sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy",},},
     {"id":{"name":"spr_weapon_volkite_culverin","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},},
     {"id":{"name":"spr_weapon_volkite_serpenta","path":"sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy",},},
+    {"id":{"name":"spr_weapon_webber_shadow","path":"sprites/spr_weapon_webber_shadow/spr_weapon_webber_shadow.yy",},},
+    {"id":{"name":"spr_weapon_webber","path":"sprites/spr_weapon_webber/spr_weapon_webber.yy",},},
     {"id":{"name":"spr_weapon_xenophase_blade_var1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},},
     {"id":{"name":"spr_weapoon_powso_flamberge","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},},
     {"id":{"name":"spr_welcome_bg","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},},
@@ -1802,6 +1821,7 @@
     {"id":{"name":"sprite267","path":"sprites/sprite267/sprite267.yy",},},
     {"id":{"name":"sprite269","path":"sprites/sprite269/sprite269.yy",},},
     {"id":{"name":"Sprite544","path":"sprites/Sprite544/Sprite544.yy",},},
+    {"id":{"name":"sword_Works","path":"sprites/sword_Works/sword_Works.yy",},},
   ],
   "resourceType":"GMProject",
   "resourceVersion":"2.0",

datafiles/main/chapters/7.JSON

@@ -229,7 +229,12 @@
         },
         /** Add extra starting items ["Item Name", Number to add] */
         "full_liveries":[
-           { "left_pauldron" : [ "icon",{ "icon" : "ultramarines", "colour" : 34, "type" : 2 } ], "right_pauldron" : 34, "is_changed" : 1, "left_leg_lower" : 34, "left_leg_upper" : 34, "left_leg_knee" : 34, "right_leg_lower" : 34, "right_leg_upper" : 34, "right_leg_knee" : 34, "metallic_trim" : 12, "left_chest" : 34, "right_chest" : 34, "left_thorax" : 0, "right_thorax" : 0, "left_hand" : 34, "right_hand" : 34, "left_head" : 34, "right_head" : 34, "left_muzzle" : 34, "right_muzzle" : 34, "eye_lense" : 9, "right_backpack" : 34, "left_backpack" : 34, "weapon_primary" : 9, "weapon_secondary" : 9, "company_marks" : 0, "company_marks_loc" : 0, "left_arm" : 34, "right_arm" : 34, "left_trim" : 12, "right_trim" : 12 },
+           {
+                "left_pauldron" : [ "icon",{ "icon" : "ultramarines", "colour" : 34, "type" : 2 } ],
+                "right_pauldron" : 34, 
+                "is_changed" : 1, 
+                "left_leg_lower" : 34, "left_leg_upper" : 34, "left_leg_knee" : 34, "right_leg_lower" : 34, "right_leg_upper" : 34, "right_leg_knee" : 34, "metallic_trim" : 12, "left_chest" : 34, "right_chest" : 34, "left_thorax" : 0, "right_thorax" : 0, "left_hand" : 34, "right_hand" : 34, "left_head" : 34, "right_head" : 34, "left_muzzle" : 34, "right_muzzle" : 34, "eye_lense" : 9, "right_backpack" : 34, "left_backpack" : 34, "weapon_primary" : 9, "weapon_secondary" : 9, "company_marks" : 0, "company_marks_loc" : 0, "left_arm" : 34, "right_arm" : 34, "left_trim" : 12, "right_trim" : 12 
+            },
         ],
         "company_liveries" : [
             {},

objects/obj_creation/Create_0.gml

@@ -567,105 +567,6 @@ other_chapters = array_filter(all_chapters, function(item){ return item.origin =
 // meta provides a universal way to control not having contradictory advatages and disadvantages
 // the player can not have any two advantages or disadvatages taht have the same piece of meta thus removing clunky checks in the draw sequence
 chapter_trait_meta = [];
-function ChapterTrait(_id, _name, _description, _points_cost, _meta = []) constructor{
-
-    id = _id;
-    name = _name;
-    description = _description;
-    points = _points_cost;
-    disabled = false;
-    meta = _meta;
-
-    static add_meta = function(){
-        for (var i=0;i<array_length(meta);i++){
-            array_push(obj_creation.chapter_trait_meta, meta[i]);
-        }
-        show_debug_message($"Meta updated, added: {meta}, all meta: {obj_creation.chapter_trait_meta}");
-
-    }
-    static remove_meta = function(){
-        for (var i=0;i<array_length(meta);i++){
-            var len = array_length(obj_creation.chapter_trait_meta);
-            for (var s=0;s<len;s++){
-                if (obj_creation.chapter_trait_meta[s]==meta[i]){
-                    array_delete(obj_creation.chapter_trait_meta, s, 1);
-                    s--;
-                    len--;
-                }
-            }
-        }
-        show_debug_message($"Meta updated, removed: {meta}, all meta: {obj_creation.chapter_trait_meta}");
-    }
-
-    static print_meta = function(){
-        if(array_length(meta) ==0){
-            return "None";
-        } else {
-            return string_join_ext(", ", meta);
-        }
-    }
-
-}
-
-function Advantage(_id, _name, _description, _points_cost) : ChapterTrait(_id, _name, _description, _points_cost) constructor {
-
-    static add = function(slot){
-        show_debug_message($"Adding adv {name} to slot {slot} for points {points}");
-        obj_creation.adv[slot] = name;
-        obj_creation.adv_num[slot] = id;
-        obj_creation.points+=points;
-        add_meta();
-    }
-    static remove = function(slot){
-        show_debug_message($"removing adv {name} from slot {slot} for points {points}");
-        obj_creation.adv[slot] = "";
-        obj_creation.points-=points;
-        obj_creation.adv_num[slot]=0;
-        remove_meta();
-    }
-
-    static disable = function(){
-        var is_disabled= false;
-        for (var i=0;i<array_length(meta);i++){
-            if (array_contains(obj_creation.chapter_trait_meta, meta[i])){
-                is_disabled = true;
-            }
-        }
-        if(obj_creation.points + points > obj_creation.maxpoints){
-            is_disabled = true;
-        }
-        return is_disabled;
-    }
-
-}
-function Disadvantage(_id, _name, _description, _points_cost) : ChapterTrait(_id, _name, _description, _points_cost) constructor {
-
-    static add = function(slot){
-        show_debug_message($"Adding disadv {name} to slot {slot} for points {points}");
-        obj_creation.dis[slot] = name;
-        obj_creation.dis_num[slot] = id;
-        obj_creation.points-=points;
-        add_meta();
-    }
-
-    static remove = function(slot){
-        show_debug_message($"Removing disadv {name} from slot {slot} for points {points}");
-        obj_creation.dis[slot] = "";
-        obj_creation.points+=points;
-        obj_creation.dis_num[slot]=0;
-        remove_meta();
-    }
-
-    static disable = function(){
-        var is_disabled= false;
-        for (var i=0;i<array_length(meta);i++){
-            if (array_contains(obj_creation.chapter_trait_meta, meta[i])){
-                is_disabled = true;
-            }
-        }
-        return is_disabled;
-    }
-}
 
 //later we can use json maybe
 /// @type {Array<Struct.Advantage>}