fix: post array removal equipment and role issues

objects/obj_creation_popup/Create_0.gml

@@ -1,4 +1,3 @@
-type = 0;
 target_gear = -1;
 tab = 1;
 badname = 0;
@@ -15,6 +14,7 @@ tooltip = "";
 tooltip2 = "";
 item_name = [];
 role_names_all = "";
+warning = "";
 
 type_names = {
     "1": "Primary Color",
@@ -114,10 +114,110 @@ possible_custom_roles = [
     ],
 ];
 
-slot_arrays = [
-    "wep1", // eEQUIPMENT_SLOT.WEAPON_ONE
-    "wep2", // eEQUIPMENT_SLOT.WEAPON_TWO
-    "armour", // eEQUIPMENT_SLOT.ARMOUR
-    "gear", // eEQUIPMENT_SLOT.GEAR
-    "mobi", // eEQUIPMENT_SLOT.MOBILITY
-];
+
+if (type == ePOPUP_TYPE.LIVERYPICK){
+    assign_picked_liveries = function(){
+        var _colour_area_chosen = colour_area != "";
+        draw_set_font(fnt_40k_30b);
+        var _type_key = string(target_role);
+        var _colour_type = struct_exists(type_names, _type_key) ? type_names[$ _type_key] : "";
+
+        picker.title = _colour_type;
+
+        var _action = picker.draw();
+        if (_action == "destroy") {
+            instance_destroy();
+            exit;
+        } else {
+            var _col = picker.chosen;
+            if (start_colour == -1) {
+                if (!_colour_area_chosen && target_role >= 1 && target_role <= 7) {
+                    start_colour = variable_instance_get(obj_creation, type_fields[target_role]);
+                } else if (_colour_area_chosen) {
+                    var role_data = obj_creation.complex_livery_data[$ target_role];
+                    if (is_struct(role_data) && struct_exists(role_data, colour_area)) {
+                        start_colour = role_data[$ colour_area];
+                    }
+                }
+            }
+
+            if (is_array(_col)) {
+                if (_colour_area_chosen) {
+                    obj_creation.complex_livery_data[$ target_role][$ colour_area] = _col;
+                }
+            } else {
+                if (_col == -1) {
+                    _col = start_colour;
+                }
+
+                if (!_colour_area_chosen && target_role >= 1 && target_role <= 7) {
+                    variable_instance_set(obj_creation, type_fields[target_role], _col);
+                }
+
+                with (obj_creation) {
+                    bulk_selection_buttons_setup();
+                }
+
+                if (_colour_area_chosen) {
+                    obj_creation.complex_livery_data[$ target_role][$ colour_area] = _col;
+                    with (obj_creation) {
+                        set_complex_livery_buttons();
+                    }
+                }
+            }
+        }
+
+    }
+} else if (type == ePOPUP_TYPE.EQUIP) {
+    role_name_input = new TextBarArea(800, 170, 380, true);
+
+    var _blocked_names = [
+        "Chapter Master",
+        "Master of Sanctity",
+        "Master of the Apothecarion",
+        "Forge Master",
+    ];
+
+    editing_role_data = obj_creation.player_role_data[target_role];
+
+    for (var i = 0; i < array_length(obj_creation.player_role_data); i++){
+        if (i == target_role){
+            continue;
+        }
+        var _role_name = obj_creation.player_role_data[i].role;
+        if (_role_name != ""){
+            array_push(_blocked_names, string_lower(_role_name));
+        }
+    }
+
+    var _dread_role = target_role == eROLE.DREADNOUGHT;
+
+    set_new_role_data = function(){
+        for (var i = 0; i < STANDARD_EQUIP_SLOT_COUNT; i++) {
+            if (needed_equipment[i] == ITEM_NAME_NONE) {
+                needed_equipment[i] = "";
+            }
+        }
+        var _new_data = convert_equipment_array_into_struct(needed_equipment);
+        with (editing_role_data){
+            move_data_to_current_scope(_new_data);
+        }
+        instance_destroy();
+    }
+    role_name_input.blocked_values = _blocked_names;
+    unchangeable_armour = _dread_role;
+    setup_UI_elements_equipment_selector(500, 200);
+    unit_count = 0;
+    company =  -1;
+    equipment_found_and_valid = array_create(5, true);
+    current_equipment = variable_clone(convert_equipment_struct_into_array(editing_role_data));
+    needed_equipment = variable_clone(convert_equipment_struct_into_array(editing_role_data));
+    equipment_recipient_type = !_dread_role ? eEQUIP_TARGET_TYPE.MARINE : eEQUIP_TARGET_TYPE.DREADNOUGHT;
+    equip_button.bind_method = set_new_role_data;
+    equip_button.bind_scope = self;
+    master_crafted = false;
+    allow_quality_change = false;
+    from_inventory = false;
+    before_after_styling = false;
+}
+