From 7ba21d2a81b6957bfd2c0d4754c20e92558178ad Mon Sep 17 00:00:00 2001 From: xolatile Date: Wed, 15 May 2024 06:38:53 -0400 Subject: [PATCH] Minor refactoring of deity data... --- source/core.adb | 2 +- source/deity.adb | 6 +++--- source/deity.ads | 2 +- source/main.adb | 4 +++- sprite/deity/AEZORA.png | Bin 1820 -> 1876 bytes 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/core.adb b/source/core.adb index f2794fd..110976f 100644 --- a/source/core.adb +++ b/source/core.adb @@ -161,7 +161,7 @@ package body core is this.states := states; -- if this.width = 0 or this.height = 0 then - echo (failure, "Sprite not imported: " & file_path); + echo (warning, "Sprite not imported: " & file_path); end if; -- return this; diff --git a/source/deity.adb b/source/deity.adb index 44fe92d..9c5e58a 100644 --- a/source/deity.adb +++ b/source/deity.adb @@ -17,15 +17,15 @@ package body deity is core.echo (core.comment, "Configuring deity components..."); -- for index in enumeration loop - sprite (index) := core.import_sprite ("./sprite/deity/" & core.uppercase (enumeration'image (index)) & ".png", 4, 1); + sprite (index) := core.import_sprite ("./sprite/deity/" & enumeration'image (index) & ".png", 4, 1); end loop; end configure; ------------------------------------------------------------------------------------------ - procedure draw (value : in enumeration; x, y : in integer) is + procedure draw (index : in enumeration; x, y : in integer) is begin - null; + core.draw (sprite (index), x, y); end draw; ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/source/deity.ads b/source/deity.ads index d68f18e..d8c06a8 100644 --- a/source/deity.ads +++ b/source/deity.ads @@ -45,7 +45,7 @@ package deity is procedure configure; - procedure draw (value : in enumeration; x, y : in integer); + procedure draw (index : in enumeration; x, y : in integer); ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/source/main.adb b/source/main.adb index ef38765..7f3f935 100644 --- a/source/main.adb +++ b/source/main.adb @@ -5,7 +5,7 @@ pragma ada_2012; --~with core, ui, effect, attribute, skill, resource, faction, might, magic, equipment, unit, construction, chad, deity, world, ai; -with core, ui, effect, attribute, skill, resource, faction, material, magic, equipment, unit, construction, chad, world; +with core, ui, effect, attribute, skill, resource, faction, deity, material, magic, equipment, unit, construction, chad, world; with ada.strings.unbounded; use ada.strings.unbounded; @@ -198,6 +198,7 @@ begin material.configure; equipment.configure; unit.configure; + deity.configure; construction.configure; chad.configure; world.configure; @@ -307,6 +308,7 @@ begin --~might.menu (0, 0, true); -- chad.draw_alice; + deity.draw (deity.AEZORA, 300, 300); -- ui.write (framerate'image, window_width - 5 * core.icon + 3, window_height - 27); -- diff --git a/sprite/deity/AEZORA.png b/sprite/deity/AEZORA.png index ba3edb6df4d3e4b7cc9f9135d95712b74e97f25d..579b1bd5c5299da0a60fa8b7c322684e18a22138 100644 GIT binary patch delta 1841 zcmV-12hRAM4%7~iIDZEQNkl0Xp6xz4j`{txz z2zOHG5R8Ek=n&ioEgNZ2RFv6SIOm?*I>=X56h(pbOomiWDRqrbzpg4|-$AY-b-+37 zvV2{04gl!Rmcgcfah8GpuN^?_D_2lp000IBCD`dQ*z_;XFn^Fw`$sv*cjy2BP+({p zpezB!*=Yl0N&n(#1NpRn#t4no0eUG*;PC*2I6p$U^v}%-Qey0=#Uez9y6)BpV79M2 z23<^TLcgh~V-T^KrrGH-R6@1c(^S*5c1u4IW{<)8VMwtJw@78pHmjmwL2kC%~ z{Hj9MG*g{g$$#*8OruOJ{qv;?&W3e?T=zW$@OHqB{9qlhLw}Niiph?tf9`9bt;MH( zZwK5d!|o2)SzJ2B)W6UYo{o|en}KTHw@?|^Bg9c}seSs{kQ6!{a1USafFZ%Mc7Wn+ z?0{BIqrhH1CA(&V8C(Ct$3P@#+oB^Sgm|kz-e=4nIe%R3`#9iU{@xAAvl|oGE8t^k0iPCsNyLL2x zsRMqZ{(prJ)NvnAp(fY1XZ9N7Ount-f4csKug3vEbL~Cu#y$Z6pXz44HlFFW8X@tI z=Vw0f8`zjxnnLNNxn4()Qwm)rTUBIJOKFX%Et$29-_txu79SagaoZB zWPg8uypoosk&yW3^K*0E`Nb7(V7N34Pbsruc`@-U*W9D6MKL_nJ*CX}Y6Ct6JSVE}V}W4Q4&_^{M%) z*Y>Pyv%>YWpU8K;5|5>SVZI6lB&urpm4B&TjAPET$C>%#ikrY2<0d5VxB}o_uWbK| z{F{*DL5{kf){CY8I0d-ggPY5axifR-d+AHVdc_O_l;!l@HYp|qCiVC7&1cv0Z$iF> z*gbqYn`d@lO#Sn@Y2hYb@0_WW2>Ql}kGHSc3ERVWjrKLg6%~W=XO3>2rGEj&GB_%@3_y{^+>}~Ym+=wHxU^EqxbNV@?BPk*H>l+MnNXX=M~O*7OTjH|%V%o$+D0YmU@o#@M- z$R3FQ*>H%q#jjH0>*J$)N}0vfe{v*DwC&^w(Zm3ZWfflYNeu>ax>~DORmf1WS!3%4 zplwc@1BT$64(Q8&>y!X|ePf38T#k?&Jm1?Z`r00T_wesjZ%_9^M6bw#pJtb zpG|*oaX7Hh*$iMhAZ=2F;7=XU-T^lL*eODd&xYXZ%QM@~UJU(nefyAvavFd#li@%5 zX3FS0#>v#VgABy7IbaCB%>jM+u1?v@CzgJ6JGTCXzK85Gz~p49lz;)BTk1WfoG46T zSLY2z81L)CZspq?(B!!IB!8#%@Z}D^%g!IeO9`g-n5t>KhU{NViU ze>idwqW`>0@q6OO<7bNk2=UvRaoA4Fn)jsyn&zLKn;?mQAb;Dt01`x>Z?yAjE9Rkl z;>YD@UV`XeX!A1tp6;n`@4K%uMB*RD_s;?5{^F7?Q3>hwi7I~>KU*cB5Wl^Iou7B^ fo5Nz_2j~9_wl_(lWVZ;w00000NkvXXu0mjfA`HN~ delta 1784 zcmV zhaGURxpYdYf29>X0~IGW1GRh{p)rnUh@;=u`1HG}D0Bwk5x(w#slc*2KyfxZpqI-m zaFkEQu32EF*1z&G5DD7%7)S{rUi#1H8M9{&*Z4jGcz=|C)Bz#%cV*O+`oC1e&dO7% zp=~krJqD#PK&i!NrN+-~J09;HUmx4rCjftIy1E!60Y8QQ#aDQGX3A0ugDZ_? zetLef=Q*SoAXIReDMwFLp^Bl*KaXGdg3Ur>0)JRjQ7A)X{`vf3ZAv8T-U?o8HlZ#Z z+dVhV{5bs56?t_%f@v^HJCBXG6qKU$enPmXGnt>3U$`QVs?V+izPeEe(f6|uEx+Om z<2>{RhA*f&`sV41kf>|mn=9`-A@k$%OIPFpz&}?$UqH_x8l2$zXDUia(56B0@8`2< z*?+ndGCw}QH0Pb)T;T?WOULk#vY4h9i^y_4d$hSIrfY_Wlm)+E@gc`3rSqdn~Zynni#ncuIt3A`|FLIU?I0Pgk5_HX3hgq$~W zwC%EAD*fk2fa^WDIqg{6GiSb+zI1F<%rHP*FW+sGVnSfi|0v(Qb}#=XkCZsPgQnOa@Hf(Wihq7CLUfGYrx@So8xHyvQ(yPR@_zt&ReU#@N6a(_jo z5KAHG8z(-|zGo%u2;X(L?`f{A7>vKNbt{(s6&Nev=-@H{WfpT$YWG%VGC;==ns08j ze24F9!T5|7P-;l2e+AG=lb`qWXOQdjLPsdHt}j|JHY&E`4&BRNZ5w=>>>>Ei)jf%| z8!(3c70opt^Fo8P8(@l5szPb+{C~Wse(KkCQ{TzB3Jl$v0agMq1mEUFU;aY&K>V+c zL-aj9YKia9&*33uky8J~mN3!xi!DS8129%Jcs@^BFi_C7TEC`2frhObTQ>kLbJ_wh z1m6rmU;c|z0`T>P9a{8Ry8&b9U+ODIFgm_en?ekY6mvC7MFu@*8YvdvO@I69#*K^9 zhK0dq05bq-ks<_t8Gv>N*!Z(kgqp7n!Plo}ww1jU`j`6hAqnL)097W_KlII%Id+Vl zscRb@vV&XQ`Bc0biTyJ)~SHOleo=O-7i{ z>%zXvw*{cdaq&q`>*mV?e1DgnQ|ezioK`puuoi(UN^J$2%^^qlt^oAmugQOuztS&> z{?(d5Rs-zF07o`O9_2f)-zkH25g-CTmj30I5c9=C4D+ARSc|~%OYQ>#w4?mR^+#I* zehmG~-BL|7-x?rz%lx4H^4$xq5g78%T4a6{et9GiliUHB|AR9?#DA9gVfZ-%z3f}Ev%=AXi^-ip4pb7xM2GCw%qF91^Pc*y)H a{Qm&uDD}6zxF5Ix0000