2024-11-03 16:35:55

src/gfx/interface/equipmentdesigner/graphic_db/00_generic_icons.txt

@@ -9,50 +9,50 @@ default = {
     vnr_ship_hull_light_2 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_light_2_medium
                 GFX_vnr_ship_hull_light_1_medium
+				GFX_vnr_ship_hull_light_2_medium
             }
         }
     }
     vnr_ship_hull_light_3 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_light_3_medium
-                GFX_vnr_ship_hull_light_2_medium
                 GFX_vnr_ship_hull_light_1_medium
+                GFX_vnr_ship_hull_light_2_medium
+                GFX_vnr_ship_hull_light_3_medium
             }
         }
     }
     vnr_ship_hull_light_4 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_light_4_medium
-                GFX_vnr_ship_hull_light_3_medium
-                GFX_vnr_ship_hull_light_2_medium
                 GFX_vnr_ship_hull_light_1_medium
+                GFX_vnr_ship_hull_light_2_medium
+                GFX_vnr_ship_hull_light_3_medium
+                GFX_vnr_ship_hull_light_4_medium
             }
         }
     }
     vnr_ship_hull_light_5 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_light_5_medium
-                GFX_vnr_ship_hull_light_4_medium
-                GFX_vnr_ship_hull_light_3_medium
-                GFX_vnr_ship_hull_light_2_medium
                 GFX_vnr_ship_hull_light_1_medium
+                GFX_vnr_ship_hull_light_2_medium
+                GFX_vnr_ship_hull_light_3_medium
+                GFX_vnr_ship_hull_light_4_medium
+                GFX_vnr_ship_hull_light_5_medium
             }
         }
     }
     vnr_ship_hull_light_6 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_light_6_medium
-                GFX_vnr_ship_hull_light_5_medium
-                GFX_vnr_ship_hull_light_4_medium
-                GFX_vnr_ship_hull_light_3_medium
-                GFX_vnr_ship_hull_light_2_medium
                 GFX_vnr_ship_hull_light_1_medium
+                GFX_vnr_ship_hull_light_2_medium
+                GFX_vnr_ship_hull_light_3_medium
+                GFX_vnr_ship_hull_light_4_medium
+                GFX_vnr_ship_hull_light_5_medium
+                GFX_vnr_ship_hull_light_6_medium
             }
         }
     }
@@ -67,90 +67,90 @@ default = {
     vnr_ship_hull_cruiser_2 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_2_medium
-                GFX_vnr_ship_hull_cruiser_2_capital_medium
-                GFX_vnr_ship_hull_cruiser_1_medium
                 GFX_vnr_ship_hull_cruiser_1_capital_medium
+				GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
+				GFX_vnr_ship_hull_cruiser_2_medium
             }
         }
     }
     vnr_ship_hull_cruiser_3 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_3_medium
-                GFX_vnr_ship_hull_cruiser_3_capital_medium
-                GFX_vnr_ship_hull_cruiser_2_medium
-                GFX_vnr_ship_hull_cruiser_2_capital_medium
-                GFX_vnr_ship_hull_cruiser_1_medium
                 GFX_vnr_ship_hull_cruiser_1_capital_medium
+				GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
+				GFX_vnr_ship_hull_cruiser_2_medium
+				GFX_vnr_ship_hull_cruiser_3_capital_medium
+				GFX_vnr_ship_hull_cruiser_3_medium
             }
         }
     }
     vnr_ship_hull_cruiser_4 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_4_medium
-                GFX_vnr_ship_hull_cruiser_4_capital_medium
-                GFX_vnr_ship_hull_cruiser_3_medium
-                GFX_vnr_ship_hull_cruiser_3_capital_medium
-                GFX_vnr_ship_hull_cruiser_2_medium
-                GFX_vnr_ship_hull_cruiser_2_capital_medium
-                GFX_vnr_ship_hull_cruiser_1_medium
                 GFX_vnr_ship_hull_cruiser_1_capital_medium
+				GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
+				GFX_vnr_ship_hull_cruiser_2_medium
+				GFX_vnr_ship_hull_cruiser_3_capital_medium
+				GFX_vnr_ship_hull_cruiser_3_medium
+				GFX_vnr_ship_hull_cruiser_4_capital_medium
+				GFX_vnr_ship_hull_cruiser_4_medium
             }
         }
     }
     vnr_ship_hull_cruiser_5 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_5_medium
-                GFX_vnr_ship_hull_cruiser_5_capital_medium
-                GFX_vnr_ship_hull_cruiser_4_medium
-                GFX_vnr_ship_hull_cruiser_4_capital_medium
-                GFX_vnr_ship_hull_cruiser_3_medium
-                GFX_vnr_ship_hull_cruiser_3_capital_medium
-                GFX_vnr_ship_hull_cruiser_2_medium
-                GFX_vnr_ship_hull_cruiser_2_capital_medium
-                GFX_vnr_ship_hull_cruiser_1_medium
                 GFX_vnr_ship_hull_cruiser_1_capital_medium
+				GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
+				GFX_vnr_ship_hull_cruiser_2_medium
+				GFX_vnr_ship_hull_cruiser_3_capital_medium
+				GFX_vnr_ship_hull_cruiser_3_medium
+				GFX_vnr_ship_hull_cruiser_4_capital_medium
+				GFX_vnr_ship_hull_cruiser_4_medium
+				GFX_vnr_ship_hull_cruiser_5_capital_medium
+				GFX_vnr_ship_hull_cruiser_5_medium
             }
         }
     }
     vnr_ship_hull_cruiser_6 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_6_medium
-                GFX_vnr_ship_hull_cruiser_6_capital_medium
-                GFX_vnr_ship_hull_cruiser_5_medium
-                GFX_vnr_ship_hull_cruiser_5_capital_medium
-                GFX_vnr_ship_hull_cruiser_4_medium
-                GFX_vnr_ship_hull_cruiser_4_capital_medium
-                GFX_vnr_ship_hull_cruiser_3_medium
-                GFX_vnr_ship_hull_cruiser_3_capital_medium
-                GFX_vnr_ship_hull_cruiser_2_medium
-                GFX_vnr_ship_hull_cruiser_2_capital_medium
-                GFX_vnr_ship_hull_cruiser_1_medium
                 GFX_vnr_ship_hull_cruiser_1_capital_medium
+				GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
+				GFX_vnr_ship_hull_cruiser_2_medium
+				GFX_vnr_ship_hull_cruiser_3_capital_medium
+				GFX_vnr_ship_hull_cruiser_3_medium
+				GFX_vnr_ship_hull_cruiser_4_capital_medium
+				GFX_vnr_ship_hull_cruiser_4_medium
+				GFX_vnr_ship_hull_cruiser_5_capital_medium
+				GFX_vnr_ship_hull_cruiser_5_medium
+                GFX_vnr_ship_hull_cruiser_6_capital_medium
+				GFX_vnr_ship_hull_cruiser_6_medium
             }
         }
     }
     vnr_ship_hull_cruiser_coastal_defense_ship = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_coastal_defense_ship_medium
                 GFX_vnr_ship_hull_cruiser_1_medium
                 GFX_vnr_ship_hull_cruiser_1_capital_medium
+				GFX_vnr_ship_hull_cruiser_coastal_defense_ship_medium
             }
         }
     }
     vnr_ship_hull_cruiser_panzerschiff = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_panzerschiff_medium
-                GFX_vnr_ship_hull_cruiser_2_medium
-                GFX_vnr_ship_hull_cruiser_2_capital_medium
                 GFX_vnr_ship_hull_cruiser_1_medium
                 GFX_vnr_ship_hull_cruiser_1_capital_medium
+				GFX_vnr_ship_hull_cruiser_2_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
+				GFX_vnr_ship_hull_cruiser_panzerschiff_medium
             }
         }
     }
@@ -178,46 +178,46 @@ default = {
     vnr_ship_hull_heavy_2 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_heavy_2_medium
                 GFX_vnr_ship_hull_heavy_1_medium
+				GFX_vnr_ship_hull_heavy_2_medium
             }
         }
     }
     vnr_ship_hull_heavy_3 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_heavy_3_medium
-                GFX_vnr_ship_hull_heavy_2_medium
                 GFX_vnr_ship_hull_heavy_1_medium
+				GFX_vnr_ship_hull_heavy_2_medium
+				GFX_vnr_ship_hull_heavy_3_medium
             }
         }
     }
     vnr_ship_hull_heavy_4 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_heavy_4_medium
-                GFX_vnr_ship_hull_heavy_3_medium
-                GFX_vnr_ship_hull_heavy_2_medium
                 GFX_vnr_ship_hull_heavy_1_medium
+				GFX_vnr_ship_hull_heavy_2_medium
+				GFX_vnr_ship_hull_heavy_3_medium
+				GFX_vnr_ship_hull_heavy_4_medium
             }
         }
     }
     vnr_ship_hull_heavy_5 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_heavy_5_medium
-                GFX_vnr_ship_hull_heavy_4_medium
-                GFX_vnr_ship_hull_heavy_3_medium
-                GFX_vnr_ship_hull_heavy_2_medium
                 GFX_vnr_ship_hull_heavy_1_medium
+				GFX_vnr_ship_hull_heavy_2_medium
+				GFX_vnr_ship_hull_heavy_3_medium
+				GFX_vnr_ship_hull_heavy_4_medium
+				GFX_vnr_ship_hull_heavy_5_medium
             }
         }
     }
     vnr_ship_hull_carrier_conversion_ca = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_carrier_conversion_ca_medium
                 GFX_vnr_ship_hull_carrier_conversion_bb_medium
+				GFX_vnr_ship_hull_carrier_conversion_ca_medium
             }
         }
     }
@@ -232,50 +232,60 @@ default = {
     vnr_ship_hull_carrier_1 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_carrier_1_medium
                 GFX_vnr_ship_hull_carrier_conversion_ca_medium
                 GFX_vnr_ship_hull_carrier_conversion_bb_medium
+				GFX_vnr_ship_hull_carrier_1_medium
             }
         }
     }
     vnr_ship_hull_carrier_2 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_carrier_2_medium
-                GFX_vnr_ship_hull_carrier_1_medium
                 GFX_vnr_ship_hull_carrier_conversion_ca_medium
                 GFX_vnr_ship_hull_carrier_conversion_bb_medium
+				GFX_vnr_ship_hull_carrier_1_medium
+				GFX_vnr_ship_hull_carrier_2_medium
             }
         }
     }
     vnr_ship_hull_carrier_3 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_carrier_3_medium
-                GFX_vnr_ship_hull_carrier_2_medium
-                GFX_vnr_ship_hull_carrier_1_medium
                 GFX_vnr_ship_hull_carrier_conversion_ca_medium
                 GFX_vnr_ship_hull_carrier_conversion_bb_medium
+				GFX_vnr_ship_hull_carrier_1_medium
+				GFX_vnr_ship_hull_carrier_2_medium
+				GFX_vnr_ship_hull_carrier_3_medium
             }
         }
     }
     vnr_ship_hull_escort_carrier = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_escort_carrier_medium
+				GFX_vnr_ship_hull_merchant_carrier_medium
                 GFX_vnr_ship_hull_carrier_conversion_ca_medium
+				GFX_vnr_ship_hull_escort_carrier_medium
+            }
+        }
+    }
+	vnr_ship_hull_merchant_carrier = {
+        pool = {
+            icons = {
+				GFX_vnr_ship_hull_escort_carrier_medium
+                GFX_vnr_ship_hull_carrier_conversion_ca_medium
+				GFX_vnr_ship_hull_merchant_carrier_medium
             }
         }
     }
     vnr_ship_hull_super_carrier = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_super_carrier_medium
-                GFX_vnr_ship_hull_carrier_3_medium
-                GFX_vnr_ship_hull_carrier_2_medium
-                GFX_vnr_ship_hull_carrier_1_medium
                 GFX_vnr_ship_hull_carrier_conversion_ca_medium
                 GFX_vnr_ship_hull_carrier_conversion_bb_medium
+				GFX_vnr_ship_hull_carrier_1_medium
+				GFX_vnr_ship_hull_carrier_2_medium
+				GFX_vnr_ship_hull_carrier_3_medium
+				GFX_vnr_ship_hull_super_carrier_medium
             }
         }
     }
@@ -289,10 +299,10 @@ default = {
     vnr_ship_hull_cruiser_submarine = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_submarine_medium
                 GFX_vnr_ship_hull_submarine_1_medium
                 GFX_vnr_ship_hull_submarine_2_medium
                 GFX_vnr_ship_hull_submarine_3_medium
+				GFX_vnr_ship_hull_cruiser_submarine_medium
             }
         }
     }
@@ -306,38 +316,38 @@ default = {
     vnr_ship_hull_submarine_2 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_submarine_2_medium
                 GFX_vnr_ship_hull_submarine_1_medium
+				GFX_vnr_ship_hull_submarine_2_medium
             }
         }
     }
     vnr_ship_hull_submarine_3 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_submarine_3_medium
-                GFX_vnr_ship_hull_submarine_2_medium
                 GFX_vnr_ship_hull_submarine_1_medium
+				GFX_vnr_ship_hull_submarine_2_medium
+				GFX_vnr_ship_hull_submarine_3_medium
             }
         }
     }
     vnr_ship_hull_submarine_4 = {
         pool = {
             icons = {
+				GFX_vnr_ship_hull_submarine_1_medium
+				GFX_vnr_ship_hull_submarine_2_medium
+				GFX_vnr_ship_hull_submarine_3_medium
                 GFX_vnr_ship_hull_submarine_4_medium
-                GFX_vnr_ship_hull_submarine_3_medium
-                GFX_vnr_ship_hull_submarine_2_medium
-                GFX_vnr_ship_hull_submarine_1_medium
             }
         }
     }
     vnr_ship_hull_submarine_5 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_submarine_5_medium
+				GFX_vnr_ship_hull_submarine_1_medium
+				GFX_vnr_ship_hull_submarine_2_medium
+				GFX_vnr_ship_hull_submarine_3_medium
                 GFX_vnr_ship_hull_submarine_4_medium
-                GFX_vnr_ship_hull_submarine_3_medium
-                GFX_vnr_ship_hull_submarine_2_medium
-                GFX_vnr_ship_hull_submarine_1_medium
+                GFX_vnr_ship_hull_submarine_5_medium
             }
         }
     }
@@ -351,18 +361,18 @@ default = {
     vnr_ship_hull_civilian_2 = {
         pool = {
             icons = {
-                GFX_vnr_ship_hull_civilian_2_medium
-                GFX_vnr_ship_hull_civilian_3_medium
                 GFX_vnr_ship_hull_civilian_1_medium
+                GFX_vnr_ship_hull_civilian_3_medium
+				GFX_vnr_ship_hull_civilian_2_medium
             }
         }
     }
     vnr_ship_hull_civilian_3 = {
         pool = {
             icons = {
+				GFX_vnr_ship_hull_civilian_1_medium
+				GFX_vnr_ship_hull_civilian_2_medium
                 GFX_vnr_ship_hull_civilian_3_medium
-                GFX_vnr_ship_hull_civilian_2_medium
-                GFX_vnr_ship_hull_civilian_1_medium
             }
         }
     }

src/gfx/interface/equipmentdesigner/graphic_db/00_ship_icons.txt

@@ -8612,6 +8612,16 @@ USA = {
 
     }
 
+    vnr_ship_hull_cruiser_coastal_defense_ship = {
+        pool = {
+            weight = 5
+            icons = {
+                GFX_USA_vnr_ship_hull_cruiser_coastal_defense_ship_medium
+            }
+        }
+
+    }
+
     vnr_ship_hull_cruiser_panzerschiff = {
         pool = {
             weight = 5