From e47c5d999ac375e25696dd1b997028284c238c90 Mon Sep 17 00:00:00 2001 From: Viktor Yankov <19210322+kobaltoxid@users.noreply.github.com> Date: Thu, 21 Jan 2021 14:06:58 +0200 Subject: [PATCH] Final changes. --- conf.lua | 2 +- logonator.lovec => magus.lovec | Bin 5901892 -> 5901961 bytes main.lua | 2 +- map.lua | 36 ++++++++++++++++++++++++--------- player.lua | 6 ------ 5 files changed, 28 insertions(+), 18 deletions(-) rename logonator.lovec => magus.lovec (99%) diff --git a/conf.lua b/conf.lua index 986f040..038fed8 100644 --- a/conf.lua +++ b/conf.lua @@ -1,5 +1,5 @@ function love.conf(w) w.window.width=1280 w.window.height=768 - w.window.title='Logonator' + w.window.title='Magus' end \ No newline at end of file diff --git a/logonator.lovec b/magus.lovec similarity index 99% rename from logonator.lovec rename to magus.lovec index fe6b7737172050399ed2c206f1ae4214e5666bb9..74734db2e73adb908abe6552864ac1ae13ae3ed6 100644 GIT binary patch delta 7240 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 QCXEu)kOGk%*6?-pU%z{Sf&c&j delta 7208 zcmZu$Wl-GDvR&L=f|H=Z-QC@Fad!){I7`?c79e;QS==E&aDqdE1-BpxNpSaI0m9?f zt$P3aUfrJg&{NahHPcmnKAaPuw~PE4v5OoDAOXk#3V;fr0q6h*fC*p$*Z>ZI3*Z6x z00BS<5COyh2|x;v0p!3lfC8Wdr~qn!2A~D#0D9m#@B&}}7y%}L8DIfeftLUqzz%Q# zoB$WV4e$WG03W~)2mpeB5FiYQ0HS~xAPz_Xl7JK-4afkpfE*wXC;*Cp5}*vI0IGl* zpblsNnt&Fd4d?*6fF7U^7yyQV5nv3M0H)30l6t(~?Fc==&$_p|AP~p{{-GYMLz`ZZ zUjR2vvo4(+%glizgLE}eP)VPzF+p#71luS+fQL~~;7{Iq6WE#$OBPQ^-<>$A@FiS* z3(Nq0&T)>%g}m9{2}vm&^&-SzBljelCgy5NRgEn@tW>%?qSg1cTW-wzYH5QrkLeLD zAn7McL-#gEtNl^(23KS=US3llyNECz8kP~4!jzImiGY<(QKpm9+%Jkri%Yu+ubHJ_ zZY%PqvP~Nd*`p;YFl>`zCi_%=wl|w`h>C-zC&uQ)4-D)0^nByBiKLfkwvi;pvDOP` zWY}+wf-J&LR$gQDKC{|ptg`D(eI=g?e@A)wL(?zw!pBe4F|40KN=ZWmvpR;&@yxKK zj081$EqMsL#58R=Bl?TaAK8Hl(>IAK^hyk+3C-g_YdX~y6@5^Q^Tzhpk%w13`@XtB zokFJfAsRg6J~?dU+%u}=e71$k4CyZdXp4QS#f@T8#AzKQ%cDeO(!|0wfvj7Gx3mN_ zWz5V~2E~7AM+l1!;RTc8=7p0!12EM_(m?m{dn&MvQM;1}dn;J}+-`?0d0eN3w-Kx; z7{F+$ZAW4d?aa6E08H$ulH{?qA?-j1mA~0>&_+0fEl9qIFD@s%{gPj@6N0Ky@=k+k zbl`zqvf79@9oN0@qq0Rn%*Q%2E(UVmVxgkza9#V}<^T&(P7Po4th7?RZD9z;0Ug!& z?d$DO`21h^I|sWXu-^5r-(nB_l=sV6Ha-$7-F03kzf9p7Od%bt&^*{i)_peAjA!6T z&GyccEet14Us(QC=?6mo_FrudXy!XH)TIR5~2N+t|`z~&hpk;80G0<&%Yn= z3~!8RAi10`D9q7lJ3Y7diXK3Pc4p2C7A@e9v#%uKWp$CW)DL8^HBy@l81m1U@Um>L zKgafNr}&IYt|+f6YC{#?UO@a8wIS{oHlF$%rWumvnXz7^dJeV+EkCzYPMMSSX%8=U z&3!fdw}iZ}oD(pr{DqIk6}f)~VdazEb`oO+mxJH+x^h2^s-@)j9vK#DKwpivg-Q{y zTaQVgFozE(>9XGLdX-4dgmK0thLxk+^;@clCkZW@DEq%1+_JxpHjBiXRdjQ9JYr4= zS=tHguPZ)FV$i-wu;kKeYcn!^m!$Rj!>038fZe32D`YGmbAMA7BveauAz9S+JuiY8DfNFx{{9{gP3GU z%7FLd$a99YNX!iwHJ)lMF=!{DxSa(uZQ*Fhr&fhO!hAdDxB@wD~f_6V>& zl6*+sXl>}F_jyFoEBt`C@&9XjcSZgYgUUoJCtK_Jla95p7*|$lbLC z#?TY9LG@a@Dx{c{!rEJy@nb(_uZ{bN>La*aH5L0usnePYAd=1wAUJGi%5K@e^P3Zd z+A8*D_;q{y(vjCuw1F10pvKab4ayg4#|vKtzYb1QFPHm9kI zmO4d4AmPXmb;C{#gROjqO|*b^ssKAg47QyHr6V7XdQ3-JalL0#gP3--$_O5kHzzjv4Y} zu)bMWbcT&0E0je=s3k;kpICk2Ud#VMp#0J=>mI^8pH&C?`#2la=GZTaSPuMI=87%@ zg^?wpQLi5sBUl4zV~x`YdA#R}Fe8oiORKuQvY+2}``$<~W$4hch|59{0YcH_e#N8Okq83zasbu2fcB((ll>#^V~(a)8+*SCt(y7?T}; z_S+Hvu-gX1-L*L~HYuk(T5wU9s|44}6gn5ZftTma^XDIYfB0Nf8d~u*8#)q`0C0gHvg7(a*eX?7E02_HCuick4Gy%?*zs|K5zN@Z(fp|LbuOgg-6TpK;jw|R{?G*|+Wky(j3#*6 zD90qV+2>VjVb?o1;H7m-F{f`?(C(&1X*&6PdR=Oy9nEz`%#X~n%jjup;T(oKl{Qx= z2K{A}-}UoN?}%ODd(ucB&q^zA3cY$>$UNdiIo{JE=OPXeWSx?Fuj~TgUfzLrCEhRK zC(2CS4;ZjQ@}Y^BQ)uiQ_Lax+FXCr+rZB^9)IUXI4GJOWre3?1D89kdASH}&D~TmV zH;^L3g%Os)Cyv1GQ1=-%*D&!5(+#(^CgraV0mN%pocj_G-oFN7FDV)x^O6Vh)~h+B z`p886aiuk>y{`MfsCE6A^vXgc#B_=F-A+pO_4f7#J)*qS1wUZi!wm6vp0fB-?AW$lE6WMLRDQ&Wi0NH$fRa7~KlPl`wb=ANCvNbJ}^!*PHdp z3eBYkuQ8I(%92x3fpe0^?#c}}_aq@ z&c+ZlVvo|%cl#wAj*~TVu;-vhtt66I(W)q35-tU{kUzO~v_!4vDfja*<&3$k9N1m* z7k7P6+c^<1|23lWeBo*WR?%q{uTY zAcY|$+LAXzgKO0pXO@K#MHeU8!pvz;Rl*>l}g5&R}38H z2uuxn`&*mp=lCSH_rvTFbBmL1C?XOyY9O=W1s0gzh518hdipGvnW+L`hLC?GJUW1hF~lj_Sp12A5ALN z9bWQTm}B}eA6^U4o~4p_D5h9=Ex5Bc2@!{cXa|NVj58spEJ76Z2}7)0qq^SvW_zug zYRSz@N8-KGN11@$cSwcz8 zQJiyL%Cz2ewp#=$MwfJ@`@I1Ejxg3w&!#L-u>Q7jTjA><%W4fcqvN$~h?`y_bay^g zmGBHPn#-7$q-vPKo*cf&mh=c^>iru7p5Qp#J+KQb9Y5EW|kjC}9eZ;t&Dh?P9p#i}eaxGy*xl_YsYg;{C&vuMS0;DKJqQ z*S<}&SYr`8bHt*HY4P&UppI}rsly0nYSLwDa(woxgLS^dKQ`OnuGRPT=-U$ZPv;EA zBAViSN|3TnEXv#yO|JzB6wZ5HUpwnX!OB>gBQyJ>N%@-}Ue^XQBs=cqoHOAnz^-EH zvqsSV{)oL@JU=667MI(cOxEOMCzZJ&NRuJ6bK6#bKV z1-Fu|PjDhnhGtU{IWUfhGV(LJkX_^;exosD9bES=jwW`{!J z>LSGVFBEMj+EFQKImZ;p&y`KM zIt_@psmV&Tm$Xx>%nhfQf9$pm=aP0>51><+W}x6)7&#R^w9kNYd$=Hmsb=+k2A*GI zd`LQX@NTga6Ib<|Lqp}U71>_RXUleakQbTxE}iMpx4u(g#h+vrWp81cKf2)*tRh0k zQ}AZE#vcx&yr0+f$}pp`SMX;^&)wo#&7!#+-SqA^Q~1R|59^a1R2zpPOVh7%tf_bp z8|I%TB@9K6*AYU&g|hY7As8>X6q(8?rqPZ13(j{t6!7Gwo<$M)oMs$eZOX_X%}E?` zPC0hdYAq2{Q zht7c-_w=htm08F{k9WC#K)*&D|M27#AX|o{TSjgiW~uL|y<IUe**U!S5O6(llih z;+PM?#AwnkW(M@3^>$kY^Ng)5Cl4yO074By!hUhr2!V%_Ca_PnmT5Jj=|70R#rYlqlKP-G|6qUdSW82GZownO?d>nKa$ z#EtQ*j_V@oG7+;)N7nrJvpKCoL8$Huvhzoqr(9S!8FBM7ishS@Zrns>2;F z5aaf6N}FhY?v8yB{3*fb*8=|5*1r7L)~m|O(Vg>t-R{kKC4=20Wb>q5ks=K{3CwPz z#y{~pkmVeD=Y0A`lAYKxzFU^<>|oJS$*%XDu~0g~3|S7%TK{`Dw1-R_Hk_eM@tl0? z{Nv^KLVadQNXPJ4FuyR$lSgk-XH)X%c&JX=Ed@64cdA@wgug91ekNJ8 z*_$kmL5^%vmi*~tY9v7|H>1|zO6$#bc<#zL-tAII?%R#+*UlOewS8lLIu-^ zMq#*BEkl5pr%mijH@=F8Gr|0(!KK6DEuxV< zKKZO#d}}xJPp>+LDg;Y8n~?qBIxS0N!4S=4KY*tNyE}b;HMtEQS(z879Uxy zVYeEZpOG1LhFeCr1Jq#<%YMt;;e${{r3u>ZEK46w)2>Dl9pTy#0!J720~YAfxeHj+ z)2dyNA+FAAe!k40a|h*xg#6a(tS#DsZp*o@l)6@y zvp&mQe0*fD*!lMA08|V^&Sb`O-hIo;edeBQ{pJ8=@t>6tk^dOS-G2~OlN>N^kZc+jX-J^*R{i5?DWgDS5`47jI3I^Hl zZEO=IDG6ve47qlo3jbOD|7Jnfc zjSe&T4Vfn0Lq#4$R!dNVtG{(65>$X^E3_j?Ufg=z5=d~55W<92g&nnha0S==wiUGkJ1 z(ioX|t~Pe{a@^hx!No@TkmC_yCdbjQn)j0H(C;A#+Oc``y}{7oC6Kvy#?Zl{hXTq-O4B|CB}X?cLMlqR)%Q0_vk^%Cd8UEY>kZv*l;G<3wvr)q$wMVf zFRW1waFw91O{WeYvKASPG_iNS5FkTR5gi644DrsaI#c*um0T~Ycco%ghg2`ZR^o%C zp`D%f3^4RI*I8_J-2k>Ynq*lA{3$$jEWtP>UFId+n1? zB@Bltuwul@$OyC3abMDj4;S+4v9aq@Kt<)Sj&Wm0Hb8X*{P-zo5t40(MtrpiiR|rs z3zaiu_*Q)GcK7ZQsu-#$yo2#UD^&Dv%UdWOs$91vO1*K+e$_m%(09sw#F_Zfv-;`D7bZNjbT-GD4?3Y$p@(Dh)(8`5EALyz-9{eLLxF9Q zE!PRYk3{vg>b?YS7|-KY)Hoej47XS-tjL9M4tZ|e-`!YgqiE>ObIvGD*r`XPGUv0n z39Xu$Jx(}t&<~I~5B5;_+a2ic9z#75!n%}V$4kzQ)|3#;%i=;|m)q&=qD(K9<;eX+ zx#`djv27wO@Nc=RCHhw#w4WDMJNunt@}3PB2H5@FV?|IC2%4y7)rl>=q}THVEl|(m zSU(WVbs?_Qlx90Pw zr-A&-dRcJ)G>C0kkKi{*C=E|~4l|M&BhLR5gp6>_*ifEiANXrrGioFPcpk191^tuw zqd$xNtRD{v1WH5(fry^!{A0`Td0aDT53&|8NK;KgN!vh4R|5%|6!dQi>3`)SR1nCN z@L!_Rf11P=_=y5`_4*eF{GVC>jVk^pFCHF&XGSjZ-*D!ipr$+UKdAG6ia)gjK80sS zjUx33h8H}7$>6BCW`uBJd^0K}cQ_Zm8HM6gd-RDlJj{=t>YYCQ8uy>NPu?8J4CL?Y cXzLf?>-g`NqoMyRfb(f7K85ZhnLVBU2j2Nau>b%7 diff --git a/main.lua b/main.lua index 1780f7f..f7093e8 100644 --- a/main.lua +++ b/main.lua @@ -4,7 +4,7 @@ local map = require 'map' -- Load various things in love and the game itself. function love.load() - love.window.setMode(1024, 720, { + love.window.setMode(1280, 720, { resizable = true, vsync = true, minwidth = 400, diff --git a/map.lua b/map.lua index fceca6b..3b382ed 100644 --- a/map.lua +++ b/map.lua @@ -48,9 +48,21 @@ local spr_list = love.graphics.newImage('assets/dungeon/0x72_16x16DungeonTileset -- Load specific player sprite. local char_spr = love.graphics.newQuad(80, 144, 16, 16, spr_list:getWidth(), spr_list:getHeight()) --- Load specific enemy sprite. +-- Load generic enemy sprite. local en_spr = love.graphics.newQuad(80, 176, 16, 16, spr_list:getWidth(), spr_list:getHeight()) +-- Load second enemy sprite. +local en_spr_second = love.graphics.newQuad(32, 176, 16, 16, spr_list:getWidth(), spr_list:getHeight()) + +-- Load third enemy sprite. +local en_spr_third = love.graphics.newQuad(32, 160, 16, 16, spr_list:getWidth(), spr_list:getHeight()) + +-- Load fourth enemy sprite. +local en_spr_fourth = love.graphics.newQuad(48, 192, 16, 16, spr_list:getWidth(), spr_list:getHeight()) + +-- Load fifth enemy sprite. +local en_spr_fifth = love.graphics.newQuad(16, 192, 16, 16, spr_list:getWidth(), spr_list:getHeight()) + -- Load health potion sprite local health_pt = love.graphics.newQuad(112, 208, 16, 16, spr_list:getWidth(), spr_list:getHeight()) @@ -146,7 +158,7 @@ playerob:setSprite(char_spr) layer.sprites = { player = playerob } -table.insert(layer.sprites, player) +--table.insert(layer.sprites, player) ----------------------------------------------------------------------- -- Layer for setting all potions. @@ -167,25 +179,31 @@ coord.x, coord.y = 200, 200 math.randomseed(os.clock() * 100000000000) for i = 1, 220 do enemies[i] = enemy:new() - enemies[i]:setSprite(en_spr) enemies[i]:setPos(coord.x, coord.y) if i % 2 == 0 or i % 5 == 0 then enemies[i]:changeDir(-1) end - table.insert(layer.sprites, enemies[i]) + if i < 100 then + enemies[i]:setSprite(en_spr) coord.x, coord.y = math.random(200, 1850), math.random(200, 1850) elseif i < 130 then + enemies[i]:setSprite(en_spr) coord.x, coord.y = math.random(2545, 3100), math.random(60, 746) elseif i < 160 then + enemies[i]:setSprite(en_spr_third) coord.x, coord.y = math.random(3704, 4432), math.random(36, 765) elseif i < 200 then + enemies[i]:setSprite(en_spr_second) coord.x, coord.y = math.random(2563, 3234), math.random(1175, 1758) elseif i < 210 then + enemies[i]:setSprite(en_spr_fourth) coord.x, coord.y = math.random(8864, 9216), math.random(8864, 9020) else + enemies[i]:setSprite(en_spr_fifth) coord.x, coord.y = math.random(9168, 9580), math.random(9425, 9566) end + table.insert(layer.sprites, enemies[i]) end enemies[221] = enemy:new() enemies[221]:setPos(spawn.returning.a.x, spawn.returning.a.y) @@ -462,7 +480,6 @@ function moveEnemy(e, p, dt) enemy_attack:play() p.health = e:attack(p) impact:play() - print('Miss me with that gay shit.') end elseif e.name == 'enemy_troll' then if dist(e.xPos + 16, e.yPos + 16, p.xPos, p.yPos) < 30 then @@ -475,7 +492,6 @@ function moveEnemy(e, p, dt) end enemy_attack:play() p.health = e:attack(p) - print('Miss me with that troll shit.') end end local actualX, actualY, cols, len = world:move(e, goalX, goalY, playerFilter) @@ -507,13 +523,13 @@ function enemySelector(p, dt) if items[i].name == 'enemy' then local target = items[i] if dist(p.xPos, p.yPos, target.xPos, target.yPos) < 10 then - if items[i].health <= 0 then + if target.health <= 0 then enemy_voice:play() - items[i].alive = false - world:remove(items[i]) + target.alive = false + world:remove(target) break end - items[i].health = p:attack(items[i]) + target.health = p:attack(target) end end end diff --git a/player.lua b/player.lua index 416dc37..f97df53 100644 --- a/player.lua +++ b/player.lua @@ -46,12 +46,6 @@ function Player:resetPos() return self.originX, self.originY end --- Self explanatory. -function Player:updateSpritePos(p) - p.x, p.y = self.xPos, self.yPos - return p -end - -- Set player sprite. function Player:setSprite(quad) self.sprite = quad