fix: alignment on unit stats and make drawing OOP (#982)

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

Author: OH296

objects/obj_controller/Create_0.gml

@@ -1220,7 +1220,7 @@ serialize = function(){
 
     }
     var excluded_from_save = ["temp", "serialize", "deserialize", "build_chaos_gods", "company_data","menu_buttons",
-            "location_viewer", "production_research_pathways", "specialist_point_handler", "spec_train_data"]
+            "location_viewer", "production_research_pathways", "specialist_point_handler", "spec_train_data", "tooltips", "last_unit", "unit_manage_constants"],
     var excluded_from_save_start = ["restart_"];
 
     copy_serializable_fields(object_controller, save_data, excluded_from_save, excluded_from_save_start);

objects/obj_controller/Step_0.gml

@@ -438,260 +438,14 @@ try {
             yy += 77;
         }
         if (is_struct(unit_focus)) {
-            var ach = 0,
-                damage_res = 1,
-                armour_value = 0;
+
             // Checks if the marine is not hidden
             var unit = unit_focus;
             if (!is_array(last_unit)) {
                 last_unit = [0, 0];
             }
             if ((unit.base_group != "none") && (last_unit[1] != unit.marine_number || last_unit[0] != unit.company)) {
-                last_unit = [unit.company, unit.marine_number];
-                marine_armour[0] = unit.armour();
-                fix_right = 0;
-                equip_data = unit.unit_equipment_data();
-                temp[100] = "1";
-                if (unit.race() != 1) {
-                    temp[100] = unit.race();
-                }
-
-                damage_res = unit.damage_resistance();
-
-                if (is_struct(equip_data.armour_data)) {
-                    temp[103] = equip_data.armour_data.item_tooltip_desc_gen();
-                } else {
-                    temp[103] = "";
-                }
-                // Sets up the description for the equipement of current marine
-                //temp[103]="";
-                // Gear
-                temp[104] = unit.gear();
-                if (is_struct(equip_data.gear_data)) {
-                    temp[105] = equip_data.gear_data.item_tooltip_desc_gen();
-                } else {
-                    temp[105] = "";
-                }
-                //if (string_count("&",temp[104])>0) then temp[104]=clean_tags(temp[104]);
-                // Mobility Item
-                temp[106] = unit.mobility_item();
-                if (is_struct(equip_data.mobility_data)) {
-                    temp[107] = equip_data.mobility_data.item_tooltip_desc_gen();
-                } else {
-                    temp[107] = "";
-                }
-                temp[108] = unit.weapon_one();
-                if (is_struct(equip_data.weapon_one_data)) {
-                    temp[109] = equip_data.weapon_one_data.item_tooltip_desc_gen();
-                } else {
-                    temp[109] = "";
-                }
-                temp[110] = unit.weapon_two();
-                if (is_struct(equip_data.weapon_two_data)) {
-                    temp[111] = equip_data.weapon_two_data.item_tooltip_desc_gen();
-                } else {
-                    temp[111] = "";
-                }
-                //if (string_count("&",temp[106])>0) then temp[106]=clean_tags(temp[106]);
-                // Experience
-                temp[113] = string(floor(unit.experience));
-                // Psyker things
-                temp[119] = "";
-                temp[123] = "";
-                var _psy_powers_known = unit.powers_known;
-                var _psy_powers_count = array_length(_psy_powers_known);
-                if (_psy_powers_count > 0) {
-                    var _psy_discipline = unit.psy_discipline();
-                    var _psy_discipline_name = get_discipline_data(_psy_discipline, "name");
-                    temp[119] = $"{unit.psionic}/{_psy_powers_count}";
-
-                    var _tooltip = "";
-                    _tooltip += $"Psychic Rating: {unit.psionic}";
-
-                    var _equipment_psychic_amplification = unit.gear_special_value("psychic_amplification");
-                    var _character_psychic_amplification = unit.psychic_amplification() * 100;
-                    var _equipment_psychic_focus = unit.gear_special_value("psychic_focus");
-                    var _character_psychic_focus = unit.psychic_focus();
-                    var _perils_chance = unit.perils_threshold() / 10;
-                    _tooltip += $"\nAmplification from Equipment: {_equipment_psychic_amplification}%";
-                    _tooltip += $"\nAmplification from Attributes (Psy Rating and EXP): {_character_psychic_amplification}%";
-
-                    _tooltip += $"\n\nFocus Success Chance: {100 - unit.psychic_focus_difficulty()}%";
-                    _tooltip += $"\nFocus from Equipment: {_equipment_psychic_focus}%";
-                    _tooltip += $"\nFocus from Attributes (WIS and EXP): {_character_psychic_focus}%";
-
-                    _tooltip += $"\n\nPerils of the Warp Chance: {_perils_chance}%";
-
-                    _tooltip += $"\n\nMain Discipline: {_psy_discipline_name}";
-                    _tooltip += $"\nKnown Powers: ";
-                    for (var i = 0; i < _psy_powers_count; i++) {
-                        _tooltip += get_power_data(_psy_powers_known[i], "name");
-                        _tooltip += smart_delimeter_sign(_psy_powers_count, i, false);
-                    }
-                    temp[123] = _tooltip;
-                }
-                // Corruption
-                if ((obj_controller.chaos_rating > 0) && (temp[119] != "")) {
-                    temp[119] += "#" + string(max(0, unit.corruption())) + "% Corruption.";
-                }
-                if ((obj_controller.chaos_rating > 0) && (temp[119] == "")) {
-                    temp[119] = string(max(0, unit.corruption())) + "% Corruption.";
-                }
-                // Melee Attack
-                temp[116] = unit.melee_attack();
-                // Ranged Attack
-                temp[117] = unit.ranged_attack();
-                // Damage Resistance
-                temp[118] = string(damage_res) + "%";
-                temp[130] = "Health damage taken by the marine is reduced by this percentage. This happens after the flat reduction from armor.\n\nContributing factors:\n";
-                var equipment_types = ["armour", "weapon_one", "weapon_two", "mobility", "gear"];
-                for (var i = 0; i < array_length(equipment_types); i++) {
-                    var equipment_type = equipment_types[i];
-                    var dr = 0;
-                    var name = "";
-                    switch (equipment_type) {
-                        case "armour":
-                            dr = unit.get_armour_data("damage_resistance_mod");
-                            name = unit.get_armour_data("name");
-                            break;
-                        case "weapon_one":
-                            dr = unit.get_weapon_one_data("damage_resistance_mod");
-                            name = unit.get_weapon_one_data("name");
-                            break;
-                        case "weapon_two":
-                            dr = unit.get_weapon_two_data("damage_resistance_mod");
-                            name = unit.get_weapon_two_data("name");
-                            break;
-                        case "mobility":
-                            dr = unit.get_mobility_data("damage_resistance_mod");
-                            name = unit.get_mobility_data("name");
-                            break;
-                        case "gear":
-                            dr = unit.get_gear_data("damage_resistance_mod");
-                            name = unit.get_gear_data("name");
-                            break;
-                    }
-                    if (dr != 0) {
-                        temp[130] += $"{name}: {dr}%\n";
-                    }
-                }
-                temp[130] += string("CON: {0}%\nEXP: {1}%", round(unit.constitution / 2), round(unit.experience / 10));
-                if (is_struct(temp[121])) {
-                    try {
-                        temp[121].destroy_image();
-                    }
-                    delete temp[121];
-                }
-                temp[124] = $"{round(unit.hp())}/{round(unit.max_health())}"; // Health Tracker
-                temp[125] = $"A measure how much punishment the creature can take. Marines can go into the negatives and still survive, but they'll require a bionic to become fighting fit once more.\n\nContributing factors:\nCON: {round(100 * (1 + ((unit.constitution - 40) * 0.025)))}\n";
-                for (var i = 0; i < array_length(equipment_types); i++) {
-                    var equipment_type = equipment_types[i];
-                    var hp_mod = 0;
-                    var name = "";
-                    switch (equipment_type) {
-                        case "armour":
-                            hp_mod = unit.get_armour_data("hp_mod");
-                            name = unit.get_armour_data("name");
-                            break;
-                        case "weapon_one":
-                            hp_mod = unit.get_weapon_one_data("hp_mod");
-                            name = unit.get_weapon_one_data("name");
-                            break;
-                        case "weapon_two":
-                            hp_mod = unit.get_weapon_two_data("hp_mod");
-                            name = unit.get_weapon_two_data("name");
-                            break;
-                        case "mobility":
-                            hp_mod = unit.get_mobility_data("hp_mod");
-                            name = unit.get_mobility_data("name");
-                            break;
-                        case "gear":
-                            hp_mod = unit.get_gear_data("hp_mod");
-                            name = unit.get_gear_data("name");
-                            break;
-                    }
-                    if (hp_mod != 0) {
-                        temp[125] += $"{name}: {format_number_with_sign(hp_mod)}%\n";
-                    }
-                }
-                temp[126] = $"{unit.armour_calc()}"; // Armour Rating
-                temp[127] = "Reduces incoming damage at a flat rate. Certain enemies may attack in ways that may bypass your armor entirely, for example power weapons and some warp sorceries.\n\nContributing factors:\n";
-                for (var i = 0; i < array_length(equipment_types); i++) {
-                    var equipment_type = equipment_types[i];
-                    var ac = 0;
-                    var name = "";
-                    switch (equipment_type) {
-                        case "armour":
-                            ac = unit.get_armour_data("armour_value");
-                            name = unit.get_armour_data("name");
-                            break;
-                        case "weapon_one":
-                            ac = unit.get_weapon_one_data("armour_value");
-                            name = unit.get_weapon_one_data("name");
-                            break;
-                        case "weapon_two":
-                            ac = unit.get_weapon_two_data("armour_value");
-                            name = unit.get_weapon_two_data("name");
-                            break;
-                        case "mobility":
-                            ac = unit.get_mobility_data("armour_value");
-                            name = unit.get_mobility_data("name");
-                            break;
-                        case "gear":
-                            ac = unit.get_gear_data("armour_value");
-                            name = unit.get_gear_data("name");
-                            break;
-                    }
-                    if (ac != 0) {
-                        temp[127] += $"{name}: {ac}\n";
-                    }
-                }
-                if (obj_controller.stc_bonus[1] == 5 || obj_controller.stc_bonus[2] == 3) {
-                    temp[127] += $"STC Bonus: x1.05\n";
-                }
-                temp[128] = $"{unit.bionics}";
-                var _body_parts = ARR_body_parts;
-                var _body_parts_display = ARR_body_parts_display;
-                temp[129] = "Bionic Augmentation is something a unit can do to both enhance their capabilities, but also replace a missing limb to get back into the fight.";
-                temp[129] += "\nThere is a limit of 10 Bionic augmentations. After that the damage is so extensive that a marine requires a dreadnought to keep going.";
-                temp[129] += "\nFor everyone else? It's time for the emperor's mercy.";
-                temp[129] += "\n\nCurrent Bionic Augmentations:\n";
-                for (var part = 0; part < array_length(_body_parts); part++) {
-                    if (struct_exists(unit.body[$ _body_parts[part]], "bionic")) {
-                        var part_display = _body_parts_display[part];
-                        temp[129] += $"Bionic {part_display}";
-                        switch (part_display) {
-                            case "Left Leg":
-                            case "Right Leg":
-                                temp[129] += $" (CON: +2 STR: +1 DEX: -2)\n";
-                                break;
-                            case "Left Eye":
-                            case "Right Eye":
-                                temp[129] += $" (CON: +1 WIS: +1 DEX: +1)\n";
-                                break;
-                            case "Left Arm":
-                            case "Right Arm":
-                                temp[129] += $" (CON: +2 STR: +2 WS: -1)\n";
-                                break;
-                            case "Torso":
-                                temp[129] += $" (CON: +4 STR: +1 DEX: -1)\n";
-                                break;
-                            case "Throat":
-                                temp[129] += $" (CHA: -1)\n";
-                                break;
-                            case "Jaw":
-                            case "Head":
-                                temp[129] += $" (CON: +1)\n";
-                                break;
-                        }
-                    }
-                }
-                temp[121] = unit.draw_unit_image();
-
-                temp[122] = unit.handle_stat_growth();
-                /*if (man[sel]="vehicle"){
-                // TODO
-            }*/
+                reset_manage_unit_constants(unit);
             }
         }
     }

scripts/scr_buttons/scr_buttons.gml

@@ -24,6 +24,68 @@ function pop_draw_return_values(){
 		array_delete(global.draw_return_stack, _index, 1);
 	}	
 }
+//position, icon, text, text_max_width, tooltip, text_position, font = fnt_40k_14, colour = CM_GREEN_COLOR
+function LabeledIcon(icon, text,x1=0,y1=0,data = false) constructor{
+
+	self.x1 = x1;
+	self.y1 = y1;
+	x2 = 0;
+	y2 = 0;
+
+	self.text = text;
+	text_max_width = -1;
+	font = fnt_40k_14;
+	colour = CM_GREEN_COLOR;
+	text_position = "right";
+	tooltip = "";
+    self.icon   = sprite_exists(icon) ? icon : spr_none;
+    icon_width  = sprite_get_width(self.icon);
+    icon_height = sprite_get_height(self.icon);
+	w = icon_width;
+	h = icon_height;
+
+	move_data_to_current_scope(data);
+
+	static update = function(data = {}){
+		move_data_to_current_scope(data);
+		add_draw_return_values();
+		draw_set_font(font);
+		if (text_position == "right"){
+			w = x1 + icon_width + 2 + string_width(text);;
+			x2 = w;
+			h = icon_height;
+			y2 = y1 + icon_height;
+		}
+		pop_draw_return_values();
+	}
+
+	update();
+
+	static hit = function(){
+		return scr_hit(x1,y1,x2,y2);
+	}
+
+
+	static draw = function(){
+		add_draw_return_values();
+		draw_set_font(font);
+		draw_set_halign(fa_left);
+		draw_set_valign(fa_top);
+		draw_set_color(colour);
+		draw_sprite_stretched(icon, 0, x1,y1, icon_width, icon_height);
+		if (text_position == "right"){
+            var _string_x = x1 + icon_width + 2;
+            draw_text_outline(_string_x, y1 + 4, text);
+            if (tooltip!=""){
+				if (hit()){
+					tooltip_draw(tooltip);
+				}
+			}
+		};
+		pop_draw_return_values()
+	};
+	
+}
 
 function draw_sprite_as_button(position, choice_sprite, scale = [1,1], hover_sprite = -1){
 	var _pos = [position[0],position[1], position[0]+(sprite_get_width(choice_sprite)*scale[0]), position[1] + (sprite_get_height(choice_sprite)*scale[1])];