From 38c3ee55b64bf8f3e391ba67a897c36c9208acd5 Mon Sep 17 00:00:00 2001
From: Benjamin <Helliaca@users.noreply.github.com>
Date: Mon, 25 Nov 2024 17:01:51 +0100
Subject: [PATCH] fixed ship texticons

---
 common/national_focus/gondor.txt | 17 ++++++++++--
 interface/lotr_misc.gfx          | 44 ++++++++++++++++++++++++++++++++
 patch_notes.txt                  |  3 ++-
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/common/national_focus/gondor.txt b/common/national_focus/gondor.txt
index 09defedb3..29d146278 100644
--- a/common/national_focus/gondor.txt
+++ b/common/national_focus/gondor.txt
@@ -1065,7 +1065,14 @@ continuous_focus_position = { x = 50 y = 1700 }
 	focus = {
 		id = GON_historical_claims
 		icon = GFX_goal_gon_isildur_crown_with_map
-		ai_will_do = { factor = 30 }
+		ai_will_do = {
+			factor = 10
+			modifier = {
+				factor = 0
+				is_historical_focus_on = yes
+				date < "3024.1.1"
+			}
+		}
 		relative_position_id = GON_restore_the_kingdom_of_gondor
 		prerequisite = { focus = GON_restore_the_kingdom_of_gondor focus = GON_restructure_the_army }
 		x = 9
@@ -1254,7 +1261,13 @@ continuous_focus_position = { x = 50 y = 1700 }
 	focus = {
 		id = GON_reclaim_orthanc
 		icon = GFX_goal_orthanc_destroyed
-		ai_will_do = { factor = 30 }
+		ai_will_do = {
+			factor = 15
+			modifier = {
+				factor = 0
+				is_historical_focus_on = yes
+			}
+		}
 		relative_position_id = GON_historical_claims
 		prerequisite = { focus = GON_historical_claims }
 		x = 2
diff --git a/interface/lotr_misc.gfx b/interface/lotr_misc.gfx
index 812c6e4e3..05cd4c6db 100644
--- a/interface/lotr_misc.gfx
+++ b/interface/lotr_misc.gfx
@@ -663,6 +663,50 @@ spriteTypes = {
 		name = "GFX_ability_valiant_charge"
 		texturefile = "gfx/interface/abilitylist/ability_chi_force_attack.dds"
 	}
+
+	spriteType = {
+		name = "GFX_ship_longship_icon_small"
+		texturefile = "gfx/texticons/ship_destroyer_icon_small.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "unit_longship_icon_small"
+		texturefile = "gfx/texticons/ship_destroyer_icon_small.dds"
+		legacy_lazy_load = no
+	}
+
+	spriteType = {
+		name = "GFX_ship_galley_icon_small"
+		texturefile = "gfx/texticons/ship_light_cruiser_icon_small.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "unit_galley_icon_small"
+		texturefile = "gfx/texticons/ship_light_cruiser_icon_small.dds"
+		legacy_lazy_load = no
+	}
+
+	spriteType = {
+		name = "GFX_ship_caravel_icon_small"
+		texturefile = "gfx/texticons/ship_battlecruiser_icon_small.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "unit_caravel_icon_small"
+		texturefile = "gfx/texticons/ship_battlecruiser_icon_small.dds"
+		legacy_lazy_load = no
+	}
+
+	spriteType = {
+		name = "GFX_ship_carrack_icon_small"
+		texturefile = "gfx/texticons/ship_battleship_icon_small.dds"
+		legacy_lazy_load = no
+	}
+	spriteType = {
+		name = "unit_carrack_icon_small"
+		texturefile = "gfx/texticons/ship_battleship_icon_small.dds"
+		legacy_lazy_load = no
+	}
 		
 }
 
diff --git a/patch_notes.txt b/patch_notes.txt
index 05d76b098..16a852e12 100644
--- a/patch_notes.txt
+++ b/patch_notes.txt
@@ -23,4 +23,5 @@ BUGFIX/QOL:
 - Shire independence demand will no longer show up if the Shire is already independent
 - Fixed minor visual bugs in equipment designer
 - The Pro-Eorl resistance movement will now start even if Grima never gains over 18% influence (Delay will still be influenced)
-- Fixed orc moria missing equipment in Moria CW
\ No newline at end of file
+- Fixed orc moria missing equipment in Moria CW
+- Fixed ship icons not appearing correctly
\ No newline at end of file