From 021157e4e631b52dd408489f8460091fabcf4981 Mon Sep 17 00:00:00 2001 From: xolatile Date: Tue, 4 Jun 2024 07:36:56 -0400 Subject: [PATCH] Refactored Equipment package, saved 30+ KiB of game executable file. --- source/equipment.ads | 284 +++++++++++++++++++++++++-------------------------- source/main.adb | 2 +- source/world.adb | 2 +- 3 files changed, 143 insertions(+), 145 deletions(-) diff --git a/source/equipment.ads b/source/equipment.ads index f2dc167..232c16f 100644 --- a/source/equipment.ads +++ b/source/equipment.ads @@ -4,8 +4,6 @@ with core, effect, attribute, faction; -use core; - package equipment is ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -45,11 +43,11 @@ package equipment is ------------------------------------------------------------------------------------------ type definition is record - name : core.unstring; - kind : slot; - attributes : attribute.bonus; - favor : faction.enumeration; - evoke : effect.information; + name : access string; + kind : slot; + attributes : attribute.bonus; + favor : faction.enumeration; + evoke : effect.information; end record; type equip_array is array (slot) of enumeration; @@ -59,142 +57,142 @@ package equipment is count : constant natural := enumeration'pos (enumeration'last) + 1; description : constant array (enumeration) of definition := ( - none => (+("--"), full_body, (others => 0), faction.neutral, effect.none), - bone_chestplate => (+("Bone Chestplate"), chest, (others => 0), faction.neutral, effect.none), - bronze_chestplate => (+("Bronze Chestplate"), chest, (others => 0), faction.neutral, effect.none), - chainmail_chestplate => (+("Chainmail Chestplate"), chest, (others => 0), faction.neutral, effect.none), - crystal_chestplate => (+("Crystal Chestplate"), chest, (others => 0), faction.neutral, effect.none), - golden_chestplate => (+("Golden Chestplate"), chest, (others => 0), faction.neutral, effect.none), - iron_chestplate => (+("Iron Chestplate"), chest, (others => 0), faction.neutral, effect.none), - leather_chestplate => (+("Leather Chestplate"), chest, (others => 0), faction.neutral, effect.none), - mithril_chestplate => (+("Mithril Chestplate"), chest, (others => 0), faction.neutral, effect.none), - steel_chestplate => (+("Steel Chestplate"), chest, (others => 0), faction.neutral, effect.none), - bone_greaves => (+("Bone Greaves"), feet, (others => 0), faction.neutral, effect.none), - bronze_greaves => (+("Bronze Greaves"), feet, (others => 0), faction.neutral, effect.none), - chainmail_greaves => (+("Chainmail Greaves"), feet, (others => 0), faction.neutral, effect.none), - crystal_greaves => (+("Crystal Greaves"), feet, (others => 0), faction.neutral, effect.none), - golden_greaves => (+("Golden Greaves"), feet, (others => 0), faction.neutral, effect.none), - iron_greaves => (+("Iron Greaves"), feet, (others => 0), faction.neutral, effect.none), - leather_greaves => (+("Leather Greaves"), feet, (others => 0), faction.neutral, effect.none), - mithril_greaves => (+("Mithril Greaves"), feet, (others => 0), faction.neutral, effect.none), - steel_greaves => (+("Steel Greaves"), feet, (others => 0), faction.neutral, effect.none), - black_tunic => (+("Black Tunic"), full_body, (others => 0), faction.neutral, effect.none), - blue_tunic => (+("Blue Tunic"), full_body, (others => 0), faction.neutral, effect.none), - cyan_tunic => (+("Cyan Tunic"), full_body, (others => 0), faction.neutral, effect.none), - green_tunic => (+("Green Tunic"), full_body, (others => 0), faction.neutral, effect.none), - grey_tunic => (+("Grey Tunic"), full_body, (others => 0), faction.neutral, effect.none), - lime_tunic => (+("Lime Tunic"), full_body, (others => 0), faction.neutral, effect.none), - orange_tunic => (+("Orange Tunic"), full_body, (others => 0), faction.neutral, effect.none), - pink_tunic => (+("Pink Tunic"), full_body, (others => 0), faction.neutral, effect.none), - purple_tunic => (+("Purple Tunic"), full_body, (others => 0), faction.neutral, effect.none), - red_tunic => (+("Red Tunic"), full_body, (others => 0), faction.neutral, effect.none), - white_tunic => (+("White Tunic"), full_body, (others => 0), faction.neutral, effect.none), - yellow_tunic => (+("Yellow Tunic"), full_body, (others => 0), faction.neutral, effect.none), - bone_gauntlets => (+("Bone Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - bronze_gauntlets => (+("Bronze Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - chainmail_gauntlets => (+("Chainmail Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - crystal_gauntlets => (+("Crystal Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - golden_gauntlets => (+("Golden Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - iron_gauntlets => (+("Iron Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - leather_gauntlets => (+("Leather Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - mithril_gauntlets => (+("Mithril Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - steel_gauntlets => (+("Steel Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - bone_helmet => (+("Bone Helmet"), head, (others => 0), faction.neutral, effect.none), - bronze_helmet => (+("Bronze Helmet"), head, (others => 0), faction.neutral, effect.none), - chainmail_helmet => (+("Chainmail Helmet"), head, (others => 0), faction.neutral, effect.none), - crystal_helmet => (+("Crystal Helmet"), head, (others => 0), faction.neutral, effect.none), - golden_helmet => (+("Golden Helmet"), head, (others => 0), faction.neutral, effect.none), - iron_helmet => (+("Iron Helmet"), head, (others => 0), faction.neutral, effect.none), - leather_helmet => (+("Leather Helmet"), head, (others => 0), faction.neutral, effect.none), - mithril_helmet => (+("Mithril Helmet"), head, (others => 0), faction.neutral, effect.none), - steel_helmet => (+("Steel Helmet"), head, (others => 0), faction.neutral, effect.none), - bone_axe => (+("Bone Axe"), main_hand, (others => 0), faction.neutral, effect.none), - bone_battleaxe => (+("Bone Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), - bone_bow => (+("Bone Bow"), main_hand, (others => 0), faction.neutral, effect.none), - bone_mace => (+("Bone Mace"), main_hand, (others => 0), faction.neutral, effect.none), - bone_spear => (+("Bone Spear"), main_hand, (others => 0), faction.neutral, effect.none), - bone_sword => (+("Bone Sword"), main_hand, (others => 0), faction.neutral, effect.none), - bronze_axe => (+("Bronze Axe"), main_hand, (others => 0), faction.neutral, effect.none), - bronze_greatsword => (+("Bronze Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), - bronze_mace => (+("Bronze Mace"), main_hand, (others => 0), faction.neutral, effect.none), - bronze_spear => (+("Bronze Spear"), main_hand, (others => 0), faction.neutral, effect.none), - bronze_sword => (+("Bronze Sword"), main_hand, (others => 0), faction.neutral, effect.none), - club => (+("Club"), main_hand, (others => 0), faction.neutral, effect.none), - crystal_bow => (+("Crystal Bow"), main_hand, (others => 0), faction.neutral, effect.none), - crystal_greatsword => (+("Crystal Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), - crystal_mace => (+("Crystal Mace"), main_hand, (others => 0), faction.neutral, effect.none), - crystal_spear => (+("Crystal Spear"), main_hand, (others => 0), faction.neutral, effect.none), - crystal_sword => (+("Crystal Sword"), main_hand, (others => 0), faction.neutral, effect.none), - golden_axe => (+("Golden Axe"), main_hand, (others => 0), faction.neutral, effect.none), - golden_battleaxe => (+("Golden Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), - golden_bow => (+("Golden Bow"), main_hand, (others => 0), faction.neutral, effect.none), - golden_greatsword => (+("Golden Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), - golden_sword => (+("Golden Sword"), main_hand, (others => 0), faction.neutral, effect.none), - iron_axe => (+("Iron Axe"), main_hand, (others => 0), faction.neutral, effect.none), - iron_bow => (+("Iron Bow"), main_hand, (others => 0), faction.neutral, effect.none), - iron_mace => (+("Iron Mace"), main_hand, (others => 0), faction.neutral, effect.none), - iron_spear => (+("Iron Spear"), main_hand, (others => 0), faction.neutral, effect.none), - iron_sword => (+("Iron Sword"), main_hand, (others => 0), faction.neutral, effect.none), - jade_axe => (+("Jade Axe"), main_hand, (others => 0), faction.neutral, effect.none), - jade_battleaxe => (+("Jade Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), - jade_greatsword => (+("Jade Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), - jade_mace => (+("Jade Mace"), main_hand, (others => 0), faction.neutral, effect.none), - jade_spear => (+("Jade Spear"), main_hand, (others => 0), faction.neutral, effect.none), - jade_sword => (+("Jade Sword"), main_hand, (others => 0), faction.neutral, effect.none), - maul => (+("Maul"), main_hand, (others => 0), faction.neutral, effect.none), - mithril_axe => (+("Mithril Axe"), main_hand, (others => 0), faction.neutral, effect.none), - mithril_battleaxe => (+("Mithril Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), - mithril_bow => (+("Mithril Bow"), main_hand, (others => 0), faction.neutral, effect.none), - mithril_mace => (+("Mithril Mace"), main_hand, (others => 0), faction.neutral, effect.none), - mithril_spear => (+("Mithril Spear"), main_hand, (others => 0), faction.neutral, effect.none), - sledge_hammer => (+("Sledge Hammer"), main_hand, (others => 0), faction.neutral, effect.none), - spiked_club => (+("Spiked Club"), main_hand, (others => 0), faction.neutral, effect.none), - spiked_staff => (+("Spiked Staff"), main_hand, (others => 0), faction.neutral, effect.none), - staff => (+("Staff"), main_hand, (others => 0), faction.neutral, effect.none), - steel_battleaxe => (+("Steel Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), - steel_bow => (+("Steel Bow"), main_hand, (others => 0), faction.neutral, effect.none), - steel_greatsword => (+("Steel Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), - steel_mace => (+("Steel Mace"), main_hand, (others => 0), faction.neutral, effect.none), - steel_sword => (+("Steel Sword"), main_hand, (others => 0), faction.neutral, effect.none), - wooden_bow => (+("Wooden Bow"), main_hand, (others => 0), faction.neutral, effect.none), - wooden_greatsword => (+("Wooden Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), - wooden_sword => (+("Wooden Sword"), main_hand, (others => 0), faction.neutral, effect.none), - golden_necklace => (+("Golden Necklace"), neck, (others => 0), faction.neutral, effect.none), - bronze_shield => (+("Bronze Shield"), off_hand, (others => 0), faction.neutral, effect.none), - crystal_shield => (+("Crystal Shield"), off_hand, (others => 0), faction.neutral, effect.none), - golden_shield => (+("Golden Shield"), off_hand, (others => 0), faction.neutral, effect.none), - iron_shield => (+("Iron Shield"), off_hand, (others => 0), faction.neutral, effect.none), - mithril_shield => (+("Mithril Shield"), off_hand, (others => 0), faction.neutral, effect.none), - steel_shield => (+("Steel Shield"), off_hand, (others => 0), faction.neutral, effect.none), - wooden_shield => (+("Wooden Shield"), off_hand, (others => 0), faction.neutral, effect.none), - wooden_armour => (+("Wooden Armour"), chest, (others => 0), faction.neutral, effect.none), - fur_armour => (+("Fur Armour"), chest, (others => 0), faction.neutral, effect.none), - fur_greaves => (+("Fur Greaves"), feet, (others => 0), faction.neutral, effect.none), - fur_gauntlets => (+("Fur Gauntlets"), hands, (others => 0), faction.neutral, effect.none), - red_hood => (+("Red Hood"), head, (others => 0), faction.neutral, effect.none), - white_hood => (+("White Hood"), head, (others => 0), faction.neutral, effect.none), - wooden_helmet => (+("Wooden Helmet"), head, (others => 0), faction.neutral, effect.none), - human_helmet => (+("Human Helmet"), head, (others => 0), faction.neutral, effect.none), - human_armour => (+("Human Armour"), chest, (others => 0), faction.neutral, effect.none), - elven_helmet => (+("Elven Helmet"), head, (others => 0), faction.neutral, effect.none), - elven_armour => (+("Elven Armour"), chest, (others => 0), faction.neutral, effect.none), - orcish_helmet => (+("Orcish Helmet"), head, (others => 0), faction.neutral, effect.none), - orcish_armour => (+("Orcish Armour"), chest, (others => 0), faction.neutral, effect.none), - black_robe => (+("Black Robe"), full_body, (others => 0), faction.neutral, effect.none), - cyan_robe => (+("Cyan Robe"), full_body, (others => 0), faction.neutral, effect.none), - lime_dress => (+("Lime Dress"), full_body, (others => 0), faction.neutral, effect.none), - magenta_dress => (+("Magenta Dress"), full_body, (others => 0), faction.neutral, effect.none), - orange_robe => (+("Orange Robe"), full_body, (others => 0), faction.neutral, effect.none), - pink_dress => (+("Pink Dress"), full_body, (others => 0), faction.neutral, effect.none), - red_robe => (+("Red Robe"), full_body, (others => 0), faction.neutral, effect.none), - sexy_dress => (+("Sexy Dress"), full_body, (others => 0), faction.neutral, effect.none), - white_robe => (+("White Robe"), full_body, (others => 0), faction.neutral, effect.none), - lime_robe => (+("Lime Robe"), full_body, (others => 0), faction.neutral, effect.none), - orange_hood => (+("Orange Hood"), head, (others => 0), faction.neutral, effect.none), - fur_helmet => (+("Fur Helmet"), head, (others => 0), faction.neutral, effect.none), - black_hood => (+("Black Hood"), head, (others => 0), faction.neutral, effect.none), - cyan_hood => (+("Cyan Hood"), head, (others => 0), faction.neutral, effect.none), - lime_hood => (+("Lime Hood"), head, (others => 0), faction.neutral, effect.none) + none => (new string' ("--"), full_body, (others => 0), faction.neutral, effect.none), + bone_chestplate => (new string' ("Bone Chestplate"), chest, (others => 0), faction.neutral, effect.none), + bronze_chestplate => (new string' ("Bronze Chestplate"), chest, (others => 0), faction.neutral, effect.none), + chainmail_chestplate => (new string' ("Chainmail Chestplate"), chest, (others => 0), faction.neutral, effect.none), + crystal_chestplate => (new string' ("Crystal Chestplate"), chest, (others => 0), faction.neutral, effect.none), + golden_chestplate => (new string' ("Golden Chestplate"), chest, (others => 0), faction.neutral, effect.none), + iron_chestplate => (new string' ("Iron Chestplate"), chest, (others => 0), faction.neutral, effect.none), + leather_chestplate => (new string' ("Leather Chestplate"), chest, (others => 0), faction.neutral, effect.none), + mithril_chestplate => (new string' ("Mithril Chestplate"), chest, (others => 0), faction.neutral, effect.none), + steel_chestplate => (new string' ("Steel Chestplate"), chest, (others => 0), faction.neutral, effect.none), + bone_greaves => (new string' ("Bone Greaves"), feet, (others => 0), faction.neutral, effect.none), + bronze_greaves => (new string' ("Bronze Greaves"), feet, (others => 0), faction.neutral, effect.none), + chainmail_greaves => (new string' ("Chainmail Greaves"), feet, (others => 0), faction.neutral, effect.none), + crystal_greaves => (new string' ("Crystal Greaves"), feet, (others => 0), faction.neutral, effect.none), + golden_greaves => (new string' ("Golden Greaves"), feet, (others => 0), faction.neutral, effect.none), + iron_greaves => (new string' ("Iron Greaves"), feet, (others => 0), faction.neutral, effect.none), + leather_greaves => (new string' ("Leather Greaves"), feet, (others => 0), faction.neutral, effect.none), + mithril_greaves => (new string' ("Mithril Greaves"), feet, (others => 0), faction.neutral, effect.none), + steel_greaves => (new string' ("Steel Greaves"), feet, (others => 0), faction.neutral, effect.none), + black_tunic => (new string' ("Black Tunic"), full_body, (others => 0), faction.neutral, effect.none), + blue_tunic => (new string' ("Blue Tunic"), full_body, (others => 0), faction.neutral, effect.none), + cyan_tunic => (new string' ("Cyan Tunic"), full_body, (others => 0), faction.neutral, effect.none), + green_tunic => (new string' ("Green Tunic"), full_body, (others => 0), faction.neutral, effect.none), + grey_tunic => (new string' ("Grey Tunic"), full_body, (others => 0), faction.neutral, effect.none), + lime_tunic => (new string' ("Lime Tunic"), full_body, (others => 0), faction.neutral, effect.none), + orange_tunic => (new string' ("Orange Tunic"), full_body, (others => 0), faction.neutral, effect.none), + pink_tunic => (new string' ("Pink Tunic"), full_body, (others => 0), faction.neutral, effect.none), + purple_tunic => (new string' ("Purple Tunic"), full_body, (others => 0), faction.neutral, effect.none), + red_tunic => (new string' ("Red Tunic"), full_body, (others => 0), faction.neutral, effect.none), + white_tunic => (new string' ("White Tunic"), full_body, (others => 0), faction.neutral, effect.none), + yellow_tunic => (new string' ("Yellow Tunic"), full_body, (others => 0), faction.neutral, effect.none), + bone_gauntlets => (new string' ("Bone Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + bronze_gauntlets => (new string' ("Bronze Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + chainmail_gauntlets => (new string' ("Chainmail Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + crystal_gauntlets => (new string' ("Crystal Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + golden_gauntlets => (new string' ("Golden Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + iron_gauntlets => (new string' ("Iron Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + leather_gauntlets => (new string' ("Leather Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + mithril_gauntlets => (new string' ("Mithril Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + steel_gauntlets => (new string' ("Steel Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + bone_helmet => (new string' ("Bone Helmet"), head, (others => 0), faction.neutral, effect.none), + bronze_helmet => (new string' ("Bronze Helmet"), head, (others => 0), faction.neutral, effect.none), + chainmail_helmet => (new string' ("Chainmail Helmet"), head, (others => 0), faction.neutral, effect.none), + crystal_helmet => (new string' ("Crystal Helmet"), head, (others => 0), faction.neutral, effect.none), + golden_helmet => (new string' ("Golden Helmet"), head, (others => 0), faction.neutral, effect.none), + iron_helmet => (new string' ("Iron Helmet"), head, (others => 0), faction.neutral, effect.none), + leather_helmet => (new string' ("Leather Helmet"), head, (others => 0), faction.neutral, effect.none), + mithril_helmet => (new string' ("Mithril Helmet"), head, (others => 0), faction.neutral, effect.none), + steel_helmet => (new string' ("Steel Helmet"), head, (others => 0), faction.neutral, effect.none), + bone_axe => (new string' ("Bone Axe"), main_hand, (others => 0), faction.neutral, effect.none), + bone_battleaxe => (new string' ("Bone Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), + bone_bow => (new string' ("Bone Bow"), main_hand, (others => 0), faction.neutral, effect.none), + bone_mace => (new string' ("Bone Mace"), main_hand, (others => 0), faction.neutral, effect.none), + bone_spear => (new string' ("Bone Spear"), main_hand, (others => 0), faction.neutral, effect.none), + bone_sword => (new string' ("Bone Sword"), main_hand, (others => 0), faction.neutral, effect.none), + bronze_axe => (new string' ("Bronze Axe"), main_hand, (others => 0), faction.neutral, effect.none), + bronze_greatsword => (new string' ("Bronze Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), + bronze_mace => (new string' ("Bronze Mace"), main_hand, (others => 0), faction.neutral, effect.none), + bronze_spear => (new string' ("Bronze Spear"), main_hand, (others => 0), faction.neutral, effect.none), + bronze_sword => (new string' ("Bronze Sword"), main_hand, (others => 0), faction.neutral, effect.none), + club => (new string' ("Club"), main_hand, (others => 0), faction.neutral, effect.none), + crystal_bow => (new string' ("Crystal Bow"), main_hand, (others => 0), faction.neutral, effect.none), + crystal_greatsword => (new string' ("Crystal Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), + crystal_mace => (new string' ("Crystal Mace"), main_hand, (others => 0), faction.neutral, effect.none), + crystal_spear => (new string' ("Crystal Spear"), main_hand, (others => 0), faction.neutral, effect.none), + crystal_sword => (new string' ("Crystal Sword"), main_hand, (others => 0), faction.neutral, effect.none), + golden_axe => (new string' ("Golden Axe"), main_hand, (others => 0), faction.neutral, effect.none), + golden_battleaxe => (new string' ("Golden Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), + golden_bow => (new string' ("Golden Bow"), main_hand, (others => 0), faction.neutral, effect.none), + golden_greatsword => (new string' ("Golden Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), + golden_sword => (new string' ("Golden Sword"), main_hand, (others => 0), faction.neutral, effect.none), + iron_axe => (new string' ("Iron Axe"), main_hand, (others => 0), faction.neutral, effect.none), + iron_bow => (new string' ("Iron Bow"), main_hand, (others => 0), faction.neutral, effect.none), + iron_mace => (new string' ("Iron Mace"), main_hand, (others => 0), faction.neutral, effect.none), + iron_spear => (new string' ("Iron Spear"), main_hand, (others => 0), faction.neutral, effect.none), + iron_sword => (new string' ("Iron Sword"), main_hand, (others => 0), faction.neutral, effect.none), + jade_axe => (new string' ("Jade Axe"), main_hand, (others => 0), faction.neutral, effect.none), + jade_battleaxe => (new string' ("Jade Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), + jade_greatsword => (new string' ("Jade Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), + jade_mace => (new string' ("Jade Mace"), main_hand, (others => 0), faction.neutral, effect.none), + jade_spear => (new string' ("Jade Spear"), main_hand, (others => 0), faction.neutral, effect.none), + jade_sword => (new string' ("Jade Sword"), main_hand, (others => 0), faction.neutral, effect.none), + maul => (new string' ("Maul"), main_hand, (others => 0), faction.neutral, effect.none), + mithril_axe => (new string' ("Mithril Axe"), main_hand, (others => 0), faction.neutral, effect.none), + mithril_battleaxe => (new string' ("Mithril Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), + mithril_bow => (new string' ("Mithril Bow"), main_hand, (others => 0), faction.neutral, effect.none), + mithril_mace => (new string' ("Mithril Mace"), main_hand, (others => 0), faction.neutral, effect.none), + mithril_spear => (new string' ("Mithril Spear"), main_hand, (others => 0), faction.neutral, effect.none), + sledge_hammer => (new string' ("Sledge Hammer"), main_hand, (others => 0), faction.neutral, effect.none), + spiked_club => (new string' ("Spiked Club"), main_hand, (others => 0), faction.neutral, effect.none), + spiked_staff => (new string' ("Spiked Staff"), main_hand, (others => 0), faction.neutral, effect.none), + staff => (new string' ("Staff"), main_hand, (others => 0), faction.neutral, effect.none), + steel_battleaxe => (new string' ("Steel Battleaxe"), main_hand, (others => 0), faction.neutral, effect.none), + steel_bow => (new string' ("Steel Bow"), main_hand, (others => 0), faction.neutral, effect.none), + steel_greatsword => (new string' ("Steel Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), + steel_mace => (new string' ("Steel Mace"), main_hand, (others => 0), faction.neutral, effect.none), + steel_sword => (new string' ("Steel Sword"), main_hand, (others => 0), faction.neutral, effect.none), + wooden_bow => (new string' ("Wooden Bow"), main_hand, (others => 0), faction.neutral, effect.none), + wooden_greatsword => (new string' ("Wooden Greatsword"), main_hand, (others => 0), faction.neutral, effect.none), + wooden_sword => (new string' ("Wooden Sword"), main_hand, (others => 0), faction.neutral, effect.none), + golden_necklace => (new string' ("Golden Necklace"), neck, (others => 0), faction.neutral, effect.none), + bronze_shield => (new string' ("Bronze Shield"), off_hand, (others => 0), faction.neutral, effect.none), + crystal_shield => (new string' ("Crystal Shield"), off_hand, (others => 0), faction.neutral, effect.none), + golden_shield => (new string' ("Golden Shield"), off_hand, (others => 0), faction.neutral, effect.none), + iron_shield => (new string' ("Iron Shield"), off_hand, (others => 0), faction.neutral, effect.none), + mithril_shield => (new string' ("Mithril Shield"), off_hand, (others => 0), faction.neutral, effect.none), + steel_shield => (new string' ("Steel Shield"), off_hand, (others => 0), faction.neutral, effect.none), + wooden_shield => (new string' ("Wooden Shield"), off_hand, (others => 0), faction.neutral, effect.none), + wooden_armour => (new string' ("Wooden Armour"), chest, (others => 0), faction.neutral, effect.none), + fur_armour => (new string' ("Fur Armour"), chest, (others => 0), faction.neutral, effect.none), + fur_greaves => (new string' ("Fur Greaves"), feet, (others => 0), faction.neutral, effect.none), + fur_gauntlets => (new string' ("Fur Gauntlets"), hands, (others => 0), faction.neutral, effect.none), + red_hood => (new string' ("Red Hood"), head, (others => 0), faction.neutral, effect.none), + white_hood => (new string' ("White Hood"), head, (others => 0), faction.neutral, effect.none), + wooden_helmet => (new string' ("Wooden Helmet"), head, (others => 0), faction.neutral, effect.none), + human_helmet => (new string' ("Human Helmet"), head, (others => 0), faction.neutral, effect.none), + human_armour => (new string' ("Human Armour"), chest, (others => 0), faction.neutral, effect.none), + elven_helmet => (new string' ("Elven Helmet"), head, (others => 0), faction.neutral, effect.none), + elven_armour => (new string' ("Elven Armour"), chest, (others => 0), faction.neutral, effect.none), + orcish_helmet => (new string' ("Orcish Helmet"), head, (others => 0), faction.neutral, effect.none), + orcish_armour => (new string' ("Orcish Armour"), chest, (others => 0), faction.neutral, effect.none), + black_robe => (new string' ("Black Robe"), full_body, (others => 0), faction.neutral, effect.none), + cyan_robe => (new string' ("Cyan Robe"), full_body, (others => 0), faction.neutral, effect.none), + lime_dress => (new string' ("Lime Dress"), full_body, (others => 0), faction.neutral, effect.none), + magenta_dress => (new string' ("Magenta Dress"), full_body, (others => 0), faction.neutral, effect.none), + orange_robe => (new string' ("Orange Robe"), full_body, (others => 0), faction.neutral, effect.none), + pink_dress => (new string' ("Pink Dress"), full_body, (others => 0), faction.neutral, effect.none), + red_robe => (new string' ("Red Robe"), full_body, (others => 0), faction.neutral, effect.none), + sexy_dress => (new string' ("Sexy Dress"), full_body, (others => 0), faction.neutral, effect.none), + white_robe => (new string' ("White Robe"), full_body, (others => 0), faction.neutral, effect.none), + lime_robe => (new string' ("Lime Robe"), full_body, (others => 0), faction.neutral, effect.none), + orange_hood => (new string' ("Orange Hood"), head, (others => 0), faction.neutral, effect.none), + fur_helmet => (new string' ("Fur Helmet"), head, (others => 0), faction.neutral, effect.none), + black_hood => (new string' ("Black Hood"), head, (others => 0), faction.neutral, effect.none), + cyan_hood => (new string' ("Cyan Hood"), head, (others => 0), faction.neutral, effect.none), + lime_hood => (new string' ("Lime Hood"), head, (others => 0), faction.neutral, effect.none) ); sprite : array (enumeration) of core.sprite; diff --git a/source/main.adb b/source/main.adb index 17c3efb..340db54 100644 --- a/source/main.adb +++ b/source/main.adb @@ -393,7 +393,7 @@ begin for index_y in 0 .. 3 loop for index_x in 0 .. 5 loop ui.draw_icon (data => equipment.icon (player.items (6 * index_y + index_x)), - text => -(equipment.description (player.items (6 * index_y + index_x)).name), + text => equipment.description (player.items (6 * index_y + index_x)).name.all, x => x + index_x * core.icon, y => y + 96 + 4 * 8 + 2 * core.icon + index_y * core.icon); end loop; diff --git a/source/world.adb b/source/world.adb index ac840c5..fcdc206 100644 --- a/source/world.adb +++ b/source/world.adb @@ -389,7 +389,7 @@ package body world is and core.cursor_mode = core.cursor_middle and equipment.enumeration'pos (this) /= equipment.enumeration'pos (equipment.none) and not ui.prioritize then - core.write_text_box (-(equipment.description (this).name)); + core.write_text_box (equipment.description (this).name.all); end if; -- core.increment (drawn_equipments);