diff --git a/ammunition.ads b/ammunition.ads index 0bf0ea2..21faabf 100644 --- a/ammunition.ads +++ b/ammunition.ads @@ -16,15 +16,15 @@ package ammunition is ------------------------------------------------------------------------------------------ - type ammunition_list is ( + type list is ( arrows, bolts, slingshots, jarids ); - type ammunition_mark is mod 72; + type mark is mod 72; ------------------------------------------------------------------------------------------ - type ammunition_constant_type is new core.constant_type with + type constant_type is new core.constant_type with record value : natural := 0; weight : natural := 0; @@ -34,25 +34,25 @@ package ammunition is distance_range : natural := 0; end record; - type ammunition_variable_type is new core.variable_type with + type variable_type is new core.variable_type with record amount : natural := 0; enchantment : natural := 0; end record; - type ammunition_constant_list is array (ammunition_list) of ammunition_constant_type; - type ammunition_variable_list is array (ammunition_mark) of ammunition_variable_type; + type constant_list is array (list) of constant_type; + type variable_list is array (mark) of variable_type; ------------------------------------------------------------------------------------------ - ammunition_constant_data : constant ammunition_constant_list := ( + constant_data : constant constant_list := ( (core.ammunition, "Arrows ", '^', core.colour.red, core.effect.normal, 11, 13, false, 23, 7, 67), (core.ammunition, "Bolts ", '^', core.colour.red, core.effect.normal, 13, 23, false, 29, 5, 67), (core.ammunition, "Slingshots ", '^', core.colour.red, core.effect.normal, 5, 7, true, 43, 7, 67), (core.ammunition, "Jarids ", '^', core.colour.red, core.effect.normal, 29, 37, true, 7, 7, 67) ); - ammunition_variable_data : ammunition_variable_list; + variable_data : variable_list; ------------------------------------------------------------------------------------------ diff --git a/animal.ads b/animal.ads index d86bdf7..5a9eddf 100644 --- a/animal.ads +++ b/animal.ads @@ -16,42 +16,42 @@ package animal is ------------------------------------------------------------------------------------------ - type animal_list is ( - animal_pig, animal_cow, animal_chicken, animal_sheep, animal_boar, animal_goat, animal_auroch, animal_duck, - animal_dog, animal_cat, animal_rabbit, animal_hamster, animal_horse, animal_donkey, animal_camel, animal_elephant, - animal_owl, animal_hawk, animal_pigeon, animal_vulture, animal_crow, animal_pheasant, animal_sparrow, animal_albatross, - animal_sardine, animal_herring, animal_catfish, animal_carp, animal_whale, animal_shark, animal_squid, animal_sawfish, - animal_worm, animal_bee, animal_centipede, animal_spider, animal_frog, animal_rat, animal_bat, animal_mole, - animal_wolf, animal_fox, animal_bear, animal_mammoth, animal_elk, animal_moose, animal_deer, animal_peebles, - animal_lion, animal_hyena, animal_bison, animal_zebra, animal_giraffe, animal_crocodile, animal_monkey, animal_gnu, - animal_caribou, animal_seal, animal_morse, animal_penguin, animal_turtle, animal_cayman, animal_otter, animal_snake, - animal_lizard, animal_daeodon, animal_slime, animal_axolotl, animal_hedgehog, animal_caterpillar, animal_crab, animal_scorpion, - animal_giant_lizard, animal_giant_centipede, animal_giant_spider, animal_giant_sloth, - animal_giant_owl, animal_giant_scorpion, animal_giant_axolotl, animal_giant_worm + type list is ( + pig, cow, chicken, sheep, boar, goat, auroch, duck, + dog, cat, rabbit, hamster, horse, donkey, camel, elephant, + owl, hawk, pigeon, vulture, crow, pheasant, sparrow, albatross, + sardine, herring, catfish, carp, whale, shark, squid, sawfish, + worm, bee, centipede, spider, frog, rat, bat, mole, + wolf, fox, bear, mammoth, elk, moose, deer, peebles, + lion, hyena, bison, zebra, giraffe, crocodile, monkey, gnu, + caribou, seal, morse, penguin, turtle, cayman, otter, snake, + lizard, daeodon, slime, axolotl, hedgehog, caterpillar, crab, scorpion, + giant_lizard, giant_centipede, giant_spider, giant_sloth, + giant_owl, giant_scorpion, giant_axolotl, giant_worm ); - type animal_mark is mod 72; + type mark is mod 72; ------------------------------------------------------------------------------------------ - type animal_constant_type is new core.constant_type with + type constant_type is new core.constant_type with record health_limit : natural := 0; attack_range : natural := 0; defense_range : natural := 0; end record; - type animal_variable_type is new core.variable_type with + type variable_type is new core.variable_type with record health : natural := 0; end record; - type animal_constant_list is array (animal_list) of animal_constant_type; - type animal_variable_list is array (animal_mark) of animal_variable_type; + type constant_list is array (list) of constant_type; + type variable_list is array (mark) of variable_type; ------------------------------------------------------------------------------------------ - animal_constant_data : constant animal_constant_list := ( + constant_data : constant constant_list := ( (core.animal, "Pig ", 'a', core.colour.green, core.effect.normal, 11, 11, 11), (core.animal, "Cow ", 'a', core.colour.green, core.effect.normal, 11, 11, 11), (core.animal, "Chicken ", 'a', core.colour.green, core.effect.normal, 11, 11, 11), @@ -134,7 +134,7 @@ package animal is (core.animal, "Giant Worm ", 'a', core.colour.green, core.effect.normal, 11, 11, 11) ); - animal_variable_data : animal_variable_list; + variable_data : variable_list; ------------------------------------------------------------------------------------------ diff --git a/armour.ads b/armour.ads index 9718ac8..0cbfc1e 100644 --- a/armour.ads +++ b/armour.ads @@ -16,33 +16,33 @@ package armour is ------------------------------------------------------------------------------------------ - type armour_list is ( + type list is ( iron_helmet, iron_chestplate, iron_gauntlets, iron_greaves, iron_cuisse, iron_fauld, iron_gardbrace, iron_rerebrace ); - type armour_mark is mod 72; + type mark is mod 72; ------------------------------------------------------------------------------------------ - type armour_constant_type is new core.constant_type with + type constant_type is new core.constant_type with record value : natural := 0; weight : natural := 0; defense_range : natural := 0; end record; - type armour_variable_type is new core.variable_type with + type variable_type is new core.variable_type with record enchantment : natural := 0; condition : natural := 0; end record; - type armour_constant_list is array (armour_list) of armour_constant_type; - type armour_variable_list is array (armour_mark) of armour_variable_type; + type constant_list is array (list) of constant_type; + type variable_list is array (mark) of variable_type; ------------------------------------------------------------------------------------------ - armour_constant_data : constant armour_constant_list := ( + constant_data : constant constant_list := ( (core.armour, "Iron Helmet ", 'm', core.colour.yellow, core.effect.normal, 11, 31, 7), (core.armour, "Iron Chestplate ", 'M', core.colour.yellow, core.effect.bold, 23, 67, 11), (core.armour, "Iron Gauntlets ", 'i', core.colour.yellow, core.effect.normal, 13, 43, 7), @@ -53,7 +53,7 @@ package armour is (core.armour, "Iron Rerebrace ", 'V', core.colour.yellow, core.effect.normal, 13, 47, 7) ); - armour_variable_data : armour_variable_list; + variable_data : variable_list; ------------------------------------------------------------------------------------------ diff --git a/item.ads b/item.ads index ee56160..472581b 100644 --- a/item.ads +++ b/item.ads @@ -16,7 +16,7 @@ package item is ------------------------------------------------------------------------------------------ - type item_list is ( + type list is ( wood, bark, flax, plank, stick, braces, nails, linen, chamomile, mint, wax, salt, sugar, pepper, cinnamon, yeast, skull, bone, intestines, fur, leather, fat, horn, tusk, @@ -26,27 +26,27 @@ package item is papers, paperweight ); - type item_mark is mod 72; + type mark is mod 72; ------------------------------------------------------------------------------------------ - type item_constant_type is new core.constant_type with + type constant_type is new core.constant_type with record value : natural := 0; weight : natural := 0; end record; - type item_variable_type is new core.variable_type with + type variable_type is new core.variable_type with record owner : natural := 0; end record; - type item_constant_list is array (item_list) of item_constant_type; - type item_variable_list is array (item_mark) of item_variable_type; + type constant_list is array (list) of constant_type; + type variable_list is array (mark) of variable_type; ------------------------------------------------------------------------------------------ - item_constant_data : constant item_constant_list := ( + constant_data : constant constant_list := ( (core.item, "Wood ", '+', core.colour.yellow, core.effect.normal, 2, 2), (core.item, "Bark ", '+', core.colour.yellow, core.effect.normal, 1, 2), (core.item, "Flax ", '+', core.colour.yellow, core.effect.normal, 3, 1), @@ -99,7 +99,7 @@ package item is (core.item, "Paperweight ", '+', core.colour.yellow, core.effect.normal, 2, 1) ); - item_variable_data : item_variable_list; + variable_data : variable_list; ------------------------------------------------------------------------------------------ diff --git a/magic.ads b/magic.ads index 82976cc..da70495 100644 --- a/magic.ads +++ b/magic.ads @@ -16,15 +16,15 @@ package magic is ------------------------------------------------------------------------------------------ - type magic_list is ( + type list is ( ignite, illuminate, bladecharm, battlecry ); - type magic_mark is mod 72; + type mark is mod 72; ------------------------------------------------------------------------------------------ - type magic_constant_type is new core.constant_type with + type constant_type is new core.constant_type with record self : boolean := false; health : integer := 0; @@ -35,24 +35,24 @@ package magic is tribute : natural := 0; end record; - type magic_variable_type is new core.variable_type with + type variable_type is new core.variable_type with record enchantment : natural := 0; end record; - type magic_constant_list is array (magic_list) of magic_constant_type; - type magic_variable_list is array (magic_mark) of magic_variable_type; + type constant_list is array (list) of constant_type; + type variable_list is array (mark) of variable_type; ------------------------------------------------------------------------------------------ - magic_constant_data : constant magic_constant_list := ( + constant_data : constant constant_list := ( (core.magic, "Ignite ", '*', core.colour.yellow, core.effect.italic, false, -3, 0, 0, -1, 7, 1), (core.magic, "Illuminate ", '*', core.colour.yellow, core.effect.italic, false, 0, 0, 0, -1, 13, 1), (core.magic, "Bladecharm ", '*', core.colour.red, core.effect.italic, true, 0, -3, 0, -1, 7, 3), (core.magic, "Battlecry ", '*', core.colour.red, core.effect.italic, true, -1, -1, 0, -1, 7, 2) ); - magic_variable_data : magic_variable_list; + variable_data : variable_list; ------------------------------------------------------------------------------------------ diff --git a/monster.ads b/monster.ads index 30a530f..02414e8 100644 --- a/monster.ads +++ b/monster.ads @@ -16,15 +16,15 @@ package monster is ------------------------------------------------------------------------------------------ - type goblin_list is ( + type list is ( goblin_slave, goblin_worker, goblin_warrior, goblin_boar_rider, goblin_shaman, goblin_chief, goblin_king, goblin_ogre ); - type monster_mark is mod 72; + type mark is mod 72; ------------------------------------------------------------------------------------------ - type goblin_constant_type is new core.constant_type with + type constant_type is new core.constant_type with record health_limit : natural := 0; armour_limit : natural := 0; @@ -33,7 +33,7 @@ package monster is attack_range : natural := 0; end record; - type goblin_variable_type is new core.variable_type with + type variable_type is new core.variable_type with record health : natural := 0; armour : natural := 0; diff --git a/plant.ads b/plant.ads index 83d3996..52dd23e 100644 --- a/plant.ads +++ b/plant.ads @@ -16,31 +16,31 @@ package plant is ------------------------------------------------------------------------------------------ - type plant_list is ( + type list is ( oak_tree, pine_tree, birch_tree, acacia_tree, apple_tree, peach_tree, orange_tree, pear_tree, bush, thorny_bush, tall_grass, reed ); - type plant_mark is mod 72; + type mark is mod 72; ------------------------------------------------------------------------------------------ - type plant_constant_type is new core.constant_type with + type constant_type is new core.constant_type with record health_limit : natural := 0; end record; - type plant_variable_type is new core.variable_type with + type variable_type is new core.variable_type with record health : natural := 0; end record; - type plant_constant_list is array (plant_list) of plant_constant_type; - type plant_variable_list is array (plant_mark) of plant_variable_type; + type constant_list is array (list) of constant_type; + type variable_list is array (mark) of variable_type; ------------------------------------------------------------------------------------------ - plant_constant_data : constant plant_constant_list := ( + constant_data : constant constant_list := ( (core.plant, "Oak Tree ", 'T', core.colour.green, core.effect.bold, 11), (core.plant, "Pine Tree ", 'T', core.colour.green, core.effect.bold, 23), (core.plant, "Birch Tree ", 'T', core.colour.green, core.effect.bold, 13), @@ -55,7 +55,7 @@ package plant is (core.plant, "Reed ", '%', core.colour.green, core.effect.normal, 3) ); - plant_variable_data : plant_variable_list; + variable_data : variable_list; ------------------------------------------------------------------------------------------ diff --git a/player.ads b/player.ads index 1b3a3e0..5165b32 100644 --- a/player.ads +++ b/player.ads @@ -16,7 +16,7 @@ package player is ------------------------------------------------------------------------------------------ - type player_data is + type variable_type is record --~x : map_width := 0; --~y : map_height := 0; @@ -30,7 +30,7 @@ package player is ------------------------------------------------------------------------------------------ - data : player_data; + data : variable_type; ------------------------------------------------------------------------------------------ diff --git a/weapon.ads b/weapon.ads index 34690b8..70a83ef 100644 --- a/weapon.ads +++ b/weapon.ads @@ -16,17 +16,17 @@ package weapon is ------------------------------------------------------------------------------------------ - type weapon_list is ( + type list is ( iron_sword, iron_greatsword, iron_axe, iron_battleaxe, iron_spear, iron_shield, iron_mace, iron_hammer, bronze_sword, bronze_greatsword, bronze_axe, bronze_battleaxe, bronze_spear, bronze_shield, bronze_mace, bronze_hammer, brass_sword, brass_greatsword, brass_axe, brass_battleaxe, brass_spear, brass_shield, brass_mace, brass_hammer ); - type weapon_mark is mod 72; + type mark is mod 72; ------------------------------------------------------------------------------------------ - type weapon_constant_type is new core.constant_type with + type constant_type is new core.constant_type with record dual_wield : boolean := false; value : natural := 0; @@ -36,18 +36,18 @@ package weapon is distance_range : natural := 0; end record; - type weapon_variable_type is new core.variable_type with + type variable_type is new core.variable_type with record enchantment : natural := 0; condition : natural := 0; end record; - type weapon_constant_list is array (weapon_list) of weapon_constant_type; - type weapon_variable_list is array (weapon_mark) of weapon_variable_type; + type constant_list is array (list) of constant_type; + type variable_list is array (mark) of variable_type; ------------------------------------------------------------------------------------------ - weapon_constant_data : constant weapon_constant_list := ( + constant_data : constant constant_list := ( (core.weapon, "Iron Sword ", 'l', core.colour.red, core.effect.normal, true, 11, 31, 7, 2, 1), (core.weapon, "Iron Greatsword ", 'L', core.colour.red, core.effect.bold, false, 23, 67, 11, 3, 2), (core.weapon, "Iron Axe ", 'r', core.colour.red, core.effect.normal, true, 13, 43, 7, 2, 1), @@ -74,7 +74,7 @@ package weapon is (core.weapon, "Brass Hammer ", 't', core.colour.red, core.effect.normal, true, 13, 47, 7, 3, 1) ); - weapon_variable_data : weapon_variable_list; + variable_data : variable_list; ------------------------------------------------------------------------------------------