refactor: Remove parallel mission arrays and make missions OOP objects

ChapterMaster.yyp

@@ -709,7 +709,6 @@
     {"id":{"name":"obj_temp3","path":"objects/obj_temp3/obj_temp3.yy",},},
     {"id":{"name":"obj_temp5","path":"objects/obj_temp5/obj_temp5.yy",},},
     {"id":{"name":"obj_temp6","path":"objects/obj_temp6/obj_temp6.yy",},},
-    {"id":{"name":"obj_temp7","path":"objects/obj_temp7/obj_temp7.yy",},},
     {"id":{"name":"obj_temp8","path":"objects/obj_temp8/obj_temp8.yy",},},
     {"id":{"name":"obj_timer","path":"objects/obj_timer/obj_timer.yy",},},
     {"id":{"name":"obj_tooltip","path":"objects/obj_tooltip/obj_tooltip.yy",},},
@@ -754,6 +753,7 @@
     {"id":{"name":"ErrorHandler","path":"scripts/ErrorHandler/ErrorHandler.yy",},},
     {"id":{"name":"exp_and_exp_growth","path":"scripts/exp_and_exp_growth/exp_and_exp_growth.yy",},},
     {"id":{"name":"explode_script","path":"scripts/explode_script/explode_script.yy",},},
+    {"id":{"name":"FleetProblem","path":"scripts/FleetProblem/FleetProblem.yy",},},
     {"id":{"name":"GitHub","path":"scripts/GitHub/GitHub.yy",},},
     {"id":{"name":"GitHubBugReporter","path":"scripts/GitHubBugReporter/GitHubBugReporter.yy",},},
     {"id":{"name":"GitHubContent","path":"scripts/GitHubContent/GitHubContent.yy",},},
@@ -774,6 +774,7 @@
     {"id":{"name":"NameGenerator","path":"scripts/NameGenerator/NameGenerator.yy",},},
     {"id":{"name":"NotificationAlert","path":"scripts/NotificationAlert/NotificationAlert.yy",},},
     {"id":{"name":"object_get_depth","path":"scripts/object_get_depth/object_get_depth.yy",},},
+    {"id":{"name":"PlanetProblem","path":"scripts/PlanetProblem/PlanetProblem.yy",},},
     {"id":{"name":"scr_add_corruption","path":"scripts/scr_add_corruption/scr_add_corruption.yy",},},
     {"id":{"name":"scr_add_item","path":"scripts/scr_add_item/scr_add_item.yy",},},
     {"id":{"name":"scr_add_man","path":"scripts/scr_add_man/scr_add_man.yy",},},
@@ -993,6 +994,7 @@
     {"id":{"name":"SectorHandler","path":"scripts/SectorHandler/SectorHandler.yy",},},
     {"id":{"name":"Set","path":"scripts/Set/Set.yy",},},
     {"id":{"name":"SettingsManager","path":"scripts/SettingsManager/SettingsManager.yy",},},
+    {"id":{"name":"SystemProblem","path":"scripts/SystemProblem/SystemProblem.yy",},},
     {"id":{"name":"TooltipBuilder","path":"scripts/TooltipBuilder/TooltipBuilder.yy",},},
     {"id":{"name":"turn_towards_point","path":"scripts/turn_towards_point/turn_towards_point.yy",},},
     {"id":{"name":"UIComponents","path":"scripts/UIComponents/UIComponents.yy",},},

docs/CHEATCODES.md

@@ -71,7 +71,6 @@ Arguments with stars `(argument*)` can be omitted.
 - `mechmission (mission*)` - triggers a mechaniicus mission, can be run as is or with an optional missiono parameter to specify a particular mission
     - `mech_mars`
     - `mech_raider`
-    - `mech_bionics`
 
 
 ### Disposition:

objects/obj_bomb_select/Alarm_1.gml

@@ -5,7 +5,7 @@ ship_use = [];
 ship_max = [];
 ship_ide = [];
 
-var _ships = fleet_full_ship_array(sh_target);
+var _ships = sh_target.full_ship_array();
 max_ships = array_length(_ships);
 bomb_a = calculate_fleet_bombard_score(_ships);
 var _total_fleet_loaded = calculate_fleet_content_size(_ships);

objects/obj_drop_select/Create_0.gml

@@ -155,6 +155,7 @@ btn_back.button_color = CM_GREEN_COLOR;
 btn_back.width = 90;
 
 if (purge == 0) {
+    var _p_data = p_target.get_planet_data(planet_number);
     sisters = p_target.p_sisters[planet_number];
     eldar = p_target.p_eldar[planet_number];
     ork = p_target.p_orks[planet_number];
@@ -211,11 +212,11 @@ if (purge == 0) {
     }
 
     var spesh = false;
-    if ((planet_feature_bool(p_target.p_feature[planet_number], eP_FEATURES.WARLORD10) == 1) && (obj_controller.faction_defeated[10] == 0) && (obj_controller.faction_gender[10] == 1) && (obj_controller.known[eFACTION.CHAOS] > 0) && (obj_controller.turn >= obj_controller.chaos_turn)) {
+    if ((_p_data.has_feature(eP_FEATURES.WARLORD10)) && (obj_controller.faction_defeated[10] == 0) && (obj_controller.faction_gender[10] == 1) && (obj_controller.known[eFACTION.CHAOS] > 0) && (obj_controller.turn >= obj_controller.chaos_turn)) {
         spesh = true;
     }
 
-    if (has_problem_planet(planet_number, "tyranid_org", p_target)) {
+    if (_p_data.has_problem("inquisition_tyranid_org")) {
         tyranids = 2;
         attacking = 9;
     }

objects/obj_en_fleet/Alarm_1.gml

@@ -1,6 +1,4 @@
 try {
-    var orb = orbiting;
-
     if ((round(owner) != eFACTION.IMPERIUM) && (navy == 1)) {
         owner = 0;
     }
@@ -205,15 +203,6 @@ try {
             }
         }
 
-        if (owner == eFACTION.TAU) {
-            if (instance_exists(obj_p_fleet) && (obj_controller.known[eFACTION.TAU] == 0)) {
-                var p_ship = instance_nearest(x, y, obj_p_fleet);
-                if ((p_ship.action == "") && (point_distance(x, y, p_ship.x, p_ship.y) <= 80)) {
-                    obj_controller.known[eFACTION.TAU] = 1;
-                }
-            }
-        }
-
         if (owner == eFACTION.TYRANIDS) {
             // Juggle bio-resources
             if (capital_number * 2 > frigate_number) {

objects/obj_en_fleet/Create_0.gml

@@ -81,9 +81,9 @@ escort_health = 100;
 
 /// Called from save function to take all object variables and convert them to a json savable format and return it
 serialize = function() {
-    var object_fleet = self;
+    var _object_fleet = self;
 
-    var save_data = {
+    var _save_data = {
         obj: object_get_name(object_index),
         x,
         y,
@@ -98,34 +98,34 @@ serialize = function() {
         "in_view",
     ];
 
-    copy_serializable_fields(object_fleet, save_data, excluded_from_save);
+    copy_serializable_fields(_object_fleet, _save_data, excluded_from_save);
 
-    return save_data;
+    return _save_data;
 };
-deserialize = function(save_data) {
+deserialize = function(_save_data) {
     var exclusions = [
         "id",
         "cargo_data",
         "orbiting",
     ]; // skip automatic setting of certain vars, handle explicitly later
 
     // Automatic var setting
-    var all_names = struct_get_names(save_data);
-    var _len = array_length(all_names);
+    var _all_names = struct_get_names(_save_data);
+    var _len = array_length(_all_names);
     for (var i = 0; i < _len; i++) {
-        var var_name = all_names[i];
-        if (array_contains(exclusions, var_name)) {
+        var _var_name = _all_names[i];
+        if (array_contains(exclusions, _var_name)) {
             continue;
         }
-        var loaded_value = struct_get(save_data, var_name);
+        var _loaded_value = struct_get(_save_data, _var_name);
         try {
-            variable_instance_set(self, var_name, loaded_value);
+            variable_instance_set(self, _var_name, _loaded_value);
         } catch (e) {
             LOGGER.exception("Deserialization failed", e);
         }
     }
-    if (struct_exists(save_data, "cargo_data")) {
-        variable_instance_set(self, "cargo_data", save_data.cargo_data);
+    if (struct_exists(_save_data, "cargo_data")) {
+        variable_instance_set(self, "cargo_data", _save_data.cargo_data);
         if (fleet_has_cargo("ork_warboss")) {
             var _boss = new NewPlanetFeature(eP_FEATURES.ORKWARBOSS);
             _boss.load_json_data(cargo_data.ork_warboss);

objects/obj_en_fleet/Step_0.gml

@@ -67,15 +67,9 @@ if (ii_check == 0) {
     }
 }
 
-if (owner == eFACTION.TYRANIDS) {
+if (owner == eFACTION.TYRANIDS && orbiting != noone) {
     image_alpha = 0;
-    if (instance_exists(obj_p_fleet)) {
-        var bundy = instance_nearest(x, y, obj_p_fleet);
-        if ((bundy.action == "") && (self.action == "") && (point_distance(bundy.x, bundy.y, x, y) < 90) && (bundy.x > x) && (bundy.y < y)) {
-            image_alpha = 1;
-        }
-    }
-    if ((instance_nearest(x, y - 32, obj_star).vision == 1) && (action == "")) {
+    if (orbiting.has_orbiting_player_fleet() || orbiting.vision == 1){
         image_alpha = 1;
     }
 }
@@ -146,30 +140,7 @@ if ((owner == eFACTION.TYRANIDS) && (trade_goods == "")) {
 }
 
 if (global.load >= 0) {
-    if (owner == eFACTION.IMPERIUM) {
-        sprite_index = spr_fleet_imperial;
-    }
-    if (owner == eFACTION.MECHANICUS) {
-        sprite_index = spr_fleet_mechanicus;
-    }
-    if (owner == eFACTION.INQUISITION) {
-        sprite_index = spr_fleet_inquisition;
-    }
-    if (owner == eFACTION.ELDAR) {
-        sprite_index = spr_fleet_eldar;
-    }
-    if (owner == eFACTION.ORK) {
-        sprite_index = spr_fleet_ork;
-    }
-    if (owner == eFACTION.TAU) {
-        sprite_index = spr_fleet_tau;
-    }
-    if (owner == eFACTION.TYRANIDS) {
-        sprite_index = spr_fleet_tyranid;
-    }
-    if (owner == eFACTION.CHAOS) {
-        sprite_index = spr_fleet_chaos;
-    }
+    choose_fleet_sprite_image();
 }
 if (image_index == 0) {
     image_index = 1;

objects/obj_enunit/Create_0.gml

@@ -9,7 +9,7 @@ hostile_splash = 0;
 flank = 0;
 flyer = 0; // Works same as flank, but does not get denoted as such
 neww = 0;
-
+enemy_dudes = 0;
 column_size = 0;
 
 unit_count = 0;
@@ -75,6 +75,26 @@ dudes_wep2 = array_create(_array_size, "");
 dudes_gear = array_create(_array_size, "");
 dudges_mobi = array_create(_array_size, "");
 
+add_enemies = function(enemy_data){
+    var _start_index =  1;
+    for (var i = 1; i < _array_size; i++)
+        if (dudes[i] == ""){
+            _start_index = i;
+        }
+    {
+
+    }
+    for (var i = 0; i < array_length(enemy_data); i++){
+        var _data = enemy_data[i];
+        dudes[_start_index] = _data.name;
+        dudes_num[_start_index] = _data.number;
+        if (struct_exists(_data, "special")){
+            dudes_special[_start_index] = _data.special;
+        }
+        _start_index++;
+        enemy_dudes += _data.number;
+    }
+}
 alarm[1] = 5;
 
 hit = function() {

objects/obj_fleet_select/Create_0.gml

@@ -76,7 +76,7 @@ selection_window.inside_method = function() {
 
         var math_string = (string_width("Manage Units") / 2) + 6;
         if (point_and_click(draw_unit_buttons([center_draw - math_string, yy + height - 50], "Manage Units", [1, 1], c_blue))) {
-            var _fleet_array = fleet_full_ship_array(current_fleet);
+            var _fleet_array = current_fleet.full_ship_array();
             var _fleet_marines = collect_role_group("all", ["", 0, _fleet_array]);
 
             group_selection(_fleet_marines, {purpose: "Ship Management", purpose_code: "manage", number: 0, system: 0, ships: _fleet_array, feature: "none", planet: 0, selections: []});

objects/obj_ini/Create_0.gml

@@ -241,21 +241,21 @@ deserialize = function(save_data) {
     ]; // skip automatic setting of certain vars, handle explicitly later
 
     // Automatic var setting
-    var all_names = struct_get_names(save_data);
+    var _all_names = struct_get_names(save_data);
 
-    if (!array_contains(all_names, "chapter_squad_arrangement")) {
+    if (!array_contains(_all_names, "chapter_squad_arrangement")) {
         chapter_squad_arrangement = json_to_gamemaker(working_directory + $"main/squads/company_squad_builds.json", json_parse);
     }
 
-    for (var i = 0; i < array_length(all_names); i++) {
-        var var_name = all_names[i];
-        if (array_contains(exclusions, var_name)) {
+    for (var i = 0; i < array_length(_all_names); i++) {
+        var _var_name = _all_names[i];
+        if (array_contains(exclusions, _var_name)) {
             continue;
         }
 
-        var loaded_value = struct_get(save_data, var_name);
+        var loaded_value = struct_get(save_data, _var_name);
         try {
-            variable_instance_set(id, var_name, loaded_value);
+            variable_instance_set(id, _var_name, loaded_value);
         } catch (e) {
             LOGGER.exception("Deserialization failed", e);
         }