diff --git a/source/magic.adb b/source/magic.adb index 062ca7d..5e03bd9 100644 --- a/source/magic.adb +++ b/source/magic.adb @@ -1,4 +1,4 @@ -with core, effect, magic; +with core, ui, effect, magic; use magic; @@ -10,7 +10,11 @@ package body magic is ------------------------------------------------------------------------------------------ - icon : sprite_array; + view_width : constant integer := 90; + view_height : constant integer := 90; + + view_sprite : sprite_array; + icon_sprite : sprite_array; ------------------------------------------------------------------------------------------ @@ -24,17 +28,51 @@ package body magic is folder : constant string := core.lowercase (school'image (trait (index).kind)); file : constant string := core.lowercase (codex'image (index)); begin - icon (index) := core.load_sprite ("./sprite/magic/" & folder & "/" & file & ".png", 1, 1); + view_sprite (index) := core.load_sprite ("./sprite/magic/" & folder & "/" & file & ".png", 1, 1); + icon_sprite (index) := core.load_sprite ("./sprite/magic/icon/" & file & ".png", 1, 1); end; end loop; end configure; ------------------------------------------------------------------------------------------ - procedure draw (index : in codex; x, y : in integer) is + procedure icon (index : in codex; x, y : in integer) is begin - core.draw (icon (index), x, y); - end draw; + core.draw (icon_sprite (index), x + 2, y + 2); + ui.draw_overicon (x, y); + end icon; + + ------------------------------------------------------------------------------------------ + + procedure view (index : in codex; x, y : in integer) is + offset : constant integer := 4; + begin + core.draw (view_sprite (index), x + offset, y + offset); + ui.draw_icon_menu (x, y, view_width + 2 * offset, view_height + 2 * offset); + end view; + + ------------------------------------------------------------------------------------------ + + procedure menu (x, y : in integer; center : in boolean) is + offset : constant integer := 16; + width : constant integer := 168 * 8 + 2 * offset; + height : constant integer := 12 * core.icon + 2 * offset; + move_x : constant integer := (if center then (core.window_width - width) / 2 else x); + move_y : constant integer := (if center then (core.window_height - height) / 2 else y); + -- + next : array (0 .. 7) of integer := (others => 0); + begin + ui.draw_tiny_menu (move_x, move_y, width, height, true); + ui.draw_title_bar (move_x, move_y, width, "Magic Abilities"); + -- + for index in codex + loop + icon (index, move_x + offset + school'pos (trait (index).kind) * 168, move_y + offset + next (school'pos (trait (index).kind)) * core.icon); + core.write (trait (index).name, move_x + offset + school'pos (trait (index).kind) * 168 + core.icon, move_y + offset + next (school'pos (trait (index).kind)) * core.icon); + -- + next (school'pos (trait (index).kind)) := next (school'pos (trait (index).kind)) + 1; + end loop; + end menu; ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/source/magic.ads b/source/magic.ads index 59adecf..a360a6d 100644 --- a/source/magic.ads +++ b/source/magic.ads @@ -134,7 +134,10 @@ package magic is procedure configure; - procedure draw (index : in codex; x, y : in integer); + procedure icon (index : in codex; x, y : in integer); + procedure view (index : in codex; x, y : in integer); + + procedure menu (x, y : in integer; center : in boolean); ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/source/main.adb b/source/main.adb index 85fa70c..d272ce9 100644 --- a/source/main.adb +++ b/source/main.adb @@ -106,6 +106,7 @@ begin unit.stat (unit.griffin, 0, 0, true); -- might.menu (0, 0, true); + magic.menu (0, 0, true); end loop gameplay; ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------