diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml
index 552f06eef..d76da309d 100644
--- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml
+++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml
@@ -200,14 +200,14 @@ function scr_fleet_advisor(){
 
                         cn.temp[109] = string(obj_ini.ship_turrets[i]);
 
-                        cn.temp[110] = obj_ini.ship_wep[i][1];
-                        cn.temp[111] = obj_ini.ship_wep_facing[i][1];
-                        cn.temp[112] = obj_ini.ship_wep[i][2];
-                        cn.temp[113] = obj_ini.ship_wep_facing[i][2];
-                        cn.temp[114] = obj_ini.ship_wep[i][3];
-                        cn.temp[115] = obj_ini.ship_wep_facing[i][3];
-                        cn.temp[116] = obj_ini.ship_wep[i][4];
-                        cn.temp[117] = obj_ini.ship_wep_facing[i][4];
+                        var facing_length = array_length(obj_ini.ship_wep_facing[i]);
+                        var wep_length = array_length(obj_ini.ship_wep[i]);
+                        var max_weapons = min(facing_length, wep_length, 5);
+
+                        for (var s = 1; s < max_weapons; s++) {
+                            cn.temp[110+((s-1)*2)] = obj_ini.ship_wep[i][s];
+                            cn.temp[110+((s-1)*2)+1] = obj_ini.ship_wep_facing[i][s];
+                        }
 
                         cn.temp[118] = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}";
                         cn.temp[119] = "";