From f570df92d506b2f6c5ac4e6eddb229451577388f Mon Sep 17 00:00:00 2001
From: xolatile <xolatile@proton.me>
Date: Fri, 16 Feb 2024 06:34:45 -0500
Subject: [PATCH] Removed style based attributes, resources and skills...

---
 source/attribute.adb | 7 +------
 source/core.adb      | 4 ++--
 source/resource.adb  | 7 +------
 source/skill.adb     | 7 +------
 source/ui.adb        | 7 ++-----
 source/ui.ads        | 2 +-
 6 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/source/attribute.adb b/source/attribute.adb
index ae6dcc2..8292b2d 100644
--- a/source/attribute.adb
+++ b/source/attribute.adb
@@ -18,12 +18,7 @@ package body attribute is
 	begin
 		for index in codex
 		loop
-			declare
-				folder : constant string := core.lowercase (ui.style'image (ui.active));
-				file   : constant string := core.lowercase (codex'image (index));
-			begin
-				icon (index) := core.load_sprite ("./sprite/menu/" & folder & "/attribute/" & file & ".png", 1, 1);
-			end;
+			icon (index) := core.load_sprite ("./sprite/attribute/" & core.lowercase (codex'image (index)) & ".png", 1, 1);
 		end loop;
 	end configure;
 
diff --git a/source/core.adb b/source/core.adb
index fb6de64..1504e2a 100644
--- a/source/core.adb
+++ b/source/core.adb
@@ -10,8 +10,8 @@ package body core is
 	begin
 		engine_configure;
 		--
-		hexagon_grid_sprite := load_sprite ("./sprite/menu/hexagon_grid_tile.png", 1, 1);
-		hexagon_fill_sprite := load_sprite ("./sprite/menu/hexagon_fill_tile.png", 1, 1);
+		hexagon_grid_sprite := load_sprite ("./sprite/ui/hexagon_grid_tile.png", 1, 1);
+		hexagon_fill_sprite := load_sprite ("./sprite/ui/hexagon_fill_tile.png", 1, 1);
 	end configure;
 
                                              ------------------------------------------------------------------------------------------
diff --git a/source/resource.adb b/source/resource.adb
index 13f5894..701c588 100644
--- a/source/resource.adb
+++ b/source/resource.adb
@@ -18,12 +18,7 @@ package body resource is
 	begin
 		for index in codex
 		loop
-			declare
-				folder : constant string := core.lowercase (ui.style'image (ui.active));
-				file   : constant string := core.lowercase (codex'image (index));
-			begin
-				icon (index) := core.load_sprite ("./sprite/menu/" & folder & "/resource/" & file & ".png", 1, 1);
-			end;
+			icon (index) := core.load_sprite ("./sprite/resource/" & core.lowercase (codex'image (index)) & ".png", 1, 1);
 		end loop;
 	end configure;
 
diff --git a/source/skill.adb b/source/skill.adb
index 086c1f6..31e7797 100644
--- a/source/skill.adb
+++ b/source/skill.adb
@@ -18,12 +18,7 @@ package body skill is
 	begin
 		for index in codex
 		loop
-			declare
-				folder : constant string := core.lowercase (ui.style'image (ui.active));
-				file   : constant string := core.lowercase (codex'image (index));
-			begin
-				icon (index) := core.load_sprite ("./sprite/menu/" & folder & "/skill/" & file & ".png", 1, 1);
-			end;
+			icon (index) := core.load_sprite ("./sprite/skill/" & core.lowercase (codex'image (index)) & ".png", 1, 1);
 		end loop;
 	end configure;
 
diff --git a/source/ui.adb b/source/ui.adb
index 83cc852..35aa374 100644
--- a/source/ui.adb
+++ b/source/ui.adb
@@ -20,16 +20,13 @@ package body ui is
 		begin
 			for this in codex
 			loop
-				sprite (index, this) := core.load_sprite ("./sprite/menu/" & folder_path & "ui/" & core.lowercase (codex'image (this)) & ".png", 1, 1);
+				sprite (index, this) := core.load_sprite ("./sprite/ui/" & folder_path & core.lowercase (codex'image (this)) & ".png", 1, 1);
 			end loop;
 		end load_ui;
 	begin
 		load_ui (default, "default/");
-		--~load_ui (gothic,  "heroes/");
-		--~load_ui (gothic,  "gothic/");
-		--~load_ui (yd,      "yd/");
+		load_ui (yd,      "yd/");
 		load_ui (steam,   "steam/");
-		--~load_ui (gothic,  "diablo/");
 		--
 		active := default;
 	end configure;
diff --git a/source/ui.ads b/source/ui.ads
index 6a80af9..d7d08da 100644
--- a/source/ui.ads
+++ b/source/ui.ads
@@ -5,7 +5,7 @@ package ui is
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 	type style is (
-		default,                gothic,                 yd,                     steam
+		default,                yd,                     steam
 	);
 
 	type codex is (