compile testing

Adeptus-Dominus · Feb 19, 2025 · d36efec · d36efec
1 parent a299bd7
commit d36efec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml
@@ -32,9 +32,9 @@ function scr_has_style(style){
 
 
 
-function ComplexSet(unit) constructor{
+function ComplexSet(unit, set) constructor{
     self.unit = unit;
-    if (!array_contains([eARMOUR_SET.Indomitus, eARMOUR_SET.Tartaros], set)) {
+    if (!array_contains(["Terminator Armour","Tartaros"], set)) {
         add_group({
             right_pauldron : spr_gothic_numbers_right_pauldron,
             left_knee : spr_numeral_left_knee
@@ -148,16 +148,16 @@ function ComplexSet(unit) constructor{
         gorget : unit.get_body_data("variant","throat"),
         right_pauldron: unit.company,
         left_pauldron: unit.company,        
-        left_personal_livery : get_body_data("personal_livery","left_arm"),
+        left_personal_livery : unit.get_body_data("personal_livery","left_arm"),
         left_knee : unit.company,
         tabbard : unit.get_body_data("tabbard_variation","torso"),
         robe : unit.get_body_data("tabbard_variation","torso"),
         crest : unit.get_body_data("crest_variation","head"),
         head : unit.get_body_data("variation","head"),
         mouth_variants:unit.get_body_data("variant","jaw"),
-        left_eye : get_body_data("variant","left_eye"),
-        right_eye : get_body_data("variant","right_eye"),
-        crown : get_body_data("crown_variation","head"),
+        left_eye : unit.get_body_data("variant","left_eye"),
+        right_eye : unit.get_body_data("variant","right_eye"),
+        crown : unit.get_body_data("crown_variation","head"),
     }
 
     static draw_component = function(component_name){
@@ -677,7 +677,7 @@ global.modular_drawing_items = [
     },        
 
 ]
-    var _vis_set_directory = exists(working_directory + "main\\visual_sets");
+    var _vis_set_directory = working_directory + "main\\visual_sets";
     if (directory_exists(_vis_set_directory)){
         try {
             var _file_buffer = buffer_load(_vis_set_directory + "\\use_sets.json");

diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml
@@ -621,9 +621,9 @@ function scr_draw_unit_image(_background=false){
                     specific_armour_sprite=armour_sprite;
                     armour_bypass=true;
                 }else{
-                    var complex_armours = ["MK3 Iron Armour", "MK4 Maximus","Terminator Armour","Tartaros","MK7 Aquila", "Power Armour", "MK8 Errant","Artificer Armour","MK3 Iron Armour", "MK4 Maximus", "MK5 Heresy"];
-                    if (array_contains(complex_armours, unit.armour())){
-                        complex_set = new ComplexSet(unit);
+                    var _complex_armours = ["MK3 Iron Armour", "MK4 Maximus","Terminator Armour","Tartaros","MK7 Aquila", "Power Armour", "MK8 Errant","Artificer Armour","MK3 Iron Armour", "MK4 Maximus", "MK5 Heresy"];
+                    if (array_contains(_complex_armours, armour())){
+                        complex_set = new ComplexSet(self);
                         complex_livery = true;
                     } 
                 }

diff --git a/scripts/scr_log/scr_log.gml b/scripts/scr_log/scr_log.gml
@@ -28,8 +28,9 @@ function handle_error(_header, _message, _stacktrace="", _critical = false, _rep
     _full_message += $"Date-Time: {DATE_TIME_3}\n";
     var _format_version = is_string(global.game_version) ? string_split(global.game_version, "/") :["Unknown Version"];
     _full_message += $"Game Version: {_format_version[0]}\n";
-    _full_message += $"Build Date: {global.build_date ?? ""}\n";
-    _full_message += $"Commit Hash: {global.commit_hash ?? ""}\n\n";
+    _full_message += $"Build Date: {is_string(global.build_date) ? global.build_date : "Unknown Build Date"}\n";
+    var _commit_hash = is_string(global.commit_hash) ? global.commit_hash : "Unknown Commit Hash";
+    _full_message += $"Commit Hash: {_commit_hash}\n\n";
     _full_message += $"Details:\n";
     _full_message += $"{_message}\n\n";
     _full_message += $"Stacktrace:\n";
@@ -40,7 +41,7 @@ function handle_error(_header, _message, _stacktrace="", _critical = false, _rep
         _report_title += "\n";
     }
 
-    var _commit_history_link = $"https://github.com/EttyKitty/ChapterMaster/commits/{global.commit_hash}";
+    var _commit_history_link = $"https://github.com/EttyKitty/ChapterMaster/commits/{_commit_hash}";
 
     create_error_file($"{_report_title}{_full_message}\n{_commit_history_link}");
     show_debug_message(_full_message);