From 169866a93cafe259acc18259b7b3104c98721f56 Mon Sep 17 00:00:00 2001 From: xolatile Date: Sat, 18 May 2024 15:16:09 -0400 Subject: [PATCH] Another major moving, source code fixed, all works! --- icon/equipment/{ => chest}/bone_chestplate.png | Bin icon/equipment/{ => chest}/bronze_chestplate.png | Bin .../equipment/{ => chest}/chainmail_chestplate.png | Bin icon/equipment/{ => chest}/crystal_chestplate.png | Bin icon/equipment/{ => chest}/elven_armour.png | Bin icon/equipment/{ => chest}/fur_armour.png | Bin icon/equipment/{ => chest}/golden_chestplate.png | Bin icon/equipment/{ => chest}/human_armour.png | Bin icon/equipment/{ => chest}/iron_chestplate.png | Bin icon/equipment/{ => chest}/leather_chestplate.png | Bin icon/equipment/{ => chest}/mithril_chestplate.png | Bin icon/equipment/{ => chest}/orcish_armour.png | Bin icon/equipment/{ => chest}/steel_chestplate.png | Bin icon/equipment/{ => chest}/wooden_armour.png | Bin icon/equipment/{ => feet}/bone_greaves.png | Bin icon/equipment/{ => feet}/bronze_greaves.png | Bin icon/equipment/{ => feet}/chainmail_greaves.png | Bin icon/equipment/{ => feet}/crystal_greaves.png | Bin icon/equipment/{ => feet}/fur_greaves.png | Bin icon/equipment/{ => feet}/golden_greaves.png | Bin icon/equipment/{ => feet}/iron_greaves.png | Bin icon/equipment/{ => feet}/leather_greaves.png | Bin icon/equipment/{ => feet}/mithril_greaves.png | Bin icon/equipment/{ => feet}/steel_greaves.png | Bin icon/equipment/{ => full_body}/black_robe.png | Bin icon/equipment/{ => full_body}/black_tunic.png | Bin icon/equipment/{ => full_body}/blue_tunic.png | Bin icon/equipment/{ => full_body}/cyan_robe.png | Bin icon/equipment/{ => full_body}/cyan_tunic.png | Bin icon/equipment/{ => full_body}/green_tunic.png | Bin icon/equipment/{ => full_body}/grey_tunic.png | Bin icon/equipment/{ => full_body}/lime_dress.png | Bin icon/equipment/{ => full_body}/lime_robe.png | Bin icon/equipment/{ => full_body}/lime_tunic.png | Bin icon/equipment/{ => full_body}/magenta_dress.png | Bin icon/equipment/{ => full_body}/none.png | Bin icon/equipment/{ => full_body}/orange_robe.png | Bin icon/equipment/{ => full_body}/orange_tunic.png | Bin icon/equipment/{ => full_body}/pink_dress.png | Bin icon/equipment/{ => full_body}/pink_tunic.png | Bin icon/equipment/{ => full_body}/purple_tunic.png | Bin icon/equipment/{ => full_body}/red_robe.png | Bin icon/equipment/{ => full_body}/red_tunic.png | Bin icon/equipment/{ => full_body}/sexy_dress.png | Bin icon/equipment/{ => full_body}/white_robe.png | Bin icon/equipment/{ => full_body}/white_tunic.png | Bin icon/equipment/{ => full_body}/yellow_tunic.png | Bin icon/equipment/{ => hands}/bone_gauntlets.png | Bin icon/equipment/{ => hands}/bronze_gauntlets.png | Bin icon/equipment/{ => hands}/chainmail_gauntlets.png | Bin icon/equipment/{ => hands}/crystal_gauntlets.png | Bin icon/equipment/{ => hands}/fur_gauntlets.png | Bin icon/equipment/{ => hands}/golden_gauntlets.png | Bin icon/equipment/{ => hands}/iron_gauntlets.png | Bin icon/equipment/{ => hands}/leather_gauntlets.png | Bin icon/equipment/{ => hands}/mithril_gauntlets.png | Bin icon/equipment/{ => hands}/steel_gauntlets.png | Bin icon/equipment/{ => head}/black_hood.png | Bin icon/equipment/{ => head}/bone_helmet.png | Bin icon/equipment/{ => head}/bronze_helmet.png | Bin icon/equipment/{ => head}/chainmail_helmet.png | Bin icon/equipment/{ => head}/crystal_helmet.png | Bin icon/equipment/{ => head}/cyan_hood.png | Bin icon/equipment/{ => head}/elven_helmet.png | Bin icon/equipment/{ => head}/fur_helmet.png | Bin icon/equipment/{ => head}/golden_helmet.png | Bin icon/equipment/{ => head}/human_helmet.png | Bin icon/equipment/{ => head}/iron_helmet.png | Bin icon/equipment/{ => head}/leather_helmet.png | Bin icon/equipment/{ => head}/lime_hood.png | Bin icon/equipment/{ => head}/mithril_helmet.png | Bin icon/equipment/{ => head}/orange_hood.png | Bin icon/equipment/{ => head}/orcish_helmet.png | Bin icon/equipment/{ => head}/red_hood.png | Bin icon/equipment/{ => head}/steel_helmet.png | Bin icon/equipment/{ => head}/white_hood.png | Bin icon/equipment/{ => head}/wooden_helmet.png | Bin icon/equipment/{ => main_hand}/bone_axe.png | Bin icon/equipment/{ => main_hand}/bone_battleaxe.png | Bin icon/equipment/{ => main_hand}/bone_bow.png | Bin icon/equipment/{ => main_hand}/bone_mace.png | Bin icon/equipment/{ => main_hand}/bone_spear.png | Bin icon/equipment/{ => main_hand}/bone_sword.png | Bin icon/equipment/{ => main_hand}/bronze_axe.png | Bin .../{ => main_hand}/bronze_greatsword.png | Bin icon/equipment/{ => main_hand}/bronze_mace.png | Bin icon/equipment/{ => main_hand}/bronze_spear.png | Bin icon/equipment/{ => main_hand}/bronze_sword.png | Bin icon/equipment/{ => main_hand}/club.png | Bin icon/equipment/{ => main_hand}/crystal_bow.png | Bin .../{ => main_hand}/crystal_greatsword.png | Bin icon/equipment/{ => main_hand}/crystal_mace.png | Bin icon/equipment/{ => main_hand}/crystal_spear.png | Bin icon/equipment/{ => main_hand}/crystal_sword.png | Bin icon/equipment/{ => main_hand}/golden_axe.png | Bin .../equipment/{ => main_hand}/golden_battleaxe.png | Bin icon/equipment/{ => main_hand}/golden_bow.png | Bin .../{ => main_hand}/golden_greatsword.png | Bin icon/equipment/{ => main_hand}/golden_sword.png | Bin icon/equipment/{ => main_hand}/iron_axe.png | Bin icon/equipment/{ => main_hand}/iron_bow.png | Bin icon/equipment/{ => main_hand}/iron_mace.png | Bin icon/equipment/{ => main_hand}/iron_spear.png | Bin icon/equipment/{ => main_hand}/iron_sword.png | Bin icon/equipment/{ => main_hand}/jade_axe.png | Bin icon/equipment/{ => main_hand}/jade_battleaxe.png | Bin icon/equipment/{ => main_hand}/jade_greatsword.png | Bin icon/equipment/{ => main_hand}/jade_mace.png | Bin icon/equipment/{ => main_hand}/jade_spear.png | Bin icon/equipment/{ => main_hand}/jade_sword.png | Bin icon/equipment/{ => main_hand}/maul.png | Bin icon/equipment/{ => main_hand}/mithril_axe.png | Bin .../{ => main_hand}/mithril_battleaxe.png | Bin icon/equipment/{ => main_hand}/mithril_bow.png | Bin icon/equipment/{ => main_hand}/mithril_mace.png | Bin icon/equipment/{ => main_hand}/mithril_spear.png | Bin icon/equipment/{ => main_hand}/sledge_hammer.png | Bin icon/equipment/{ => main_hand}/spiked_club.png | Bin icon/equipment/{ => main_hand}/spiked_staff.png | Bin icon/equipment/{ => main_hand}/staff.png | Bin icon/equipment/{ => main_hand}/steel_battleaxe.png | Bin icon/equipment/{ => main_hand}/steel_bow.png | Bin .../equipment/{ => main_hand}/steel_greatsword.png | Bin icon/equipment/{ => main_hand}/steel_mace.png | Bin icon/equipment/{ => main_hand}/steel_sword.png | Bin icon/equipment/{ => main_hand}/wooden_bow.png | Bin .../{ => main_hand}/wooden_greatsword.png | Bin icon/equipment/{ => main_hand}/wooden_sword.png | Bin icon/equipment/{ => neck}/golden_necklace.png | Bin icon/equipment/{ => off_hand}/bronze_shield.png | Bin icon/equipment/{ => off_hand}/crystal_shield.png | Bin icon/equipment/{ => off_hand}/golden_shield.png | Bin icon/equipment/{ => off_hand}/iron_shield.png | Bin icon/equipment/{ => off_hand}/mithril_shield.png | Bin icon/equipment/{ => off_hand}/steel_shield.png | Bin icon/equipment/{ => off_hand}/wooden_shield.png | Bin source/attribute.adb | 8 +- source/chad.adb | 8 +- source/construction.adb | 2 +- source/core.adb | 2 +- source/core.ads | 2 + source/deity.adb | 2 +- source/equipment.adb | 4 +- source/magic.adb | 2 +- source/main.adb | 82 ++++++++++----------- source/material.adb | 2 +- source/might.adb | 8 +- source/resource.adb | 2 +- source/skill.adb | 2 +- source/ui.adb | 6 +- source/unit.adb | 6 +- source/world.adb | 22 +++--- ui/{ashland_preview.png => preview/ashland.png} | Bin .../grassland.png} | Bin .../roughland.png} | Bin ui/{sandland_preview.png => preview/sandland.png} | Bin ui/{snowland_preview.png => preview/snowland.png} | Bin .../swampland.png} | Bin 158 files changed, 81 insertions(+), 79 deletions(-) rename icon/equipment/{ => chest}/bone_chestplate.png (100%) rename icon/equipment/{ => chest}/bronze_chestplate.png (100%) rename icon/equipment/{ => chest}/chainmail_chestplate.png (100%) rename icon/equipment/{ => chest}/crystal_chestplate.png (100%) rename icon/equipment/{ => chest}/elven_armour.png (100%) rename icon/equipment/{ => chest}/fur_armour.png (100%) rename icon/equipment/{ => chest}/golden_chestplate.png (100%) rename icon/equipment/{ => chest}/human_armour.png (100%) rename icon/equipment/{ => chest}/iron_chestplate.png (100%) rename icon/equipment/{ => chest}/leather_chestplate.png (100%) rename icon/equipment/{ => chest}/mithril_chestplate.png (100%) rename icon/equipment/{ => chest}/orcish_armour.png (100%) rename icon/equipment/{ => chest}/steel_chestplate.png (100%) rename icon/equipment/{ => chest}/wooden_armour.png (100%) rename icon/equipment/{ => feet}/bone_greaves.png (100%) rename icon/equipment/{ => feet}/bronze_greaves.png (100%) rename icon/equipment/{ => feet}/chainmail_greaves.png (100%) rename icon/equipment/{ => feet}/crystal_greaves.png (100%) rename icon/equipment/{ => feet}/fur_greaves.png (100%) rename icon/equipment/{ => feet}/golden_greaves.png (100%) rename icon/equipment/{ => feet}/iron_greaves.png (100%) rename icon/equipment/{ => feet}/leather_greaves.png (100%) rename icon/equipment/{ => feet}/mithril_greaves.png (100%) rename icon/equipment/{ => feet}/steel_greaves.png (100%) rename icon/equipment/{ => full_body}/black_robe.png (100%) rename icon/equipment/{ => full_body}/black_tunic.png (100%) rename icon/equipment/{ => full_body}/blue_tunic.png (100%) rename icon/equipment/{ => full_body}/cyan_robe.png (100%) rename icon/equipment/{ => full_body}/cyan_tunic.png (100%) rename icon/equipment/{ => full_body}/green_tunic.png (100%) rename icon/equipment/{ => full_body}/grey_tunic.png (100%) rename icon/equipment/{ => full_body}/lime_dress.png (100%) rename icon/equipment/{ => full_body}/lime_robe.png (100%) rename icon/equipment/{ => full_body}/lime_tunic.png (100%) rename icon/equipment/{ => full_body}/magenta_dress.png (100%) rename icon/equipment/{ => full_body}/none.png (100%) rename icon/equipment/{ => full_body}/orange_robe.png (100%) rename icon/equipment/{ => full_body}/orange_tunic.png (100%) rename icon/equipment/{ => full_body}/pink_dress.png (100%) rename icon/equipment/{ => full_body}/pink_tunic.png (100%) rename icon/equipment/{ => full_body}/purple_tunic.png (100%) rename icon/equipment/{ => full_body}/red_robe.png (100%) rename icon/equipment/{ => full_body}/red_tunic.png (100%) rename icon/equipment/{ => full_body}/sexy_dress.png (100%) rename icon/equipment/{ => full_body}/white_robe.png (100%) rename icon/equipment/{ => full_body}/white_tunic.png (100%) rename icon/equipment/{ => full_body}/yellow_tunic.png (100%) rename icon/equipment/{ => hands}/bone_gauntlets.png (100%) rename icon/equipment/{ => hands}/bronze_gauntlets.png (100%) rename icon/equipment/{ => hands}/chainmail_gauntlets.png (100%) rename icon/equipment/{ => hands}/crystal_gauntlets.png (100%) rename icon/equipment/{ => hands}/fur_gauntlets.png (100%) rename icon/equipment/{ => hands}/golden_gauntlets.png (100%) rename icon/equipment/{ => hands}/iron_gauntlets.png (100%) rename icon/equipment/{ => hands}/leather_gauntlets.png (100%) rename icon/equipment/{ => hands}/mithril_gauntlets.png (100%) rename icon/equipment/{ => hands}/steel_gauntlets.png (100%) rename icon/equipment/{ => head}/black_hood.png (100%) rename icon/equipment/{ => head}/bone_helmet.png (100%) rename icon/equipment/{ => head}/bronze_helmet.png (100%) rename icon/equipment/{ => head}/chainmail_helmet.png (100%) rename icon/equipment/{ => head}/crystal_helmet.png (100%) rename icon/equipment/{ => head}/cyan_hood.png (100%) rename icon/equipment/{ => head}/elven_helmet.png (100%) rename icon/equipment/{ => head}/fur_helmet.png (100%) rename icon/equipment/{ => head}/golden_helmet.png (100%) rename icon/equipment/{ => head}/human_helmet.png (100%) rename icon/equipment/{ => head}/iron_helmet.png (100%) rename icon/equipment/{ => head}/leather_helmet.png (100%) rename icon/equipment/{ => head}/lime_hood.png (100%) rename icon/equipment/{ => head}/mithril_helmet.png (100%) rename icon/equipment/{ => head}/orange_hood.png (100%) rename icon/equipment/{ => head}/orcish_helmet.png (100%) rename icon/equipment/{ => head}/red_hood.png (100%) rename icon/equipment/{ => head}/steel_helmet.png (100%) rename icon/equipment/{ => head}/white_hood.png (100%) rename icon/equipment/{ => head}/wooden_helmet.png (100%) rename icon/equipment/{ => main_hand}/bone_axe.png (100%) rename icon/equipment/{ => main_hand}/bone_battleaxe.png (100%) rename icon/equipment/{ => main_hand}/bone_bow.png (100%) rename icon/equipment/{ => main_hand}/bone_mace.png (100%) rename icon/equipment/{ => main_hand}/bone_spear.png (100%) rename icon/equipment/{ => main_hand}/bone_sword.png (100%) rename icon/equipment/{ => main_hand}/bronze_axe.png (100%) rename icon/equipment/{ => main_hand}/bronze_greatsword.png (100%) rename icon/equipment/{ => main_hand}/bronze_mace.png (100%) rename icon/equipment/{ => main_hand}/bronze_spear.png (100%) rename icon/equipment/{ => main_hand}/bronze_sword.png (100%) rename icon/equipment/{ => main_hand}/club.png (100%) rename icon/equipment/{ => main_hand}/crystal_bow.png (100%) rename icon/equipment/{ => main_hand}/crystal_greatsword.png (100%) rename icon/equipment/{ => main_hand}/crystal_mace.png (100%) rename icon/equipment/{ => main_hand}/crystal_spear.png (100%) rename icon/equipment/{ => main_hand}/crystal_sword.png (100%) rename icon/equipment/{ => main_hand}/golden_axe.png (100%) rename icon/equipment/{ => main_hand}/golden_battleaxe.png (100%) rename icon/equipment/{ => main_hand}/golden_bow.png (100%) rename icon/equipment/{ => main_hand}/golden_greatsword.png (100%) rename icon/equipment/{ => main_hand}/golden_sword.png (100%) rename icon/equipment/{ => main_hand}/iron_axe.png (100%) rename icon/equipment/{ => main_hand}/iron_bow.png (100%) rename icon/equipment/{ => main_hand}/iron_mace.png (100%) rename icon/equipment/{ => main_hand}/iron_spear.png (100%) rename icon/equipment/{ => main_hand}/iron_sword.png (100%) rename icon/equipment/{ => main_hand}/jade_axe.png (100%) rename icon/equipment/{ => main_hand}/jade_battleaxe.png (100%) rename icon/equipment/{ => main_hand}/jade_greatsword.png (100%) rename icon/equipment/{ => main_hand}/jade_mace.png (100%) rename icon/equipment/{ => main_hand}/jade_spear.png (100%) rename icon/equipment/{ => main_hand}/jade_sword.png (100%) rename icon/equipment/{ => main_hand}/maul.png (100%) rename icon/equipment/{ => main_hand}/mithril_axe.png (100%) rename icon/equipment/{ => main_hand}/mithril_battleaxe.png (100%) rename icon/equipment/{ => main_hand}/mithril_bow.png (100%) rename icon/equipment/{ => main_hand}/mithril_mace.png (100%) rename icon/equipment/{ => main_hand}/mithril_spear.png (100%) rename icon/equipment/{ => main_hand}/sledge_hammer.png (100%) rename icon/equipment/{ => main_hand}/spiked_club.png (100%) rename icon/equipment/{ => main_hand}/spiked_staff.png (100%) rename icon/equipment/{ => main_hand}/staff.png (100%) rename icon/equipment/{ => main_hand}/steel_battleaxe.png (100%) rename icon/equipment/{ => main_hand}/steel_bow.png (100%) rename icon/equipment/{ => main_hand}/steel_greatsword.png (100%) rename icon/equipment/{ => main_hand}/steel_mace.png (100%) rename icon/equipment/{ => main_hand}/steel_sword.png (100%) rename icon/equipment/{ => main_hand}/wooden_bow.png (100%) rename icon/equipment/{ => main_hand}/wooden_greatsword.png (100%) rename icon/equipment/{ => main_hand}/wooden_sword.png (100%) rename icon/equipment/{ => neck}/golden_necklace.png (100%) rename icon/equipment/{ => off_hand}/bronze_shield.png (100%) rename icon/equipment/{ => off_hand}/crystal_shield.png (100%) rename icon/equipment/{ => off_hand}/golden_shield.png (100%) rename icon/equipment/{ => off_hand}/iron_shield.png (100%) rename icon/equipment/{ => off_hand}/mithril_shield.png (100%) rename icon/equipment/{ => off_hand}/steel_shield.png (100%) rename icon/equipment/{ => off_hand}/wooden_shield.png (100%) rename ui/{ashland_preview.png => preview/ashland.png} (100%) rename ui/{grassland_preview.png => preview/grassland.png} (100%) rename ui/{roughland_preview.png => preview/roughland.png} (100%) rename ui/{sandland_preview.png => preview/sandland.png} (100%) rename ui/{snowland_preview.png => preview/snowland.png} (100%) rename ui/{swampland_preview.png => preview/swampland.png} (100%) diff --git a/icon/equipment/bone_chestplate.png b/icon/equipment/chest/bone_chestplate.png similarity index 100% rename from icon/equipment/bone_chestplate.png rename to icon/equipment/chest/bone_chestplate.png diff --git a/icon/equipment/bronze_chestplate.png b/icon/equipment/chest/bronze_chestplate.png similarity index 100% rename from icon/equipment/bronze_chestplate.png rename to icon/equipment/chest/bronze_chestplate.png diff --git a/icon/equipment/chainmail_chestplate.png b/icon/equipment/chest/chainmail_chestplate.png similarity index 100% rename from icon/equipment/chainmail_chestplate.png rename to icon/equipment/chest/chainmail_chestplate.png diff --git a/icon/equipment/crystal_chestplate.png b/icon/equipment/chest/crystal_chestplate.png similarity index 100% rename from icon/equipment/crystal_chestplate.png rename to icon/equipment/chest/crystal_chestplate.png diff --git a/icon/equipment/elven_armour.png b/icon/equipment/chest/elven_armour.png similarity index 100% rename from icon/equipment/elven_armour.png rename to icon/equipment/chest/elven_armour.png diff --git a/icon/equipment/fur_armour.png b/icon/equipment/chest/fur_armour.png similarity index 100% rename from icon/equipment/fur_armour.png rename to icon/equipment/chest/fur_armour.png diff --git a/icon/equipment/golden_chestplate.png b/icon/equipment/chest/golden_chestplate.png similarity index 100% rename from icon/equipment/golden_chestplate.png rename to icon/equipment/chest/golden_chestplate.png diff --git a/icon/equipment/human_armour.png b/icon/equipment/chest/human_armour.png similarity index 100% rename from icon/equipment/human_armour.png rename to icon/equipment/chest/human_armour.png diff --git a/icon/equipment/iron_chestplate.png b/icon/equipment/chest/iron_chestplate.png similarity index 100% rename from icon/equipment/iron_chestplate.png rename to icon/equipment/chest/iron_chestplate.png diff --git a/icon/equipment/leather_chestplate.png b/icon/equipment/chest/leather_chestplate.png similarity index 100% rename from icon/equipment/leather_chestplate.png rename to icon/equipment/chest/leather_chestplate.png diff --git a/icon/equipment/mithril_chestplate.png b/icon/equipment/chest/mithril_chestplate.png similarity index 100% rename from icon/equipment/mithril_chestplate.png rename to icon/equipment/chest/mithril_chestplate.png diff --git a/icon/equipment/orcish_armour.png b/icon/equipment/chest/orcish_armour.png similarity index 100% rename from icon/equipment/orcish_armour.png rename to icon/equipment/chest/orcish_armour.png diff --git a/icon/equipment/steel_chestplate.png b/icon/equipment/chest/steel_chestplate.png similarity index 100% rename from icon/equipment/steel_chestplate.png rename to icon/equipment/chest/steel_chestplate.png diff --git a/icon/equipment/wooden_armour.png b/icon/equipment/chest/wooden_armour.png similarity index 100% rename from icon/equipment/wooden_armour.png rename to icon/equipment/chest/wooden_armour.png diff --git a/icon/equipment/bone_greaves.png b/icon/equipment/feet/bone_greaves.png similarity index 100% rename from icon/equipment/bone_greaves.png rename to icon/equipment/feet/bone_greaves.png diff --git a/icon/equipment/bronze_greaves.png b/icon/equipment/feet/bronze_greaves.png similarity index 100% rename from icon/equipment/bronze_greaves.png rename to icon/equipment/feet/bronze_greaves.png diff --git a/icon/equipment/chainmail_greaves.png b/icon/equipment/feet/chainmail_greaves.png similarity index 100% rename from icon/equipment/chainmail_greaves.png rename to icon/equipment/feet/chainmail_greaves.png diff --git a/icon/equipment/crystal_greaves.png b/icon/equipment/feet/crystal_greaves.png similarity index 100% rename from icon/equipment/crystal_greaves.png rename to icon/equipment/feet/crystal_greaves.png diff --git a/icon/equipment/fur_greaves.png b/icon/equipment/feet/fur_greaves.png similarity index 100% rename from icon/equipment/fur_greaves.png rename to icon/equipment/feet/fur_greaves.png diff --git a/icon/equipment/golden_greaves.png b/icon/equipment/feet/golden_greaves.png similarity index 100% rename from icon/equipment/golden_greaves.png rename to icon/equipment/feet/golden_greaves.png diff --git a/icon/equipment/iron_greaves.png b/icon/equipment/feet/iron_greaves.png similarity index 100% rename from icon/equipment/iron_greaves.png rename to icon/equipment/feet/iron_greaves.png diff --git a/icon/equipment/leather_greaves.png b/icon/equipment/feet/leather_greaves.png similarity index 100% rename from icon/equipment/leather_greaves.png rename to icon/equipment/feet/leather_greaves.png diff --git a/icon/equipment/mithril_greaves.png b/icon/equipment/feet/mithril_greaves.png similarity index 100% rename from icon/equipment/mithril_greaves.png rename to icon/equipment/feet/mithril_greaves.png diff --git a/icon/equipment/steel_greaves.png b/icon/equipment/feet/steel_greaves.png similarity index 100% rename from icon/equipment/steel_greaves.png rename to icon/equipment/feet/steel_greaves.png diff --git a/icon/equipment/black_robe.png b/icon/equipment/full_body/black_robe.png similarity index 100% rename from icon/equipment/black_robe.png rename to icon/equipment/full_body/black_robe.png diff --git a/icon/equipment/black_tunic.png b/icon/equipment/full_body/black_tunic.png similarity index 100% rename from icon/equipment/black_tunic.png rename to icon/equipment/full_body/black_tunic.png diff --git a/icon/equipment/blue_tunic.png b/icon/equipment/full_body/blue_tunic.png similarity index 100% rename from icon/equipment/blue_tunic.png rename to icon/equipment/full_body/blue_tunic.png diff --git a/icon/equipment/cyan_robe.png b/icon/equipment/full_body/cyan_robe.png similarity index 100% rename from icon/equipment/cyan_robe.png rename to icon/equipment/full_body/cyan_robe.png diff --git a/icon/equipment/cyan_tunic.png b/icon/equipment/full_body/cyan_tunic.png similarity index 100% rename from icon/equipment/cyan_tunic.png rename to icon/equipment/full_body/cyan_tunic.png diff --git a/icon/equipment/green_tunic.png b/icon/equipment/full_body/green_tunic.png similarity index 100% rename from icon/equipment/green_tunic.png rename to icon/equipment/full_body/green_tunic.png diff --git a/icon/equipment/grey_tunic.png b/icon/equipment/full_body/grey_tunic.png similarity index 100% rename from icon/equipment/grey_tunic.png rename to icon/equipment/full_body/grey_tunic.png diff --git a/icon/equipment/lime_dress.png b/icon/equipment/full_body/lime_dress.png similarity index 100% rename from icon/equipment/lime_dress.png rename to icon/equipment/full_body/lime_dress.png diff --git a/icon/equipment/lime_robe.png b/icon/equipment/full_body/lime_robe.png similarity index 100% rename from icon/equipment/lime_robe.png rename to icon/equipment/full_body/lime_robe.png diff --git a/icon/equipment/lime_tunic.png b/icon/equipment/full_body/lime_tunic.png similarity index 100% rename from icon/equipment/lime_tunic.png rename to icon/equipment/full_body/lime_tunic.png diff --git a/icon/equipment/magenta_dress.png b/icon/equipment/full_body/magenta_dress.png similarity index 100% rename from icon/equipment/magenta_dress.png rename to icon/equipment/full_body/magenta_dress.png diff --git a/icon/equipment/none.png b/icon/equipment/full_body/none.png similarity index 100% rename from icon/equipment/none.png rename to icon/equipment/full_body/none.png diff --git a/icon/equipment/orange_robe.png b/icon/equipment/full_body/orange_robe.png similarity index 100% rename from icon/equipment/orange_robe.png rename to icon/equipment/full_body/orange_robe.png diff --git a/icon/equipment/orange_tunic.png b/icon/equipment/full_body/orange_tunic.png similarity index 100% rename from icon/equipment/orange_tunic.png rename to icon/equipment/full_body/orange_tunic.png diff --git a/icon/equipment/pink_dress.png b/icon/equipment/full_body/pink_dress.png similarity index 100% rename from icon/equipment/pink_dress.png rename to icon/equipment/full_body/pink_dress.png diff --git a/icon/equipment/pink_tunic.png b/icon/equipment/full_body/pink_tunic.png similarity index 100% rename from icon/equipment/pink_tunic.png rename to icon/equipment/full_body/pink_tunic.png diff --git a/icon/equipment/purple_tunic.png b/icon/equipment/full_body/purple_tunic.png similarity index 100% rename from icon/equipment/purple_tunic.png rename to icon/equipment/full_body/purple_tunic.png diff --git a/icon/equipment/red_robe.png b/icon/equipment/full_body/red_robe.png similarity index 100% rename from icon/equipment/red_robe.png rename to icon/equipment/full_body/red_robe.png diff --git a/icon/equipment/red_tunic.png b/icon/equipment/full_body/red_tunic.png similarity index 100% rename from icon/equipment/red_tunic.png rename to icon/equipment/full_body/red_tunic.png diff --git a/icon/equipment/sexy_dress.png b/icon/equipment/full_body/sexy_dress.png similarity index 100% rename from icon/equipment/sexy_dress.png rename to icon/equipment/full_body/sexy_dress.png diff --git a/icon/equipment/white_robe.png b/icon/equipment/full_body/white_robe.png similarity index 100% rename from icon/equipment/white_robe.png rename to icon/equipment/full_body/white_robe.png diff --git a/icon/equipment/white_tunic.png b/icon/equipment/full_body/white_tunic.png similarity index 100% rename from icon/equipment/white_tunic.png rename to icon/equipment/full_body/white_tunic.png diff --git a/icon/equipment/yellow_tunic.png b/icon/equipment/full_body/yellow_tunic.png similarity index 100% rename from icon/equipment/yellow_tunic.png rename to icon/equipment/full_body/yellow_tunic.png diff --git a/icon/equipment/bone_gauntlets.png b/icon/equipment/hands/bone_gauntlets.png similarity index 100% rename from icon/equipment/bone_gauntlets.png rename to icon/equipment/hands/bone_gauntlets.png diff --git a/icon/equipment/bronze_gauntlets.png b/icon/equipment/hands/bronze_gauntlets.png similarity index 100% rename from icon/equipment/bronze_gauntlets.png rename to icon/equipment/hands/bronze_gauntlets.png diff --git a/icon/equipment/chainmail_gauntlets.png b/icon/equipment/hands/chainmail_gauntlets.png similarity index 100% rename from icon/equipment/chainmail_gauntlets.png rename to icon/equipment/hands/chainmail_gauntlets.png diff --git a/icon/equipment/crystal_gauntlets.png b/icon/equipment/hands/crystal_gauntlets.png similarity index 100% rename from icon/equipment/crystal_gauntlets.png rename to icon/equipment/hands/crystal_gauntlets.png diff --git a/icon/equipment/fur_gauntlets.png b/icon/equipment/hands/fur_gauntlets.png similarity index 100% rename from icon/equipment/fur_gauntlets.png rename to icon/equipment/hands/fur_gauntlets.png diff --git a/icon/equipment/golden_gauntlets.png b/icon/equipment/hands/golden_gauntlets.png similarity index 100% rename from icon/equipment/golden_gauntlets.png rename to icon/equipment/hands/golden_gauntlets.png diff --git a/icon/equipment/iron_gauntlets.png b/icon/equipment/hands/iron_gauntlets.png similarity index 100% rename from icon/equipment/iron_gauntlets.png rename to icon/equipment/hands/iron_gauntlets.png diff --git a/icon/equipment/leather_gauntlets.png b/icon/equipment/hands/leather_gauntlets.png similarity index 100% rename from icon/equipment/leather_gauntlets.png rename to icon/equipment/hands/leather_gauntlets.png diff --git a/icon/equipment/mithril_gauntlets.png b/icon/equipment/hands/mithril_gauntlets.png similarity index 100% rename from icon/equipment/mithril_gauntlets.png rename to icon/equipment/hands/mithril_gauntlets.png diff --git a/icon/equipment/steel_gauntlets.png b/icon/equipment/hands/steel_gauntlets.png similarity index 100% rename from icon/equipment/steel_gauntlets.png rename to icon/equipment/hands/steel_gauntlets.png diff --git a/icon/equipment/black_hood.png b/icon/equipment/head/black_hood.png similarity index 100% rename from icon/equipment/black_hood.png rename to icon/equipment/head/black_hood.png diff --git a/icon/equipment/bone_helmet.png b/icon/equipment/head/bone_helmet.png similarity index 100% rename from icon/equipment/bone_helmet.png rename to icon/equipment/head/bone_helmet.png diff --git a/icon/equipment/bronze_helmet.png b/icon/equipment/head/bronze_helmet.png similarity index 100% rename from icon/equipment/bronze_helmet.png rename to icon/equipment/head/bronze_helmet.png diff --git a/icon/equipment/chainmail_helmet.png b/icon/equipment/head/chainmail_helmet.png similarity index 100% rename from icon/equipment/chainmail_helmet.png rename to icon/equipment/head/chainmail_helmet.png diff --git a/icon/equipment/crystal_helmet.png b/icon/equipment/head/crystal_helmet.png similarity index 100% rename from icon/equipment/crystal_helmet.png rename to icon/equipment/head/crystal_helmet.png diff --git a/icon/equipment/cyan_hood.png b/icon/equipment/head/cyan_hood.png similarity index 100% rename from icon/equipment/cyan_hood.png rename to icon/equipment/head/cyan_hood.png diff --git a/icon/equipment/elven_helmet.png b/icon/equipment/head/elven_helmet.png similarity index 100% rename from icon/equipment/elven_helmet.png rename to icon/equipment/head/elven_helmet.png diff --git a/icon/equipment/fur_helmet.png b/icon/equipment/head/fur_helmet.png similarity index 100% rename from icon/equipment/fur_helmet.png rename to icon/equipment/head/fur_helmet.png diff --git a/icon/equipment/golden_helmet.png b/icon/equipment/head/golden_helmet.png similarity index 100% rename from icon/equipment/golden_helmet.png rename to icon/equipment/head/golden_helmet.png diff --git a/icon/equipment/human_helmet.png b/icon/equipment/head/human_helmet.png similarity index 100% rename from icon/equipment/human_helmet.png rename to icon/equipment/head/human_helmet.png diff --git a/icon/equipment/iron_helmet.png b/icon/equipment/head/iron_helmet.png similarity index 100% rename from icon/equipment/iron_helmet.png rename to icon/equipment/head/iron_helmet.png diff --git a/icon/equipment/leather_helmet.png b/icon/equipment/head/leather_helmet.png similarity index 100% rename from icon/equipment/leather_helmet.png rename to icon/equipment/head/leather_helmet.png diff --git a/icon/equipment/lime_hood.png b/icon/equipment/head/lime_hood.png similarity index 100% rename from icon/equipment/lime_hood.png rename to icon/equipment/head/lime_hood.png diff --git a/icon/equipment/mithril_helmet.png b/icon/equipment/head/mithril_helmet.png similarity index 100% rename from icon/equipment/mithril_helmet.png rename to icon/equipment/head/mithril_helmet.png diff --git a/icon/equipment/orange_hood.png b/icon/equipment/head/orange_hood.png similarity index 100% rename from icon/equipment/orange_hood.png rename to icon/equipment/head/orange_hood.png diff --git a/icon/equipment/orcish_helmet.png b/icon/equipment/head/orcish_helmet.png similarity index 100% rename from icon/equipment/orcish_helmet.png rename to icon/equipment/head/orcish_helmet.png diff --git a/icon/equipment/red_hood.png b/icon/equipment/head/red_hood.png similarity index 100% rename from icon/equipment/red_hood.png rename to icon/equipment/head/red_hood.png diff --git a/icon/equipment/steel_helmet.png b/icon/equipment/head/steel_helmet.png similarity index 100% rename from icon/equipment/steel_helmet.png rename to icon/equipment/head/steel_helmet.png diff --git a/icon/equipment/white_hood.png b/icon/equipment/head/white_hood.png similarity index 100% rename from icon/equipment/white_hood.png rename to icon/equipment/head/white_hood.png diff --git a/icon/equipment/wooden_helmet.png b/icon/equipment/head/wooden_helmet.png similarity index 100% rename from icon/equipment/wooden_helmet.png rename to icon/equipment/head/wooden_helmet.png diff --git a/icon/equipment/bone_axe.png b/icon/equipment/main_hand/bone_axe.png similarity index 100% rename from icon/equipment/bone_axe.png rename to icon/equipment/main_hand/bone_axe.png diff --git a/icon/equipment/bone_battleaxe.png b/icon/equipment/main_hand/bone_battleaxe.png similarity index 100% rename from icon/equipment/bone_battleaxe.png rename to icon/equipment/main_hand/bone_battleaxe.png diff --git a/icon/equipment/bone_bow.png b/icon/equipment/main_hand/bone_bow.png similarity index 100% rename from icon/equipment/bone_bow.png rename to icon/equipment/main_hand/bone_bow.png diff --git a/icon/equipment/bone_mace.png b/icon/equipment/main_hand/bone_mace.png similarity index 100% rename from icon/equipment/bone_mace.png rename to icon/equipment/main_hand/bone_mace.png diff --git a/icon/equipment/bone_spear.png b/icon/equipment/main_hand/bone_spear.png similarity index 100% rename from icon/equipment/bone_spear.png rename to icon/equipment/main_hand/bone_spear.png diff --git a/icon/equipment/bone_sword.png b/icon/equipment/main_hand/bone_sword.png similarity index 100% rename from icon/equipment/bone_sword.png rename to icon/equipment/main_hand/bone_sword.png diff --git a/icon/equipment/bronze_axe.png b/icon/equipment/main_hand/bronze_axe.png similarity index 100% rename from icon/equipment/bronze_axe.png rename to icon/equipment/main_hand/bronze_axe.png diff --git a/icon/equipment/bronze_greatsword.png b/icon/equipment/main_hand/bronze_greatsword.png similarity index 100% rename from icon/equipment/bronze_greatsword.png rename to icon/equipment/main_hand/bronze_greatsword.png diff --git a/icon/equipment/bronze_mace.png b/icon/equipment/main_hand/bronze_mace.png similarity index 100% rename from icon/equipment/bronze_mace.png rename to icon/equipment/main_hand/bronze_mace.png diff --git a/icon/equipment/bronze_spear.png b/icon/equipment/main_hand/bronze_spear.png similarity index 100% rename from icon/equipment/bronze_spear.png rename to icon/equipment/main_hand/bronze_spear.png diff --git a/icon/equipment/bronze_sword.png b/icon/equipment/main_hand/bronze_sword.png similarity index 100% rename from icon/equipment/bronze_sword.png rename to icon/equipment/main_hand/bronze_sword.png diff --git a/icon/equipment/club.png b/icon/equipment/main_hand/club.png similarity index 100% rename from icon/equipment/club.png rename to icon/equipment/main_hand/club.png diff --git a/icon/equipment/crystal_bow.png b/icon/equipment/main_hand/crystal_bow.png similarity index 100% rename from icon/equipment/crystal_bow.png rename to icon/equipment/main_hand/crystal_bow.png diff --git a/icon/equipment/crystal_greatsword.png b/icon/equipment/main_hand/crystal_greatsword.png similarity index 100% rename from icon/equipment/crystal_greatsword.png rename to icon/equipment/main_hand/crystal_greatsword.png diff --git a/icon/equipment/crystal_mace.png b/icon/equipment/main_hand/crystal_mace.png similarity index 100% rename from icon/equipment/crystal_mace.png rename to icon/equipment/main_hand/crystal_mace.png diff --git a/icon/equipment/crystal_spear.png b/icon/equipment/main_hand/crystal_spear.png similarity index 100% rename from icon/equipment/crystal_spear.png rename to icon/equipment/main_hand/crystal_spear.png diff --git a/icon/equipment/crystal_sword.png b/icon/equipment/main_hand/crystal_sword.png similarity index 100% rename from icon/equipment/crystal_sword.png rename to icon/equipment/main_hand/crystal_sword.png diff --git a/icon/equipment/golden_axe.png b/icon/equipment/main_hand/golden_axe.png similarity index 100% rename from icon/equipment/golden_axe.png rename to icon/equipment/main_hand/golden_axe.png diff --git a/icon/equipment/golden_battleaxe.png b/icon/equipment/main_hand/golden_battleaxe.png similarity index 100% rename from icon/equipment/golden_battleaxe.png rename to icon/equipment/main_hand/golden_battleaxe.png diff --git a/icon/equipment/golden_bow.png b/icon/equipment/main_hand/golden_bow.png similarity index 100% rename from icon/equipment/golden_bow.png rename to icon/equipment/main_hand/golden_bow.png diff --git a/icon/equipment/golden_greatsword.png b/icon/equipment/main_hand/golden_greatsword.png similarity index 100% rename from icon/equipment/golden_greatsword.png rename to icon/equipment/main_hand/golden_greatsword.png diff --git a/icon/equipment/golden_sword.png b/icon/equipment/main_hand/golden_sword.png similarity index 100% rename from icon/equipment/golden_sword.png rename to icon/equipment/main_hand/golden_sword.png diff --git a/icon/equipment/iron_axe.png b/icon/equipment/main_hand/iron_axe.png similarity index 100% rename from icon/equipment/iron_axe.png rename to icon/equipment/main_hand/iron_axe.png diff --git a/icon/equipment/iron_bow.png b/icon/equipment/main_hand/iron_bow.png similarity index 100% rename from icon/equipment/iron_bow.png rename to icon/equipment/main_hand/iron_bow.png diff --git a/icon/equipment/iron_mace.png b/icon/equipment/main_hand/iron_mace.png similarity index 100% rename from icon/equipment/iron_mace.png rename to icon/equipment/main_hand/iron_mace.png diff --git a/icon/equipment/iron_spear.png b/icon/equipment/main_hand/iron_spear.png similarity index 100% rename from icon/equipment/iron_spear.png rename to icon/equipment/main_hand/iron_spear.png diff --git a/icon/equipment/iron_sword.png b/icon/equipment/main_hand/iron_sword.png similarity index 100% rename from icon/equipment/iron_sword.png rename to icon/equipment/main_hand/iron_sword.png diff --git a/icon/equipment/jade_axe.png b/icon/equipment/main_hand/jade_axe.png similarity index 100% rename from icon/equipment/jade_axe.png rename to icon/equipment/main_hand/jade_axe.png diff --git a/icon/equipment/jade_battleaxe.png b/icon/equipment/main_hand/jade_battleaxe.png similarity index 100% rename from icon/equipment/jade_battleaxe.png rename to icon/equipment/main_hand/jade_battleaxe.png diff --git a/icon/equipment/jade_greatsword.png b/icon/equipment/main_hand/jade_greatsword.png similarity index 100% rename from icon/equipment/jade_greatsword.png rename to icon/equipment/main_hand/jade_greatsword.png diff --git a/icon/equipment/jade_mace.png b/icon/equipment/main_hand/jade_mace.png similarity index 100% rename from icon/equipment/jade_mace.png rename to icon/equipment/main_hand/jade_mace.png diff --git a/icon/equipment/jade_spear.png b/icon/equipment/main_hand/jade_spear.png similarity index 100% rename from icon/equipment/jade_spear.png rename to icon/equipment/main_hand/jade_spear.png diff --git a/icon/equipment/jade_sword.png b/icon/equipment/main_hand/jade_sword.png similarity index 100% rename from icon/equipment/jade_sword.png rename to icon/equipment/main_hand/jade_sword.png diff --git a/icon/equipment/maul.png b/icon/equipment/main_hand/maul.png similarity index 100% rename from icon/equipment/maul.png rename to icon/equipment/main_hand/maul.png diff --git a/icon/equipment/mithril_axe.png b/icon/equipment/main_hand/mithril_axe.png similarity index 100% rename from icon/equipment/mithril_axe.png rename to icon/equipment/main_hand/mithril_axe.png diff --git a/icon/equipment/mithril_battleaxe.png b/icon/equipment/main_hand/mithril_battleaxe.png similarity index 100% rename from icon/equipment/mithril_battleaxe.png rename to icon/equipment/main_hand/mithril_battleaxe.png diff --git a/icon/equipment/mithril_bow.png b/icon/equipment/main_hand/mithril_bow.png similarity index 100% rename from icon/equipment/mithril_bow.png rename to icon/equipment/main_hand/mithril_bow.png diff --git a/icon/equipment/mithril_mace.png b/icon/equipment/main_hand/mithril_mace.png similarity index 100% rename from icon/equipment/mithril_mace.png rename to icon/equipment/main_hand/mithril_mace.png diff --git a/icon/equipment/mithril_spear.png b/icon/equipment/main_hand/mithril_spear.png similarity index 100% rename from icon/equipment/mithril_spear.png rename to icon/equipment/main_hand/mithril_spear.png diff --git a/icon/equipment/sledge_hammer.png b/icon/equipment/main_hand/sledge_hammer.png similarity index 100% rename from icon/equipment/sledge_hammer.png rename to icon/equipment/main_hand/sledge_hammer.png diff --git a/icon/equipment/spiked_club.png b/icon/equipment/main_hand/spiked_club.png similarity index 100% rename from icon/equipment/spiked_club.png rename to icon/equipment/main_hand/spiked_club.png diff --git a/icon/equipment/spiked_staff.png b/icon/equipment/main_hand/spiked_staff.png similarity index 100% rename from icon/equipment/spiked_staff.png rename to icon/equipment/main_hand/spiked_staff.png diff --git a/icon/equipment/staff.png b/icon/equipment/main_hand/staff.png similarity index 100% rename from icon/equipment/staff.png rename to icon/equipment/main_hand/staff.png diff --git a/icon/equipment/steel_battleaxe.png b/icon/equipment/main_hand/steel_battleaxe.png similarity index 100% rename from icon/equipment/steel_battleaxe.png rename to icon/equipment/main_hand/steel_battleaxe.png diff --git a/icon/equipment/steel_bow.png b/icon/equipment/main_hand/steel_bow.png similarity index 100% rename from icon/equipment/steel_bow.png rename to icon/equipment/main_hand/steel_bow.png diff --git a/icon/equipment/steel_greatsword.png b/icon/equipment/main_hand/steel_greatsword.png similarity index 100% rename from icon/equipment/steel_greatsword.png rename to icon/equipment/main_hand/steel_greatsword.png diff --git a/icon/equipment/steel_mace.png b/icon/equipment/main_hand/steel_mace.png similarity index 100% rename from icon/equipment/steel_mace.png rename to icon/equipment/main_hand/steel_mace.png diff --git a/icon/equipment/steel_sword.png b/icon/equipment/main_hand/steel_sword.png similarity index 100% rename from icon/equipment/steel_sword.png rename to icon/equipment/main_hand/steel_sword.png diff --git a/icon/equipment/wooden_bow.png b/icon/equipment/main_hand/wooden_bow.png similarity index 100% rename from icon/equipment/wooden_bow.png rename to icon/equipment/main_hand/wooden_bow.png diff --git a/icon/equipment/wooden_greatsword.png b/icon/equipment/main_hand/wooden_greatsword.png similarity index 100% rename from icon/equipment/wooden_greatsword.png rename to icon/equipment/main_hand/wooden_greatsword.png diff --git a/icon/equipment/wooden_sword.png b/icon/equipment/main_hand/wooden_sword.png similarity index 100% rename from icon/equipment/wooden_sword.png rename to icon/equipment/main_hand/wooden_sword.png diff --git a/icon/equipment/golden_necklace.png b/icon/equipment/neck/golden_necklace.png similarity index 100% rename from icon/equipment/golden_necklace.png rename to icon/equipment/neck/golden_necklace.png diff --git a/icon/equipment/bronze_shield.png b/icon/equipment/off_hand/bronze_shield.png similarity index 100% rename from icon/equipment/bronze_shield.png rename to icon/equipment/off_hand/bronze_shield.png diff --git a/icon/equipment/crystal_shield.png b/icon/equipment/off_hand/crystal_shield.png similarity index 100% rename from icon/equipment/crystal_shield.png rename to icon/equipment/off_hand/crystal_shield.png diff --git a/icon/equipment/golden_shield.png b/icon/equipment/off_hand/golden_shield.png similarity index 100% rename from icon/equipment/golden_shield.png rename to icon/equipment/off_hand/golden_shield.png diff --git a/icon/equipment/iron_shield.png b/icon/equipment/off_hand/iron_shield.png similarity index 100% rename from icon/equipment/iron_shield.png rename to icon/equipment/off_hand/iron_shield.png diff --git a/icon/equipment/mithril_shield.png b/icon/equipment/off_hand/mithril_shield.png similarity index 100% rename from icon/equipment/mithril_shield.png rename to icon/equipment/off_hand/mithril_shield.png diff --git a/icon/equipment/steel_shield.png b/icon/equipment/off_hand/steel_shield.png similarity index 100% rename from icon/equipment/steel_shield.png rename to icon/equipment/off_hand/steel_shield.png diff --git a/icon/equipment/wooden_shield.png b/icon/equipment/off_hand/wooden_shield.png similarity index 100% rename from icon/equipment/wooden_shield.png rename to icon/equipment/off_hand/wooden_shield.png diff --git a/source/attribute.adb b/source/attribute.adb index f4bdf57..19303d6 100644 --- a/source/attribute.adb +++ b/source/attribute.adb @@ -8,7 +8,7 @@ package body attribute is ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ - sprite : array (enumeration) of core.sprite; + icon : array (enumeration) of core.sprite; ------------------------------------------------------------------------------------------ @@ -29,9 +29,9 @@ package body attribute is ui.add_structure (data => structure); -- for index in enumeration loop - sprite (index) := core.import_sprite ("./sprite/attribute/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); + icon (index) := core.import_sprite (core.folder & "/icon/attribute/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); -- - ui.add_structure_button (icon => sprite (index), + ui.add_structure_button (icon => icon (index), name => trait (index).name, text => trait (index).text); end loop; @@ -45,7 +45,7 @@ package body attribute is move_x : integer := x; begin for index in enumeration loop - ui.draw_icon (sprite (index), trait (index).text, move_x, y); + ui.draw_icon (icon (index), trait (index).text, move_x, y); ui.draw_text_box (move_x, y + core.icon, core.icon, core.icon); ui.write (data (index)'image, move_x + 4, y + core.icon + 8, (255, 255, 255, 255), 15, true); -- diff --git a/source/chad.adb b/source/chad.adb index d098134..8c81a13 100644 --- a/source/chad.adb +++ b/source/chad.adb @@ -23,12 +23,12 @@ package body chad is begin core.echo (core.comment, "Configuring chad components..."); -- - pepe_the_frog := core.import_sprite ("./sprite/unit/pepe_the_frog.png", 4, 6); - alice_the_mad := core.import_sprite ("./sprite/unit/alice_the_mad.png", 4, 6); + pepe_the_frog := core.import_sprite (core.folder & "/unit/pepe_the_frog.png", 4, 6); + alice_the_mad := core.import_sprite (core.folder & "/unit/alice_the_mad.png", 4, 6); -- for index in enumeration loop - sprite (index) := core.import_sprite ("./sprite/chad/" & core.lowercase (enumeration'image (index)) & ".png", 4, 6); - view_sprite (index) := core.import_sprite ("./sprite/chad/view/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); + sprite (index) := core.import_sprite (core.folder & "/game/chad/" & core.lowercase (enumeration'image (index)) & ".png", 4, 6); + view_sprite (index) := core.import_sprite (core.folder & "/view/chad/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); null; end loop; end configure; diff --git a/source/construction.adb b/source/construction.adb index 3ba91b9..065ca3d 100644 --- a/source/construction.adb +++ b/source/construction.adb @@ -16,7 +16,7 @@ package body construction is declare folder : constant string := core.lowercase (faction.enumeration'image (trait (index).kind)); file : constant string := core.lowercase (enumeration'image (index)); begin - sprite (index) := core.import_sprite ("./sprite/construction/" & folder & "/" & file & ".png", trait (index).frames, 1); + sprite (index) := core.import_sprite (core.folder & "/game/construction/" & folder & "/" & file & ".png", trait (index).frames, 1); end; end loop; end configure; diff --git a/source/core.adb b/source/core.adb index bc96e59..69e46d3 100644 --- a/source/core.adb +++ b/source/core.adb @@ -428,7 +428,7 @@ package body core is echo (comment, "-- Initializing Raylib audio device data..."); ray.open_audio_device; -- - game_icon := ray.load_image (c_string ("./icon.png")); + game_icon := ray.load_image (c_string (folder & "/ui/game_icon.png")); -- ray.window_icon (game_icon); -- diff --git a/source/core.ads b/source/core.ads index 521b0dc..eaa35b9 100644 --- a/source/core.ads +++ b/source/core.ads @@ -70,6 +70,8 @@ package core is ------------------------------------------------------------------------------------------ + folder : constant string := "."; + icon : constant natural := 32; base : constant natural := 16; gameplay_framerate : constant natural := 60; diff --git a/source/deity.adb b/source/deity.adb index 9c5e58a..2a1cde1 100644 --- a/source/deity.adb +++ b/source/deity.adb @@ -17,7 +17,7 @@ package body deity is core.echo (core.comment, "Configuring deity components..."); -- for index in enumeration loop - sprite (index) := core.import_sprite ("./sprite/deity/" & enumeration'image (index) & ".png", 4, 1); + sprite (index) := core.import_sprite (core.folder & "/game/deity/" & enumeration'image (index) & ".png", 4, 1); end loop; end configure; diff --git a/source/equipment.adb b/source/equipment.adb index 6ab12da..85702b1 100644 --- a/source/equipment.adb +++ b/source/equipment.adb @@ -23,8 +23,8 @@ package body equipment is declare folder : constant string := core.lowercase (slot'image (trait (index).kind)); file : constant string := core.lowercase (enumeration'image (index)); begin - sprite (index) := core.import_sprite ("./sprite/equipment/" & folder & "/" & file & ".png", 4, 6); - icon_sprite (index) := core.import_sprite ("./sprite/equipment/icon/" & file & ".png", 1, 1); + sprite (index) := core.import_sprite (core.folder & "/game/equipment/" & folder & "/" & file & ".png", 4, 6); + icon_sprite (index) := core.import_sprite (core.folder & "/icon/equipment/" & folder & "/" & file & ".png", 1, 1); end; end loop; end configure; diff --git a/source/magic.adb b/source/magic.adb index d1c39b2..26fa14b 100644 --- a/source/magic.adb +++ b/source/magic.adb @@ -23,7 +23,7 @@ package body magic is declare folder : constant string := core.lowercase (school'image (trait (index).kind)); file : constant string := core.lowercase (enumeration'image (index)); begin - view_sprite (index) := core.import_sprite ("./sprite/magic/" & folder & "/" & file & ".png", 1, 1); + view_sprite (index) := core.import_sprite (core.folder & "/view/magic/" & folder & "/" & file & ".png", 1, 1); end; end loop; end configure; diff --git a/source/main.adb b/source/main.adb index f970533..e4df73a 100644 --- a/source/main.adb +++ b/source/main.adb @@ -146,42 +146,42 @@ procedure main is view_source_code : natural := 25; source_code : array (0 .. 35) of unbounded_string := ( - to_unbounded_string ("./source/ai.adb"), - to_unbounded_string ("./source/ai.ads"), - to_unbounded_string ("./source/attribute.adb"), - to_unbounded_string ("./source/attribute.ads"), - to_unbounded_string ("./source/chad.adb"), - to_unbounded_string ("./source/chad.ads"), - to_unbounded_string ("./source/construction.adb"), - to_unbounded_string ("./source/construction.ads"), - to_unbounded_string ("./source/core.adb"), - to_unbounded_string ("./source/core.ads"), - to_unbounded_string ("./source/deity.adb"), - to_unbounded_string ("./source/deity.ads"), - to_unbounded_string ("./source/effect.adb"), - to_unbounded_string ("./source/effect.ads"), - to_unbounded_string ("./source/equipment.adb"), - to_unbounded_string ("./source/equipment.ads"), - to_unbounded_string ("./source/faction.adb"), - to_unbounded_string ("./source/faction.ads"), - to_unbounded_string ("./source/magic.adb"), - to_unbounded_string ("./source/magic.ads"), - to_unbounded_string ("./source/main.adb"), - to_unbounded_string ("./source/material.adb"), - to_unbounded_string ("./source/material.ads"), - to_unbounded_string ("./source/might.adb"), - to_unbounded_string ("./source/might.ads"), - to_unbounded_string ("./source/ray.ads"), - to_unbounded_string ("./source/resource.adb"), - to_unbounded_string ("./source/resource.ads"), - to_unbounded_string ("./source/skill.adb"), - to_unbounded_string ("./source/skill.ads"), - to_unbounded_string ("./source/ui.adb"), - to_unbounded_string ("./source/ui.ads"), - to_unbounded_string ("./source/unit.adb"), - to_unbounded_string ("./source/unit.ads"), - to_unbounded_string ("./source/world.adb"), - to_unbounded_string ("./source/world.ads") + to_unbounded_string (folder & "/source/ai.adb"), + to_unbounded_string (folder & "/source/ai.ads"), + to_unbounded_string (folder & "/source/attribute.adb"), + to_unbounded_string (folder & "/source/attribute.ads"), + to_unbounded_string (folder & "/source/chad.adb"), + to_unbounded_string (folder & "/source/chad.ads"), + to_unbounded_string (folder & "/source/construction.adb"), + to_unbounded_string (folder & "/source/construction.ads"), + to_unbounded_string (folder & "/source/core.adb"), + to_unbounded_string (folder & "/source/core.ads"), + to_unbounded_string (folder & "/source/deity.adb"), + to_unbounded_string (folder & "/source/deity.ads"), + to_unbounded_string (folder & "/source/effect.adb"), + to_unbounded_string (folder & "/source/effect.ads"), + to_unbounded_string (folder & "/source/equipment.adb"), + to_unbounded_string (folder & "/source/equipment.ads"), + to_unbounded_string (folder & "/source/faction.adb"), + to_unbounded_string (folder & "/source/faction.ads"), + to_unbounded_string (folder & "/source/magic.adb"), + to_unbounded_string (folder & "/source/magic.ads"), + to_unbounded_string (folder & "/source/main.adb"), + to_unbounded_string (folder & "/source/material.adb"), + to_unbounded_string (folder & "/source/material.ads"), + to_unbounded_string (folder & "/source/might.adb"), + to_unbounded_string (folder & "/source/might.ads"), + to_unbounded_string (folder & "/source/ray.ads"), + to_unbounded_string (folder & "/source/resource.adb"), + to_unbounded_string (folder & "/source/resource.ads"), + to_unbounded_string (folder & "/source/skill.adb"), + to_unbounded_string (folder & "/source/skill.ads"), + to_unbounded_string (folder & "/source/ui.adb"), + to_unbounded_string (folder & "/source/ui.ads"), + to_unbounded_string (folder & "/source/unit.adb"), + to_unbounded_string (folder & "/source/unit.ads"), + to_unbounded_string (folder & "/source/world.adb"), + to_unbounded_string (folder & "/source/world.ads") ); ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -201,7 +201,7 @@ begin ui.configure; - play (import_song (c_string ("./song/main_menu.ogg")).index); + play (import_song (c_string (core.folder & "/song/main_menu.ogg")).index); attribute.configure; skill.configure; @@ -226,13 +226,13 @@ begin dash; for index in view loop - view_icon (index) := import_sprite ("./sprite/ui/icon/" & lowercase (view'image (index)) & ".png", 1, 1); + view_icon (index) := import_sprite (core.folder & "/icon/engine/" & lowercase (view'image (index)) & ".png", 1, 1); end loop; - game_title := import_sprite ("./sprite/game_title.png", 1, 1); + game_title := import_sprite (core.folder & "/ui/game_title.png", 1, 1); for index in world.biome loop - game_preview (index) := import_sprite ("./sprite/" & lowercase (world.biome'image (index)) & "land_preview.png", 1, 1); + game_preview (index) := import_sprite (core.folder & "/ui/preview/" & lowercase (world.biome'image (index)) & "land.png", 1, 1); end loop; ------------------------------------------------------------------------------------------ @@ -335,7 +335,7 @@ begin ui.synchronize; end loop gameplay_loop; - --~world.mapshot ("./test.png"); + --~world.mapshot (folder & "/test.png"); ------------------------------------------------------------------------------------------ diff --git a/source/material.adb b/source/material.adb index d8764ca..8f8650b 100644 --- a/source/material.adb +++ b/source/material.adb @@ -17,7 +17,7 @@ package body material is core.echo (core.comment, "Configuring material components..."); -- for index in enumeration loop - sprite (index) := core.import_sprite ("./sprite/material/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); + sprite (index) := core.import_sprite (core.folder & "/game/material/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); end loop; end configure; diff --git a/source/might.adb b/source/might.adb index 5ed0178..41ef6c3 100644 --- a/source/might.adb +++ b/source/might.adb @@ -8,8 +8,8 @@ package body might is ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ - view_width : constant integer := 90; - view_height : constant integer := 90; + view_width : constant integer := 64; + view_height : constant integer := 64; view_sprite : array (enumeration) of core.sprite; icon_sprite : array (enumeration) of core.sprite; @@ -24,8 +24,8 @@ package body might is declare folder : constant string := core.lowercase (school'image (trait (index).kind)); file : constant string := core.lowercase (enumeration'image (index)); begin - view_sprite (index) := core.import_sprite ("./sprite/might/" & folder & "/" & file & ".png", 1, 1); - icon_sprite (index) := core.import_sprite ("./sprite/might/icon/" & file & ".png", 1, 1); + view_sprite (index) := core.import_sprite (core.folder & "/view/might/" & folder & "/" & file & ".png", 1, 1); + icon_sprite (index) := core.import_sprite (core.folder & "/icon/might/" & folder & "/" & file & ".png", 1, 1); end; end loop; end configure; diff --git a/source/resource.adb b/source/resource.adb index 4b641d3..221e4e4 100644 --- a/source/resource.adb +++ b/source/resource.adb @@ -29,7 +29,7 @@ package body resource is ui.add_structure (structure); -- for index in enumeration loop - sprite (index) := core.import_sprite ("./sprite/resource/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); + sprite (index) := core.import_sprite (core.folder & "/icon/resource/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); -- ui.add_structure_button (sprite (index), trait (index).name, trait (index).text); end loop; diff --git a/source/skill.adb b/source/skill.adb index 5e56f04..2e4c087 100644 --- a/source/skill.adb +++ b/source/skill.adb @@ -29,7 +29,7 @@ package body skill is ui.add_structure (structure); -- for index in enumeration loop - sprite (index) := core.import_sprite ("./sprite/skill/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); + sprite (index) := core.import_sprite (core.folder & "/icon/skill/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); -- if enumeration'pos (index) = 9 then ui.add_structure_orient; diff --git a/source/ui.adb b/source/ui.adb index d82b598..21ffdc2 100644 --- a/source/ui.adb +++ b/source/ui.adb @@ -219,14 +219,14 @@ package body ui is procedure configure is procedure load_ui (index : in style; folder_path : in string) is begin - font (index) := core.import_font ("./sprite/ui/" & folder_path & "/font.png", 24, 0); + font (index) := core.import_font (core.folder & "/ui/" & folder_path & "/font.png", 24, 0); -- for this in element loop - sprite (index, this) := core.import_sprite ("./sprite/ui/" & folder_path & "/" & core.lowercase (element'image (this)) & ".png", 1, 1); + sprite (index, this) := core.import_sprite (core.folder & "/ui/" & folder_path & "/" & core.lowercase (element'image (this)) & ".png", 1, 1); end loop; end load_ui; begin - monospace := core.import_font ("./sprite/ui/monospace.png", 15, 0); + monospace := core.import_font (core.folder & "/ui/monospace.png", 15, 0); -- core.echo (core.comment, "Configuring UI components..."); -- diff --git a/source/unit.adb b/source/unit.adb index 06e335f..4baac25 100644 --- a/source/unit.adb +++ b/source/unit.adb @@ -25,9 +25,9 @@ package body unit is declare folder : constant string := core.lowercase (faction.enumeration'image (trait (index).kind)); file : constant string := core.lowercase (enumeration'image (index)); begin - sprite (index) := core.import_sprite ("./sprite/unit/" & folder & "/" & file & ".png", 4, 6); - icon_sprite (index) := core.import_sprite ("./sprite/unit/icon/" & file & ".png", 1, 1); - view_sprite (index) := core.import_sprite ("./sprite/unit/view/" & file & ".png", 1, 1); + sprite (index) := core.import_sprite (core.folder & "/game/unit/" & folder & "/" & file & ".png", 4, 6); + --~icon_sprite (index) := core.import_sprite (core.folder & "/icon/unit/" & folder & "/" & file & ".png", 1, 1); + --~view_sprite (index) := core.import_sprite (core.folder & "/view/unit/" & folder & "/" & file & ".png", 1, 1); end; end loop; end configure; diff --git a/source/world.adb b/source/world.adb index 1f7e029..69d378a 100644 --- a/source/world.adb +++ b/source/world.adb @@ -32,21 +32,21 @@ package body world is begin core.echo (core.comment, "Configuring world components..."); -- - tiles := core.import_sprite ("./sprite/world/terrain/terrain.png", 1, 1); - dark := core.import_sprite ("./sprite/world/dark.png", 1, 1); - border_upper := core.import_sprite ("./sprite/world/frame/border_upper.png", 1, 1); - border_lower := core.import_sprite ("./sprite/world/frame/border_lower.png", 1, 1); - border_left := core.import_sprite ("./sprite/world/frame/border_left.png", 1, 1); - border_right := core.import_sprite ("./sprite/world/frame/border_right.png", 1, 1); - corner_upper_left := core.import_sprite ("./sprite/world/frame/corner_upper_left.png", 1, 1); - corner_upper_right := core.import_sprite ("./sprite/world/frame/corner_upper_right.png", 1, 1); - corner_lower_left := core.import_sprite ("./sprite/world/frame/corner_lower_left.png", 1, 1); - corner_lower_right := core.import_sprite ("./sprite/world/frame/corner_lower_right.png", 1, 1); + tiles := core.import_sprite (core.folder & "/game/world/terrain/terrain.png", 1, 1); + dark := core.import_sprite (core.folder & "/game/world/dark.png", 1, 1); + border_upper := core.import_sprite (core.folder & "/game/world/frame/border_upper.png", 1, 1); + border_lower := core.import_sprite (core.folder & "/game/world/frame/border_lower.png", 1, 1); + border_left := core.import_sprite (core.folder & "/game/world/frame/border_left.png", 1, 1); + border_right := core.import_sprite (core.folder & "/game/world/frame/border_right.png", 1, 1); + corner_upper_left := core.import_sprite (core.folder & "/game/world/frame/corner_upper_left.png", 1, 1); + corner_upper_right := core.import_sprite (core.folder & "/game/world/frame/corner_upper_right.png", 1, 1); + corner_lower_left := core.import_sprite (core.folder & "/game/world/frame/corner_lower_left.png", 1, 1); + corner_lower_right := core.import_sprite (core.folder & "/game/world/frame/corner_lower_right.png", 1, 1); -- for index in landmark_index loop declare file : constant string := core.lowercase (index'image); begin - landmarks (index) := core.import_sprite ("./sprite/world/landmark/" & file & ".png", trait (index).frames, 1); + landmarks (index) := core.import_sprite (core.folder & "/game/world/landmark/" & file & ".png", trait (index).frames, 1); end; end loop; end configure; diff --git a/ui/ashland_preview.png b/ui/preview/ashland.png similarity index 100% rename from ui/ashland_preview.png rename to ui/preview/ashland.png diff --git a/ui/grassland_preview.png b/ui/preview/grassland.png similarity index 100% rename from ui/grassland_preview.png rename to ui/preview/grassland.png diff --git a/ui/roughland_preview.png b/ui/preview/roughland.png similarity index 100% rename from ui/roughland_preview.png rename to ui/preview/roughland.png diff --git a/ui/sandland_preview.png b/ui/preview/sandland.png similarity index 100% rename from ui/sandland_preview.png rename to ui/preview/sandland.png diff --git a/ui/snowland_preview.png b/ui/preview/snowland.png similarity index 100% rename from ui/snowland_preview.png rename to ui/preview/snowland.png diff --git a/ui/swampland_preview.png b/ui/preview/swampland.png similarity index 100% rename from ui/swampland_preview.png rename to ui/preview/swampland.png