2024-10-03 16:35:54

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

@@ -1,32 +1,12 @@
 default = {
     vnr_ship_hull_light_1 = {
         pool = {
-			weight = 2
             icons = {
                 GFX_vnr_ship_hull_light_1_medium
             }
         }
     }
     vnr_ship_hull_light_2 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_light_2_medium
-			}
-		}
-        pool = {
-            icons = {
-                GFX_vnr_ship_hull_light_1_medium
-            }
-        }
-    }
-    vnr_ship_hull_light_3 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_light_3_medium
-			}
-		}
         pool = {
             icons = {
                 GFX_vnr_ship_hull_light_2_medium
@@ -34,13 +14,7 @@ default = {
             }
         }
     }
-    vnr_ship_hull_light_4 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_light_4_medium
-			}
-		}
+    vnr_ship_hull_light_3 = {
         pool = {
             icons = {
                 GFX_vnr_ship_hull_light_3_medium
@@ -49,13 +23,7 @@ default = {
             }
         }
     }
-    vnr_ship_hull_light_5 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_light_5_medium
-			}
-		}
+    vnr_ship_hull_light_4 = {
         pool = {
             icons = {
                 GFX_vnr_ship_hull_light_4_medium
@@ -65,13 +33,7 @@ default = {
             }
         }
     }
-    vnr_ship_hull_light_6 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_light_6_medium
-			}
-		}
+    vnr_ship_hull_light_5 = {
         pool = {
             icons = {
                 GFX_vnr_ship_hull_light_5_medium
@@ -82,137 +44,113 @@ default = {
             }
         }
     }
+    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
+            }
+        }
+    }
     vnr_ship_hull_cruiser_1 = {
         pool = {
-			weight = 2
             icons = {
-				GFX_vnr_ship_hull_cruiser_1_capital_medium
                 GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_1_capital_medium
             }
         }
     }
     vnr_ship_hull_cruiser_2 = {
-		pool = {
-			weight = 2
-            icons = {
-				GFX_vnr_ship_hull_cruiser_2_capital_medium
-                GFX_vnr_ship_hull_cruiser_2_medium
-            }
-        }
         pool = {
             icons = {
-				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_1_medium
+                GFX_vnr_ship_hull_cruiser_1_capital_medium
             }
         }
     }
     vnr_ship_hull_cruiser_3 = {
-		pool = {
-			weight = 2
-            icons = {
-				GFX_vnr_ship_hull_cruiser_3_capital_medium
-                GFX_vnr_ship_hull_cruiser_3_medium
-            }
-        }
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_2_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_1_capital_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
                 GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_1_capital_medium
             }
         }
     }
     vnr_ship_hull_cruiser_4 = {
-		pool = {
-			weight = 2
-            icons = {
-				GFX_vnr_ship_hull_cruiser_4_capital_medium
-                GFX_vnr_ship_hull_cruiser_4_medium
-            }
-        }
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_3_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_2_capital_medium
+                GFX_vnr_ship_hull_cruiser_3_capital_medium
                 GFX_vnr_ship_hull_cruiser_2_medium
-				GFX_vnr_ship_hull_cruiser_1_capital_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
                 GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_1_capital_medium
             }
         }
     }
     vnr_ship_hull_cruiser_5 = {
-		pool = {
-			weight = 2
-            icons = {
-				GFX_vnr_ship_hull_cruiser_5_capital_medium
-                GFX_vnr_ship_hull_cruiser_5_medium
-            }
-        }
         pool = {
             icons = {
-				GFX_vnr_ship_hull_cruiser_4_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_3_capital_medium
+                GFX_vnr_ship_hull_cruiser_4_capital_medium
                 GFX_vnr_ship_hull_cruiser_3_medium
-                GFX_vnr_ship_hull_cruiser_2_capital_medium
+                GFX_vnr_ship_hull_cruiser_3_capital_medium
                 GFX_vnr_ship_hull_cruiser_2_medium
-				GFX_vnr_ship_hull_cruiser_1_capital_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
                 GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_1_capital_medium
             }
         }
     }
     vnr_ship_hull_cruiser_6 = {
-		pool = {
-			weight = 2
-            icons = {
-				GFX_vnr_ship_hull_cruiser_6_capital_medium
-                GFX_vnr_ship_hull_cruiser_6_medium
-            }
-        }
         pool = {
             icons = {
-				GFX_vnr_ship_hull_cruiser_5_capital_medium
+                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_4_capital_medium
+                GFX_vnr_ship_hull_cruiser_5_capital_medium
                 GFX_vnr_ship_hull_cruiser_4_medium
-                GFX_vnr_ship_hull_cruiser_3_capital_medium
+                GFX_vnr_ship_hull_cruiser_4_capital_medium
                 GFX_vnr_ship_hull_cruiser_3_medium
-                GFX_vnr_ship_hull_cruiser_2_capital_medium
+                GFX_vnr_ship_hull_cruiser_3_capital_medium
                 GFX_vnr_ship_hull_cruiser_2_medium
-				GFX_vnr_ship_hull_cruiser_1_capital_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
                 GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_1_capital_medium
             }
         }
     }
     vnr_ship_hull_cruiser_coastal_defense_ship = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_cruiser_coastal_defense_ship_medium
-			}
-		}
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_1_capital_medium
+                GFX_vnr_ship_hull_cruiser_coastal_defense_ship_medium
                 GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_1_capital_medium
             }
         }
     }
     vnr_ship_hull_cruiser_panzerschiff = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_cruiser_panzerschiff_medium
-			}
-		}
         pool = {
             icons = {
-                GFX_vnr_ship_hull_cruiser_2_capital_medium
+                GFX_vnr_ship_hull_cruiser_panzerschiff_medium
                 GFX_vnr_ship_hull_cruiser_2_medium
-				GFX_vnr_ship_hull_cruiser_1_capital_medium
+                GFX_vnr_ship_hull_cruiser_2_capital_medium
                 GFX_vnr_ship_hull_cruiser_1_medium
+                GFX_vnr_ship_hull_cruiser_1_capital_medium
             }
         }
     }
@@ -238,96 +176,60 @@ default = {
         }
     }
     vnr_ship_hull_heavy_2 = {
-		pool = {
-			weight = 2
-            icons = {
-                GFX_vnr_ship_hull_heavy_2_medium
-            }
-        }
         pool = {
             icons = {
+                GFX_vnr_ship_hull_heavy_2_medium
                 GFX_vnr_ship_hull_heavy_1_medium
             }
         }
     }
     vnr_ship_hull_heavy_3 = {
-		pool = {
-			weight = 2
-            icons = {
-                GFX_vnr_ship_hull_heavy_3_medium
-            }
-        }
         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
             }
         }
     }
     vnr_ship_hull_heavy_4 = {
-		pool = {
-			weight = 2
-            icons = {
-                GFX_vnr_ship_hull_heavy_4_medium
-            }
-        }
         pool = {
             icons = {
-                GFX_vnr_ship_hull_heavy_1_medium
-				GFX_vnr_ship_hull_heavy_2_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
             }
         }
     }
     vnr_ship_hull_heavy_5 = {
-		pool = {
-			weight = 2
-            icons = {
-                GFX_vnr_ship_hull_heavy_5_medium
-            }
-        }
         pool = {
             icons = {
-                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_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
             }
         }
     }
     vnr_ship_hull_carrier_conversion_ca = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_carrier_conversion_ca_medium
-			}
-		}
         pool = {
             icons = {
+                GFX_vnr_ship_hull_carrier_conversion_ca_medium
                 GFX_vnr_ship_hull_carrier_conversion_bb_medium
             }
         }
     }
     vnr_ship_hull_carrier_conversion_bb = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_carrier_conversion_bb_medium
-			}
-		}
         pool = {
             icons = {
                 GFX_vnr_ship_hull_carrier_conversion_ca_medium
+                GFX_vnr_ship_hull_carrier_conversion_bb_medium
             }
         }
     }
     vnr_ship_hull_carrier_1 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_carrier_1_medium
-			}
-		}
         pool = {
             icons = {
                 GFX_vnr_ship_hull_carrier_1_medium
@@ -337,63 +239,43 @@ default = {
         }
     }
     vnr_ship_hull_carrier_2 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_carrier_2_medium
-			}
-		}
         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
             }
         }
     }
     vnr_ship_hull_carrier_3 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_carrier_3_medium
-			}
-		}
         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
             }
         }
     }
     vnr_ship_hull_escort_carrier = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_escort_carrier_medium
-			}
-		}
         pool = {
             icons = {
+                GFX_vnr_ship_hull_escort_carrier_medium
                 GFX_vnr_ship_hull_carrier_conversion_ca_medium
             }
         }
     }
     vnr_ship_hull_super_carrier = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_super_carrier_medium
-			}
-		}
         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
             }
         }
     }
@@ -405,14 +287,9 @@ default = {
         }
     }
     vnr_ship_hull_cruiser_submarine = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_cruiser_submarine_medium
-			}
-		}
         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
@@ -427,60 +304,40 @@ default = {
         }
     }
     vnr_ship_hull_submarine_2 = {
-		pool = {
-			weight = 2
-            icons = {
-                GFX_vnr_ship_hull_submarine_2_medium
-            }
-        }
         pool = {
             icons = {
+                GFX_vnr_ship_hull_submarine_2_medium
                 GFX_vnr_ship_hull_submarine_1_medium
             }
         }
     }
     vnr_ship_hull_submarine_3 = {
-		pool = {
-			weight = 2
-            icons = {
-                GFX_vnr_ship_hull_submarine_3_medium
-            }
-        }
         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
             }
         }
     }
     vnr_ship_hull_submarine_4 = {
-		pool = {
-			weight = 2
-            icons = {
-                GFX_vnr_ship_hull_submarine_4_medium
-            }
-        }
         pool = {
             icons = {
-                GFX_vnr_ship_hull_submarine_1_medium
-				GFX_vnr_ship_hull_submarine_2_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 = {
-			weight = 2
-            icons = {
-                GFX_vnr_ship_hull_submarine_5_medium
-            }
-        }
         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_5_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
             }
         }
     }
@@ -492,30 +349,20 @@ default = {
         }
     }
     vnr_ship_hull_civilian_2 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_civilian_2_medium
-			}
-		}
         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_1_medium
             }
         }
     }
     vnr_ship_hull_civilian_3 = {
-		pool = {
-			weight = 2
-			icons = {
-				GFX_vnr_ship_hull_civilian_3_medium
-			}
-		}
         pool = {
             icons = {
-                GFX_vnr_ship_hull_civilian_1_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

@@ -51,6 +51,15 @@ ARG = {
             }
         }
 
+    }
+	
+	vnr_ship_hull_cruiser_coastal_defense_ship = {
+        pool = {
+            weight = 5
+            icons = {
+                GFX_ARG_vnr_ship_hull_cruiser_coastal_defense_ship_medium
+            }
+        }
     }
 
     vnr_ship_hull_heavy_1 = {
@@ -1559,6 +1568,28 @@ CHL = {
             }
         }
 
+		pool = {
+			icons = {
+				"gfx/interface/technologies/South_America/CHL_light_cruiser_Chacabuco.png"
+			}
+		}
+
+    }
+	
+	vnr_ship_hull_cruiser_coastal_defense_ship = {
+        pool = {
+            weight = 5
+            icons = {
+                GFX_CHL_vnr_ship_hull_cruiser_coastal_defense_ship_medium
+            }
+        }
+
+		pool = {
+			icons = {
+				"gfx/interface/technologies/South_America/CHL_light_cruiser_Chacabuco.png"
+			}
+		}
+
     }
 
     vnr_ship_hull_pre_dreadnought = {
@@ -1880,6 +1911,7 @@ ENG = {
         pool = {
             icons = {
                 "gfx/interface/technologies/England/ENG_battleship_Renown.png"
+				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
             }
         }
 
@@ -1898,6 +1930,7 @@ ENG = {
                 "gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				GFX_ENG_vnr_ship_hull_heavy_1_medium
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
+				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
             }
         }
 
@@ -1917,6 +1950,7 @@ ENG = {
 				GFX_ENG_vnr_ship_hull_heavy_2_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
+				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
             }
         }
 
@@ -1937,6 +1971,7 @@ ENG = {
 				GFX_ENG_vnr_ship_hull_heavy_3_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
+				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
             }
         }
 
@@ -1958,6 +1993,7 @@ ENG = {
 				GFX_ENG_vnr_ship_hull_heavy_4_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
+				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
             }
         }
 
@@ -4176,6 +4212,7 @@ ITA = {
             icons = {
                 GFX_ITA_vnr_ship_hull_cruiser_1_medium
 				GFX_ITA_vnr_ship_hull_cruiser_1_capital_medium
+				"gfx/interface/technologies/Italy/ITA_heavy_cruiser_Garibaldi.png"
             }
         }