diff --git a/game/location/pillars_of_observation.png b/game/location/pillars_of_observation.png new file mode 100644 index 0000000..cf8be0a Binary files /dev/null and b/game/location/pillars_of_observation.png differ diff --git a/source/location.ads b/source/location.ads index 9aa4e5d..ae569f6 100644 --- a/source/location.ads +++ b/source/location.ads @@ -11,7 +11,7 @@ package location is type enumeration is ( well_of_agility, well_of_knowledge, well_of_strength, old_dwarven_grave, huge_ancient_urn, banana_tree, apple_tree, cherry_tree, lemon_tree, orange_tree, pear_tree, peach_tree, - plum_tree + plum_tree, pillars_of_observation ); ------------------------------------------------------------------------------------------ @@ -20,7 +20,6 @@ package location is name : access string; clip : boolean; frames : integer; - states : integer; evoke : effect.information; end record; @@ -38,19 +37,20 @@ package location is count : constant natural := enumeration'pos (enumeration'last) + 1; description : constant array (enumeration) of definition := ( - well_of_agility => (new string'("Well of Agility"), true, 4, 3, (effect.modify_attribute, attribute.enumeration'pos (attribute.speed), 2, false, 0)), - well_of_knowledge => (new string'("Well of Knowledge"), true, 4, 3, (effect.modify_attribute, attribute.enumeration'pos (attribute.wisdom), 2, false, 0)), - well_of_strength => (new string'("Well of Strength"), true, 4, 3, (effect.modify_attribute, attribute.enumeration'pos (attribute.offense), 2, false, 0)), - old_dwarven_grave => (new string'("Old Dwarven Grave"), true, 1, 3, (effect.modify_attribute, attribute.enumeration'pos (attribute.defense), 1, false, 0)), - huge_ancient_urn => (new string'("Huge Ancient Urn"), true, 1, 3, (effect.modify_attribute, attribute.enumeration'pos (attribute.offense), 1, false, 0)), - banana_tree => (new string'("Banana Tree"), true, 4, 3, (effect.modify_material, material.enumeration'pos (material.banana), 4, true, 600)), - apple_tree => (new string'("Apple Tree"), true, 4, 3, (effect.modify_material, material.enumeration'pos (material.apple), 6, true, 600)), - cherry_tree => (new string'("Cherry Tree"), true, 4, 3, (effect.modify_material, material.enumeration'pos (material.cherry), 6, true, 600)), - lemon_tree => (new string'("Lemon Tree"), true, 4, 3, (effect.modify_material, material.enumeration'pos (material.lemon), 6, true, 600)), - orange_tree => (new string'("Orange Tree"), true, 4, 3, (effect.modify_material, material.enumeration'pos (material.orange), 6, true, 600)), - pear_tree => (new string'("Pear Tree"), true, 4, 3, (effect.modify_material, material.enumeration'pos (material.pear), 6, true, 600)), - peach_tree => (new string'("Peach Tree"), true, 4, 3, (effect.modify_material, material.enumeration'pos (material.peach), 6, true, 600)), - plum_tree => (new string'("Plum Tree"), true, 4, 3, (effect.modify_material, material.enumeration'pos (material.plum), 6, true, 600)) + well_of_agility => (new string'("Well of Agility"), true, 4, (effect.modify_attribute, attribute.enumeration'pos (attribute.speed), 2, false, 0)), + well_of_knowledge => (new string'("Well of Knowledge"), true, 4, (effect.modify_attribute, attribute.enumeration'pos (attribute.wisdom), 2, false, 0)), + well_of_strength => (new string'("Well of Strength"), true, 4, (effect.modify_attribute, attribute.enumeration'pos (attribute.offense), 2, false, 0)), + old_dwarven_grave => (new string'("Old Dwarven Grave"), true, 1, (effect.modify_attribute, attribute.enumeration'pos (attribute.defense), 1, false, 0)), + huge_ancient_urn => (new string'("Huge Ancient Urn"), true, 1, (effect.modify_attribute, attribute.enumeration'pos (attribute.offense), 1, false, 0)), + banana_tree => (new string'("Banana Tree"), true, 4, (effect.modify_material, material.enumeration'pos (material.banana), 4, true, 600)), + apple_tree => (new string'("Apple Tree"), true, 4, (effect.modify_material, material.enumeration'pos (material.apple), 6, true, 600)), + cherry_tree => (new string'("Cherry Tree"), true, 4, (effect.modify_material, material.enumeration'pos (material.cherry), 6, true, 600)), + lemon_tree => (new string'("Lemon Tree"), true, 4, (effect.modify_material, material.enumeration'pos (material.lemon), 6, true, 600)), + orange_tree => (new string'("Orange Tree"), true, 4, (effect.modify_material, material.enumeration'pos (material.orange), 6, true, 600)), + pear_tree => (new string'("Pear Tree"), true, 4, (effect.modify_material, material.enumeration'pos (material.pear), 6, true, 600)), + peach_tree => (new string'("Peach Tree"), true, 4, (effect.modify_material, material.enumeration'pos (material.peach), 6, true, 600)), + plum_tree => (new string'("Plum Tree"), true, 4, (effect.modify_material, material.enumeration'pos (material.plum), 6, true, 600)), + pillars_of_observation => (new string'("Pillars of Observation"), true, 1, (effect.modify_attribute, attribute.enumeration'pos (attribute.reach), 2, false, 0)) ); game : array (enumeration) of core.sprite; diff --git a/source/ui.adb b/source/ui.adb index 7d36968..5f2262d 100644 --- a/source/ui.adb +++ b/source/ui.adb @@ -518,21 +518,6 @@ package body ui is ------------------------------------------------------------------------------------------ - procedure draw_state_box (x, y : in integer) is - begin - ui.write ("Cursor X:" & core.cursor.x'image, x, y + 0); - ui.write ("Cursor Y:" & core.cursor.y'image, x, y + 32); - ui.write ("Cursor Mode:" & core.cursor_mode'image, x, y + 64); - ui.write ("Camera X:" & core.camera.x'image, x, y + 96); - ui.write ("Camera Y:" & core.camera.y'image, x, y + 128); - ui.write ("Global Time:" & core.global_time'image, x, y + 160); - ui.write ("Gameplay Time:" & core.gameplay_time'image, x, y + 192); - ui.write ("Animation Time:" & core.animation_time'image, x, y + 224); - ui.write ("Framerate:" & core.framerate'image, x, y + 256); - end draw_state_box; - - ------------------------------------------------------------------------------------------ - procedure draw_console_box (x, y, width, height : in integer) is offset : constant integer := 8; font_width : constant integer := monowidth; diff --git a/source/ui.ads b/source/ui.ads index ebd01e7..c614c22 100644 --- a/source/ui.ads +++ b/source/ui.ads @@ -69,7 +69,6 @@ package ui is procedure draw_end_turn_button (x, y : in integer); - procedure draw_state_box (x, y : in integer); procedure draw_console_box (x, y, width, height : in integer); procedure iterate_style;