Removed usage of Core package namespace from Main...
This commit is contained in:
parent
75e3770bff
commit
cfb053bb9c
249
source/main.adb
249
source/main.adb
@ -10,7 +10,9 @@ with core, ui, effect, attribute, skill, resource, faction, deity, material, mag
|
||||
with ada.strings.unbounded;
|
||||
use ada.strings.unbounded;
|
||||
|
||||
use core;
|
||||
use type core.point;
|
||||
use type core.signal_code;
|
||||
use type core.cursor_code;
|
||||
|
||||
procedure main is
|
||||
|
||||
@ -48,9 +50,10 @@ procedure main is
|
||||
map_preview_panel, status_preview_panel, text_box_panel
|
||||
);
|
||||
|
||||
view_icon : array (view) of sprite := (others => (others => 0));
|
||||
view_icon : array (view) of core.sprite := (others => (others => 0));
|
||||
view_list : array (view) of boolean := (others => true);
|
||||
view_text : array (view) of long_string := (
|
||||
|
||||
view_text : array (view) of core.long_string := (
|
||||
"Toggle map preview panel. ",
|
||||
"Toggle status preview panel. ",
|
||||
"Toggle text box panel. "
|
||||
@ -66,8 +69,8 @@ procedure main is
|
||||
swap_text_box_panel'access
|
||||
);
|
||||
|
||||
game_title : sprite;
|
||||
game_preview : array (world.biome) of sprite;
|
||||
game_title : core.sprite;
|
||||
game_preview : array (world.biome) of core.sprite;
|
||||
|
||||
switch : natural := 0;
|
||||
choose : world.biome := world.grass;
|
||||
@ -76,37 +79,37 @@ procedure main is
|
||||
|
||||
procedure check_move_camera_up is
|
||||
begin
|
||||
decrement (world.map.chads (1).y);
|
||||
world.map.chads (1).y := clip (world.map.chads (1).y, 0, world.map.height - 1);
|
||||
core.decrement (world.map.chads (1).y);
|
||||
world.map.chads (1).y := core.clip (world.map.chads (1).y, 0, world.map.height - 1);
|
||||
if world.map.clips (world.map.chads (1).x, world.map.chads (1).y) then
|
||||
increment (world.map.chads (1).y);
|
||||
core.increment (world.map.chads (1).y);
|
||||
end if;
|
||||
end check_move_camera_up;
|
||||
|
||||
procedure check_move_camera_down is
|
||||
begin
|
||||
increment (world.map.chads (1).y);
|
||||
world.map.chads (1).y := clip (world.map.chads (1).y, 0, world.map.height - 1);
|
||||
core.increment (world.map.chads (1).y);
|
||||
world.map.chads (1).y := core.clip (world.map.chads (1).y, 0, world.map.height - 1);
|
||||
if world.map.clips (world.map.chads (1).x, world.map.chads (1).y) then
|
||||
decrement (world.map.chads (1).y);
|
||||
core.decrement (world.map.chads (1).y);
|
||||
end if;
|
||||
end check_move_camera_down;
|
||||
|
||||
procedure check_move_camera_left is
|
||||
begin
|
||||
decrement (world.map.chads (1).x);
|
||||
world.map.chads (1).x := clip (world.map.chads (1).x, 0, world.map.width - 1);
|
||||
core.decrement (world.map.chads (1).x);
|
||||
world.map.chads (1).x := core.clip (world.map.chads (1).x, 0, world.map.width - 1);
|
||||
if world.map.clips (world.map.chads (1).x, world.map.chads (1).y) then
|
||||
increment (world.map.chads (1).x);
|
||||
core.increment (world.map.chads (1).x);
|
||||
end if;
|
||||
end check_move_camera_left;
|
||||
|
||||
procedure check_move_camera_right is
|
||||
begin
|
||||
increment (world.map.chads (1).x);
|
||||
world.map.chads (1).x := clip (world.map.chads (1).x, 0, world.map.width - 1);
|
||||
core.increment (world.map.chads (1).x);
|
||||
world.map.chads (1).x := core.clip (world.map.chads (1).x, 0, world.map.width - 1);
|
||||
if world.map.clips (world.map.chads (1).x, world.map.chads (1).y) then
|
||||
decrement (world.map.chads (1).x);
|
||||
core.decrement (world.map.chads (1).x);
|
||||
end if;
|
||||
end check_move_camera_right;
|
||||
|
||||
@ -115,34 +118,34 @@ procedure main is
|
||||
ui.active := ui.style'val ((ui.style'pos (ui.active) + 1) mod ui.style_count);
|
||||
end ui_main_style;
|
||||
|
||||
procedure zoom_in is begin zoom := 2; end zoom_in;
|
||||
procedure zoom_out is begin zoom := 1; end zoom_out;
|
||||
procedure zoom_in is begin core.zoom := 2; end zoom_in;
|
||||
procedure zoom_out is begin core.zoom := 1; end zoom_out;
|
||||
|
||||
signal_list : constant array (signal_code) of access procedure := (
|
||||
signal_up => check_move_camera_up'access,
|
||||
signal_down => check_move_camera_down'access,
|
||||
signal_left => check_move_camera_left'access,
|
||||
signal_right => check_move_camera_right'access,
|
||||
signal_v => ui_main_style'access,
|
||||
signal_kp_add => zoom_in'access,
|
||||
signal_kp_subtract => zoom_out'access,
|
||||
signal_f1 => world.resource_cheat_1'access,
|
||||
signal_f2 => world.resource_cheat_2'access,
|
||||
signal_f3 => world.resource_cheat_3'access,
|
||||
signal_f4 => world.resource_cheat_4'access,
|
||||
signal_f5 => world.resource_cheat_5'access,
|
||||
signal_f6 => world.resource_cheat_6'access,
|
||||
signal_f7 => world.reveal_map'access,
|
||||
signal_f => toggle_fullscreen'access,
|
||||
others => idle_skip'access
|
||||
signal_list : constant array (core.signal_code) of access procedure := (
|
||||
core.signal_up => check_move_camera_up'access,
|
||||
core.signal_down => check_move_camera_down'access,
|
||||
core.signal_left => check_move_camera_left'access,
|
||||
core.signal_right => check_move_camera_right'access,
|
||||
core.signal_v => ui_main_style'access,
|
||||
core.signal_kp_add => zoom_in'access,
|
||||
core.signal_kp_subtract => zoom_out'access,
|
||||
core.signal_f1 => world.resource_cheat_1'access,
|
||||
core.signal_f2 => world.resource_cheat_2'access,
|
||||
core.signal_f3 => world.resource_cheat_3'access,
|
||||
core.signal_f4 => world.resource_cheat_4'access,
|
||||
core.signal_f5 => world.resource_cheat_5'access,
|
||||
core.signal_f6 => world.resource_cheat_6'access,
|
||||
core.signal_f7 => world.reveal_map'access,
|
||||
core.signal_f => core.toggle_fullscreen'access,
|
||||
others => core.idle_skip'access
|
||||
);
|
||||
|
||||
------------------------------------------------------------------------------------------
|
||||
|
||||
procedure main_menu is
|
||||
begin
|
||||
draw (game_preview (world.ash), center_x (game_preview (world.ash).width * 2), center_y (game_preview (world.ash).height * 2), factor => 2);
|
||||
draw (game_title, center_x (game_title.width * 2), center_y (game_title.height * 2), factor => 2);
|
||||
core.draw (game_preview (world.ash), core.center_x (game_preview (world.ash).width * 2), core.center_y (game_preview (world.ash).height * 2), factor => 2);
|
||||
core.draw (game_title, core.center_x (game_title.width * 2), core.center_y (game_title.height * 2), factor => 2);
|
||||
--
|
||||
ui.write ("Main Menu", 0, 0);
|
||||
--
|
||||
@ -154,62 +157,62 @@ procedure main is
|
||||
view_source_code : natural := 25;
|
||||
|
||||
source_code : array (0 .. 35) of unbounded_string := (
|
||||
to_unbounded_string (folder & "/source/ai.adb"),
|
||||
to_unbounded_string (folder & "/source/ai.ads"),
|
||||
to_unbounded_string (folder & "/source/attribute.adb"),
|
||||
to_unbounded_string (folder & "/source/attribute.ads"),
|
||||
to_unbounded_string (folder & "/source/chad.adb"),
|
||||
to_unbounded_string (folder & "/source/chad.ads"),
|
||||
to_unbounded_string (folder & "/source/construction.adb"),
|
||||
to_unbounded_string (folder & "/source/construction.ads"),
|
||||
to_unbounded_string (folder & "/source/core.adb"),
|
||||
to_unbounded_string (folder & "/source/core.ads"),
|
||||
to_unbounded_string (folder & "/source/deity.adb"),
|
||||
to_unbounded_string (folder & "/source/deity.ads"),
|
||||
to_unbounded_string (folder & "/source/effect.adb"),
|
||||
to_unbounded_string (folder & "/source/effect.ads"),
|
||||
to_unbounded_string (folder & "/source/equipment.adb"),
|
||||
to_unbounded_string (folder & "/source/equipment.ads"),
|
||||
to_unbounded_string (folder & "/source/faction.adb"),
|
||||
to_unbounded_string (folder & "/source/faction.ads"),
|
||||
to_unbounded_string (folder & "/source/magic.adb"),
|
||||
to_unbounded_string (folder & "/source/magic.ads"),
|
||||
to_unbounded_string (folder & "/source/main.adb"),
|
||||
to_unbounded_string (folder & "/source/material.adb"),
|
||||
to_unbounded_string (folder & "/source/material.ads"),
|
||||
to_unbounded_string (folder & "/source/might.adb"),
|
||||
to_unbounded_string (folder & "/source/might.ads"),
|
||||
to_unbounded_string (folder & "/source/ray.ads"),
|
||||
to_unbounded_string (folder & "/source/resource.adb"),
|
||||
to_unbounded_string (folder & "/source/resource.ads"),
|
||||
to_unbounded_string (folder & "/source/skill.adb"),
|
||||
to_unbounded_string (folder & "/source/skill.ads"),
|
||||
to_unbounded_string (folder & "/source/ui.adb"),
|
||||
to_unbounded_string (folder & "/source/ui.ads"),
|
||||
to_unbounded_string (folder & "/source/unit.adb"),
|
||||
to_unbounded_string (folder & "/source/unit.ads"),
|
||||
to_unbounded_string (folder & "/source/world.adb"),
|
||||
to_unbounded_string (folder & "/source/world.ads")
|
||||
to_unbounded_string (core.folder & "/source/ai.adb"),
|
||||
to_unbounded_string (core.folder & "/source/ai.ads"),
|
||||
to_unbounded_string (core.folder & "/source/attribute.adb"),
|
||||
to_unbounded_string (core.folder & "/source/attribute.ads"),
|
||||
to_unbounded_string (core.folder & "/source/chad.adb"),
|
||||
to_unbounded_string (core.folder & "/source/chad.ads"),
|
||||
to_unbounded_string (core.folder & "/source/construction.adb"),
|
||||
to_unbounded_string (core.folder & "/source/construction.ads"),
|
||||
to_unbounded_string (core.folder & "/source/core.adb"),
|
||||
to_unbounded_string (core.folder & "/source/core.ads"),
|
||||
to_unbounded_string (core.folder & "/source/deity.adb"),
|
||||
to_unbounded_string (core.folder & "/source/deity.ads"),
|
||||
to_unbounded_string (core.folder & "/source/effect.adb"),
|
||||
to_unbounded_string (core.folder & "/source/effect.ads"),
|
||||
to_unbounded_string (core.folder & "/source/equipment.adb"),
|
||||
to_unbounded_string (core.folder & "/source/equipment.ads"),
|
||||
to_unbounded_string (core.folder & "/source/faction.adb"),
|
||||
to_unbounded_string (core.folder & "/source/faction.ads"),
|
||||
to_unbounded_string (core.folder & "/source/magic.adb"),
|
||||
to_unbounded_string (core.folder & "/source/magic.ads"),
|
||||
to_unbounded_string (core.folder & "/source/main.adb"),
|
||||
to_unbounded_string (core.folder & "/source/material.adb"),
|
||||
to_unbounded_string (core.folder & "/source/material.ads"),
|
||||
to_unbounded_string (core.folder & "/source/might.adb"),
|
||||
to_unbounded_string (core.folder & "/source/might.ads"),
|
||||
to_unbounded_string (core.folder & "/source/ray.ads"),
|
||||
to_unbounded_string (core.folder & "/source/resource.adb"),
|
||||
to_unbounded_string (core.folder & "/source/resource.ads"),
|
||||
to_unbounded_string (core.folder & "/source/skill.adb"),
|
||||
to_unbounded_string (core.folder & "/source/skill.ads"),
|
||||
to_unbounded_string (core.folder & "/source/ui.adb"),
|
||||
to_unbounded_string (core.folder & "/source/ui.ads"),
|
||||
to_unbounded_string (core.folder & "/source/unit.adb"),
|
||||
to_unbounded_string (core.folder & "/source/unit.ads"),
|
||||
to_unbounded_string (core.folder & "/source/world.adb"),
|
||||
to_unbounded_string (core.folder & "/source/world.ads")
|
||||
);
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
begin
|
||||
|
||||
dash;
|
||||
echo (comment, "Copyright (C) 2024 -- Ognjen 'xolatile' Milan Robovic");
|
||||
echo (comment, "Version -- 1.0.0");
|
||||
echo (comment, "License -- GNU/GPLv3+");
|
||||
echo (comment, "Xhads is free software, you can redistribute it and modify it under the terms of the GNU General Public License by Free Software Foundation.");
|
||||
dash;
|
||||
core.dash;
|
||||
core.echo (core.comment, "Copyright (C) 2024 -- Ognjen 'xolatile' Milan Robovic");
|
||||
core.echo (core.comment, "Version -- 1.0.0");
|
||||
core.echo (core.comment, "License -- GNU/GPLv3+");
|
||||
core.echo (core.comment, "Xhads is free software, you can redistribute it and modify it under the terms of the GNU General Public License by Free Software Foundation.");
|
||||
core.dash;
|
||||
|
||||
initialize;
|
||||
core.initialize;
|
||||
|
||||
ui.active := ui.main;
|
||||
|
||||
ui.configure;
|
||||
|
||||
--~play (import_song (c_string (core.folder & "/song/main_menu.ogg")).index);
|
||||
--~core.play (core.import_song (core.c_string (core.folder & "/song/main_menu.ogg")).index);
|
||||
|
||||
attribute.configure;
|
||||
skill.configure;
|
||||
@ -228,71 +231,69 @@ begin
|
||||
world.make (world.swamp, 240, 180, 8);
|
||||
world.add_chad (player);
|
||||
|
||||
dash;
|
||||
echo (success, "Successfully initialized game data, entering main gameplay loop.");
|
||||
dash;
|
||||
core.dash;
|
||||
core.echo (core.success, "Successfully initialized game data, entering main gameplay loop.");
|
||||
core.dash;
|
||||
|
||||
for index in view loop
|
||||
view_icon (index) := import_sprite (core.folder & "/icon/engine/" & lowercase (view'image (index)) & ".png", 1, 1);
|
||||
view_icon (index) := core.import_sprite (core.folder & "/icon/engine/" & core.lowercase (view'image (index)) & ".png", 1, 1);
|
||||
end loop;
|
||||
|
||||
game_title := import_sprite (core.folder & "/ui/game_title.png", 1, 1);
|
||||
game_title := core.import_sprite (core.folder & "/ui/game_title.png", 1, 1);
|
||||
|
||||
for index in world.biome loop
|
||||
game_preview (index) := import_sprite (core.folder & "/ui/preview/" & lowercase (world.biome'image (index)) & "land.png", 1, 1);
|
||||
game_preview (index) := core.import_sprite (core.folder & "/ui/preview/" & core.lowercase (world.biome'image (index)) & "land.png", 1, 1);
|
||||
end loop;
|
||||
|
||||
------------------------------------------------------------------------------------------
|
||||
|
||||
introduction_loop: loop
|
||||
synchronize;
|
||||
core.synchronize;
|
||||
--
|
||||
exit when signal_mode = signal_space or cursor_mode = cursor_right;
|
||||
exit when core.signal_mode = core.signal_space or core.cursor_mode = core.cursor_right;
|
||||
--
|
||||
case signal_mode is
|
||||
when signal_none => null;
|
||||
when signal_space => null;
|
||||
when others => switch := (switch + 1) mod world.biome_count;
|
||||
choose := world.biome'val (switch);
|
||||
case core.signal_mode is
|
||||
when core.signal_none => null;
|
||||
when core.signal_space => null;
|
||||
when others => switch := (switch + 1) mod world.biome_count;
|
||||
choose := world.biome'val (switch);
|
||||
end case;
|
||||
--
|
||||
draw (game_preview (choose), center_x (game_preview (choose).width * 2), center_y (game_preview (choose).height * 2), factor => 2);
|
||||
draw (game_title, center_x (game_title.width * 2), center_y (game_title.height * 2), factor => 2);
|
||||
core.draw (game_preview (choose), core.center_x (game_preview (choose).width * 2), core.center_y (game_preview (choose).height * 2), factor => 2);
|
||||
core.draw (game_title, core.center_x (game_title.width * 2), core.center_y (game_title.height * 2), factor => 2);
|
||||
--
|
||||
ui.write ("[-- Press Spacebar or RMB to continue]", 0, center_y (24), (102, 102, 102, 255));
|
||||
ui.write ("[-- Press Spacebar or RMB to continue]", 0, core.center_y (24), (102, 102, 102, 255));
|
||||
end loop introduction_loop;
|
||||
|
||||
cursor_mode := cursor_none;
|
||||
core.cursor_mode := core.cursor_none;
|
||||
|
||||
main_menu_loop: loop
|
||||
synchronize;
|
||||
core.synchronize;
|
||||
--
|
||||
exit when signal_mode = signal_space or cursor_mode = cursor_right;
|
||||
exit when core.signal_mode = core.signal_space or core.cursor_mode = core.cursor_right;
|
||||
--
|
||||
--~main_menu;
|
||||
--
|
||||
declare source_code_data : string_box_data;
|
||||
declare source_code_data : core.string_box_data;
|
||||
begin
|
||||
import_text (source_code_data, to_string (source_code (view_source_code)));
|
||||
core.import_text (source_code_data, to_string (source_code (view_source_code)));
|
||||
--
|
||||
if cursor_mode = cursor_left then
|
||||
if core.cursor_mode = core.cursor_left then
|
||||
view_source_code := (view_source_code + 1) mod 36;
|
||||
cursor_mode := cursor_none;
|
||||
wheel := 0.0;
|
||||
core.cursor_mode := core.cursor_none;
|
||||
core.wheel := 0.0;
|
||||
end if;
|
||||
--
|
||||
ui.write_ada_code (source_code_data, 0, integer (wheel) * 30);
|
||||
ui.write_ada_code (source_code_data, 0, integer (core.wheel) * 30);
|
||||
end;
|
||||
end loop main_menu_loop;
|
||||
|
||||
cursor_mode := cursor_none;
|
||||
core.cursor_mode := core.cursor_none;
|
||||
|
||||
ui.active := ui.style'val (faction.enumeration'pos (chad.trait (player.index).kind) + 1);
|
||||
|
||||
gameplay_loop: loop
|
||||
synchronize;
|
||||
core.synchronize;
|
||||
--
|
||||
exit when engine_active = false;
|
||||
exit when core.engine_active = false;
|
||||
--
|
||||
if not view_list (status_preview_panel) then
|
||||
side_panel := 0;
|
||||
@ -300,8 +301,8 @@ begin
|
||||
side_panel := 376 + 2 * 32;
|
||||
end if;
|
||||
--
|
||||
preview_width := window_width - side_panel;
|
||||
preview_height := window_height - text_box_height;
|
||||
preview_width := core.window_width - side_panel;
|
||||
preview_height := core.window_height - text_box_height;
|
||||
text_box_height := 32;
|
||||
--
|
||||
world.draw;
|
||||
@ -317,19 +318,19 @@ begin
|
||||
end if;
|
||||
--
|
||||
if view_list (text_box_panel) then
|
||||
ui.draw_help_box (0, window_height - text_box_height, window_width - icon * (view'pos (view'last) + 1), text_box_height);
|
||||
ui.draw_help_box (0, core.window_height - text_box_height, core.window_width - core.icon * (view'pos (view'last) + 1), text_box_height);
|
||||
end if;
|
||||
--
|
||||
for index in view loop
|
||||
ui.draw_icon (view_icon (index), view_text (index),
|
||||
window_width - icon * (view'pos (view'last) + 1) + icon * view'pos (index),
|
||||
window_height - text_box_height,
|
||||
core.window_width - core.icon * (view'pos (view'last) + 1) + core.icon * view'pos (index),
|
||||
core.window_height - text_box_height,
|
||||
view_show (index));
|
||||
end loop;
|
||||
--
|
||||
resource.draw_points (world.map.chads (1).resources, (preview_width - 5 * icon * resource.count) / 2, (if view_list (map_preview_panel) then icon else 0));
|
||||
resource.draw_points (world.map.chads (1).resources, (preview_width - 5 * core.icon * resource.count) / 2, (if view_list (map_preview_panel) then core.icon else 0));
|
||||
--
|
||||
signal_list (signal_mode).all;
|
||||
signal_list (core.signal_mode).all;
|
||||
--
|
||||
--~magic.menu (0, 0, true);
|
||||
--~might.menu (0, 0, true);
|
||||
@ -339,10 +340,10 @@ begin
|
||||
--~deity.draw (deity.AEZORA, 300, 300);
|
||||
--~deity.draw (deity.ULDRAE, 500, 300);
|
||||
--
|
||||
ui.write (framerate'image, window_width - 5 * core.icon + 3, window_height - 27);
|
||||
ui.write (core.framerate'image, core.window_width - 5 * core.icon + 3, core.window_height - 27);
|
||||
--
|
||||
camera.x := world.map.chads (1).x;
|
||||
camera.y := world.map.chads (1).y;
|
||||
core.camera.x := world.map.chads (1).x;
|
||||
core.camera.y := world.map.chads (1).y;
|
||||
--
|
||||
ui.synchronize;
|
||||
end loop gameplay_loop;
|
||||
@ -351,8 +352,8 @@ begin
|
||||
|
||||
------------------------------------------------------------------------------------------
|
||||
|
||||
deinitialize;
|
||||
core.deinitialize;
|
||||
|
||||
dash;
|
||||
core.dash;
|
||||
|
||||
end main;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user