diff --git a/.gitignore b/.gitignore index 99a71d1..dd6262f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ source/*.o source/*.ali xhads +song/ +sprite/ui/temporary diff --git a/source/item.ads b/source/item.ads index ea44ea0..565bd1b 100644 --- a/source/item.ads +++ b/source/item.ads @@ -2,7 +2,7 @@ -- -- GNU General Public Licence (version 3 or later) -with core, effect, attribute, skill, faction; +with core, effect, attribute, faction; package item is @@ -14,8 +14,10 @@ package item is ); type enumeration is ( - iron_chestplate, iron_greaves, grey_tunic, iron_gauntlets, iron_helmet, iron_sword, - golden_necklace, iron_round_shield + iron_chestplate, iron_greaves, iron_gauntlets, iron_helmet, iron_sword, + golden_necklace, iron_round_shield, + grey_tunic, white_tunic, black_tunic, red_tunic, green_tunic, blue_tunic, + yellow_tunic, orange_tunic, cyan_tunic, lime_tunic, pink_tunic, purple_tunic ); ------------------------------------------------------------------------------------------ @@ -24,7 +26,6 @@ package item is name : core.short_string; kind : slot; attributes : attribute.points; - bonus_skill : skill.enumeration; favor : faction.enumeration; evoke : effect.enumeration; end record; @@ -34,14 +35,25 @@ package item is count : constant natural := enumeration'pos (enumeration'last) + 1; trait : constant array (enumeration) of information := ( - ("Iron Chestplate ", chest, (0, 3, 0, 0, 0, 0), skill.leadership, faction.gnoll, effect.none), - ("Iron Greaves ", feet, (0, 1, 0, 0, 0, 0), skill.logistics, faction.gnoll, effect.none), - ("Grey Tunic ", full_body, (0, 1, 0, 1, 0, 0), skill.exploration, faction.neutral, effect.none), - ("Iron Gauntlets ", hands, (0, 1, 0, 0, 0, 0), skill.logistics, faction.gnoll, effect.none), - ("Iron Helmet ", head, (0, 1, 0, 0, 0, 0), skill.leadership, faction.gnoll, effect.none), - ("Iron Sword ", main_hand, (1, 0, 0, 0, 1, 2), skill.tactics, faction.gnoll, effect.none), - ("Golden Necklace ", neck, (0, 0, 0, 0, 0, 0), skill.estates, faction.fairy, effect.none), - ("Iron Round Shield ", off_hand, (0, 2, 0, 0, 0, 1), skill.tactics, faction.gnoll, effect.none) + ("Iron Chestplate ", chest, (0, 3, 0, 0, 0, 0), faction.gnoll, effect.none), + ("Iron Greaves ", feet, (0, 1, 0, 0, 0, 0), faction.gnoll, effect.none), + ("Iron Gauntlets ", hands, (0, 1, 0, 0, 0, 0), faction.gnoll, effect.none), + ("Iron Helmet ", head, (0, 1, 0, 0, 0, 0), faction.gnoll, effect.none), + ("Iron Sword ", main_hand, (1, 0, 0, 0, 1, 2), faction.gnoll, effect.none), + ("Golden Necklace ", neck, (0, 0, 0, 0, 0, 0), faction.fairy, effect.none), + ("Iron Round Shield ", off_hand, (0, 2, 0, 0, 0, 1), faction.gnoll, effect.none), + ("Grey Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("White Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Black Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Red Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Green Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Blue Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Yellow Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Orange Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Cyan Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Lime Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Pink Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none), + ("Purple Tunic ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none) ); ------------------------------------------------------------------------------------------ diff --git a/source/main.adb b/source/main.adb index 04f9d09..a6c7c37 100644 --- a/source/main.adb +++ b/source/main.adb @@ -117,8 +117,8 @@ begin attribute.configure; skill.configure; resource.configure; - might.configure; - magic.configure; + --~might.configure; + --~magic.configure; item.configure; unit.configure; construction.configure;