From 6bb8e275fbe1704d762feec792a6e831433c3d6e Mon Sep 17 00:00:00 2001 From: xolatile Date: Wed, 13 Mar 2024 10:44:49 -0400 Subject: [PATCH] Continuing... --- source/main.adb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/source/main.adb b/source/main.adb index d272ce9..9e77392 100644 --- a/source/main.adb +++ b/source/main.adb @@ -71,6 +71,8 @@ begin if core.signal_mode = core.signal_code'pos (core.signal_up) then core.camera.y := core.camera.y - 1; end if; if core.signal_mode = core.signal_code'pos (core.signal_down) then core.camera.y := core.camera.y + 1; end if; -- + if core.cursor_mode = 3 then ui.active := ui.default; else ui.active := ui.steam; end if; + -- core.camera.x := core.clip (core.camera.x, 0, world.map.width - preview_width / core.base); core.camera.y := core.clip (core.camera.y, 0, world.map.height - preview_height / core.base); -- @@ -83,13 +85,13 @@ begin ui.draw_menu (0, 0, preview_width, preview_height, false); ui.draw_tiny_menu (preview_width, 0, side_panel, preview_height, true); -- - --~for this in magic.blow_away .. magic.thunderclap loop magic.draw (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.chain_magic_arrow)) - 60, 112 * 0 + 64); end loop; - --~for this in magic.agony_mass .. magic.weakness loop magic.draw (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.thunderclap)) - 60, 112 * 1 + 64); end loop; - --~for this in magic.earthquake .. magic.summon_earth_elemental loop magic.draw (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.weakness)) - 60, 112 * 2 + 64); end loop; - --~for this in magic.determination_mass .. magic.summon_fire_elemental loop magic.draw (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.summon_earth_elemental)) - 60, 112 * 3 + 64); end loop; - --~for this in magic.blindness .. magic.sunburst loop magic.draw (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.summon_fire_elemental)) - 60, 112 * 4 + 64); end loop; - --~for this in magic.dispel_magic_mass .. magic.time_statis loop magic.draw (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.sunburst)) - 60, 112 * 5 + 64); end loop; - --~for this in magic.blizzard .. magic.winter_circle loop magic.draw (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.time_statis)) - 60, 112 * 6 + 64); end loop; + for this in magic.blow_away .. magic.thunderclap loop magic.view (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.chain_magic_arrow)) - 60, 112 * 0 + 64); end loop; + for this in magic.agony_mass .. magic.weakness loop magic.view (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.thunderclap)) - 60, 112 * 1 + 64); end loop; + for this in magic.earthquake .. magic.summon_earth_elemental loop magic.view (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.weakness)) - 60, 112 * 2 + 64); end loop; + for this in magic.determination_mass .. magic.summon_fire_elemental loop magic.view (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.summon_earth_elemental)) - 60, 112 * 3 + 64); end loop; + for this in magic.blindness .. magic.sunburst loop magic.view (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.summon_fire_elemental)) - 60, 112 * 4 + 64); end loop; + for this in magic.dispel_magic_mass .. magic.time_statis loop magic.view (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.sunburst)) - 60, 112 * 5 + 64); end loop; + for this in magic.blizzard .. magic.winter_circle loop magic.view (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.time_statis)) - 60, 112 * 6 + 64); end loop; -- --~for index in item.codex loop item.draw (index, 32 * (item.codex'pos (index) / 10) + 32, 32 * (item.codex'pos (index) mod 10) + 32); end loop; --~for index in attribute.codex loop attribute.draw (index, 32 * attribute.codex'pos (index) + 64, 64); end loop; @@ -105,8 +107,8 @@ begin -- unit.stat (unit.griffin, 0, 0, true); -- - might.menu (0, 0, true); - magic.menu (0, 0, true); + --~might.menu (0, 0, true); + --~magic.menu (0, 0, true); end loop gameplay; ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------