From bf94860af3c521a642804a32aad3c52bf7cb5ed8 Mon Sep 17 00:00:00 2001 From: serxoz Date: Mon, 30 May 2022 21:27:09 +0200 Subject: [PATCH] losetas cercado --- TODO | 7 +++++++ entidades/cercado.lua | 2 ++ img/valla-fondo.png | Bin 0 -> 902 bytes img/valla-frente.png | Bin 0 -> 908 bytes img/valla-inf-dta.png | Bin 0 -> 1089 bytes img/valla-inf-ida.png | Bin 0 -> 1073 bytes img/valla-lat-dta.png | Bin 0 -> 718 bytes img/valla-lat-ida.png | Bin 0 -> 710 bytes img/valla-rota-1.png | Bin 0 -> 1515 bytes img/valla-rota-2.png | Bin 0 -> 1739 bytes img/valla-sup-dta.png | Bin 0 -> 1047 bytes img/valla-sup-ida.png | Bin 0 -> 1010 bytes 12 files changed, 9 insertions(+) create mode 100644 img/valla-fondo.png create mode 100644 img/valla-frente.png create mode 100644 img/valla-inf-dta.png create mode 100644 img/valla-inf-ida.png create mode 100644 img/valla-lat-dta.png create mode 100644 img/valla-lat-ida.png create mode 100644 img/valla-rota-1.png create mode 100644 img/valla-rota-2.png create mode 100644 img/valla-sup-dta.png create mode 100644 img/valla-sup-ida.png diff --git a/TODO b/TODO index 11d6885..c1c7839 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,10 @@ +- colisiós entre entidades - muros - comprobación perímetro cercado (ovella dentro?) - puntuación e tempo en completar + + +Ahora mesmo comprobo si dúas caixas se solapan, así teño colisiós. +Vai ser mellor formar o cercado coas pezas individuais, así comprobaría a colisión +con cada unha das pezas e será máis fácil deixar a abertura. + diff --git a/entidades/cercado.lua b/entidades/cercado.lua index 96f6eb5..1210141 100644 --- a/entidades/cercado.lua +++ b/entidades/cercado.lua @@ -7,10 +7,12 @@ function Cercado:new(x, y) self.x = x-self.width/2 self.y = y-self.height/2 self.speed = 2 + self.proba = love.graphics.newImage("img/valla-frente.png") return self end function Cercado:draw() love.graphics.draw(self.sprite, self.x, self.y) + love.graphics.draw(self.proba, self.x, self.y) end diff --git a/img/valla-fondo.png b/img/valla-fondo.png new file mode 100644 index 0000000000000000000000000000000000000000..ce51e295725b2b92d5c9337f73ee06429de74a5a GIT binary patch literal 902 zcmV;119|+3P)EX>4Tx04R}tkv&MmKpe$iQ%glE4(%W!lA$_TC@SKpRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRe3JS*_Mt`=0!Tp@O!u%ypW>NMaF7NJE5-Ix48bLX1|86cZWRPk8u;9DkZzGPx>X zjdyW16NwdUuyz0pQJZB zTJ#7Q*aj}HJDR))T)T7Z3lldCdR-02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00CY}L_t(&-tCyZPQx%1g^ybo3K5`6l|XptOeR*|A}a&s z*(d{Ro&ZKxrm!KFAcjgvNFhH>YL*rd{Yz6L1?!wG^0kh?>l<6X0wv_R>Iy)A&d{|V zgnby0=c)mKi#bCBKL{^Z&2PXGSpy=LZ1oL*GXOZ=PrAEXBj-0EEzxjbb(nLOKAZ=1&z8Y0Sf(((+t&yI|}TKnDQYatztjGXZ%a zkmO&vcmwdTroS-{;kiol)T)uBI*9E6+1pNeA=YX~($o$XnIwXxMG%4zgdhYV2tf$) zM^D`{L2S^mv?`RA=c?xtab0}(mVPP%Ff_E5jXWeK4YG=I7MPn4gdhYVNcDRJz}>2#TsKd~S{%(}LFiX0iboR*+0=tiUH&5k cA;|yICkZ2TXvxMjVE_OC07*qoM6N<$f~T5sjsO4v literal 0 HcmV?d00001 diff --git a/img/valla-frente.png b/img/valla-frente.png new file mode 100644 index 0000000000000000000000000000000000000000..4de21a19f28b2d3e2863e638f694b53abd8a8d66 GIT binary patch literal 908 zcmV;719SX|P)EX>4Tx04R}tkv&MmKpe$iQ%glE4(%W!lA$_TC@SKpRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRe3JS*_Mt`=0!Tp@O!u%ypW>NMaF7NJE5-Ix48bLX1|86cZWRPk8u;9DkZzGPx>X zjdyW16NwdUuyz0pQJZB zTJ#7Q*aj}HJDR))T)T7Bp9*p{M`=02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00Cr4L_t(&-tCynO2a@DhQDb-s+OYCLWL|`8xXn@e2Z*d z*gl(e;Wkg8OSghhcj6}CqF!rj8ye%LMKQgk?TB?a|8AHw{PSf_GC4<)LB8jn0JSkw zr$IBUp+UaqHh|+XQ;nb*)@QBHVTgEX>4Tx04R}tkv&MmKpe$iQ%glE4(%W!lA$_TC@SKpRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRe3JS*_Mt`=0!Tp@O!u%ypW>NMaF7NJE5-Ix48bLX1|86cZWRPk8u;9DkZzGPx>X zjdyW16NwdUuyz0pQJZB zTJ#7Q*aj}HJDR))T)T85RXw{DS}h02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00J3FL_t(&-tC$}YZE~f$A8m_**4LlX&{9?q*o(C4pQ(U z=*4U3&5Pfp;8zeofq3w`UqE{lM0$*PQHv~1K}&YqH0_$5@sOt7vWtOumo11j6c};%@!?wVj*xZ2Rej}&X zz|S8a(&o~7w=VCnM>>8sGuN{1jtcgw+6XlEv&RAu1LKc z8c!$&W+cg>jFNIZqV6^{Fl;d)ZB3-P#$uBqjBD#JG1vKm0Mrk&HOo1 zy~6xtgYL|IYpH*uPgN#9LL! z{&r8x)zoAWw;U0DykyE=)*xfOwfxg>QLMBqhy}4Af6aaYfa#Wt1g=4<00000NkvXX Hu0mjfedXJM literal 0 HcmV?d00001 diff --git a/img/valla-inf-ida.png b/img/valla-inf-ida.png new file mode 100644 index 0000000000000000000000000000000000000000..7c59c7f1584d48ddd030b018f9c7a61f5c718ed5 GIT binary patch literal 1073 zcmV-11kU@3P)EX>4Tx04R}tkv&MmKpe$iQ%glE4(%W!lA$_TC@SKpRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRe3JS*_Mt`=0!Tp@O!u%ypW>NMaF7NJE5-Ix48bLX1|86cZWRPk8u;9DkZzGPx>X zjdyW16NwdUuyz0pQJZB zTJ#7Q*aj}HJDR))T)T843|vpv(XO02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00Id~L_t(&-tCz&Z__{+hM)6A4y{F#w2>NQp|T(qOGtsAbtVjH}F@wux4dqjD#4N!Ukcmno5Y)BxzkIjv4C2mSQj}b!vxur~7=q zJHL1DeV^|;K?Z1A<`&SM+6Q;-c=f$k@A#I`<`8(1(A{CHW4}xrQ)5Z6G(<`_Ie61D z-vYY;4>$VtYWZyLozsieXISRb&}_Fl_Ve5k0XBgx04V}=Ii7n#iogJj(EPIW(h`gI zS|5)aZO4;tXg&gJ02STmmYmG><@y?qC#U8K@F^G4@&mD(^xW|z4l=EI4cJp&>tAs; zh|2dXeS!=Wy$~Yac~q`$4A3&rfs)o$(HmBnh|Bq_Y6D7QR7@gYomJf6lE}91VrU~J zEk#5TDX`aaf%h?cuaHDq9s3yApV~W*36!*Maz&b!Spv-2Y{}?1UI@ryeX`mkX8b&| zwjMk2^?-?zmf9oNjwg*Hm7x1Ch%7vd@}YOf?vJ!_LbEzi{wj_k@I7~XB#6bAzl8A{ zg34=M83QLOTeXugycdwj*o(?*w_TM*$<=1>I_tA6N?ra$7hW-m91Y8}EXs;5uT2w5 zS}AaVH%S#f;x$k$L}X8i`dz|Xs%`xThIX!`rHCjZ%NP)WHVN0v7lHm@9LUDp2MWJe r7T)LFd96QqGj-HeL=+K4Bpts11PXxlq%tsQ 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 h`Qw*$002ovPDHLkV1m}w3Jw4O literal 0 HcmV?d00001 diff --git a/img/valla-sup-dta.png b/img/valla-sup-dta.png new file mode 100644 index 0000000000000000000000000000000000000000..e0368e612ed68ac863012e3966f39a9246671fe6 GIT binary patch literal 1047 zcmV+y1nB#TP)EX>4Tx04R}tkv&MmKpe$iQ%glE4(%W!lA$_TC@SKpRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRe3JS*_Mt`=0!Tp@O!u%ypW>NMaF7NJE5-Ix48bLX1|86cZWRPk8u;9DkZzGPx>X zjdyW16NwdUuyz0pQJZB zTJ#7Q*aj}HJDR))T)T7bH^;fQeSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00HkwL_t(&-tCyNZWBQehQGbrb4;9&Sh5t0D_kP3A`KD^ zQfO#T>1dKifk!~1phSp*);&@vk!X_2hz3Dn5~LtUkz$|iyIqPn;S`hDI2#AWGu7SB zXryoEmu7bqV^|!8Z-9-zxZc(q%?7cONJN6tzM7b|@gt z6iIqoix#jm`2IO$jjEhF6dr9p$2@Dj?A>Q z;wT(P0+n;l*W)OBboTJmp3x7gyVC_>u!Nh?@(a2@Z+4N^B|1_oA30B2@TT7reJkj@ zPpYg)YvST{I&N4}>(kB(02F=0N})YnkY3N#7R960KVAnd1V*GKAOa#F0x}~55%@61 zu)Alhst#2_**&eY&&M}jwG6CY=TrCbC7!zPPoBDQ6s`eVA}s+C5COST`we^CfvYDD RPU8Ro002ovPDHLkV1oRb!(;#e literal 0 HcmV?d00001 diff --git a/img/valla-sup-ida.png b/img/valla-sup-ida.png new file mode 100644 index 0000000000000000000000000000000000000000..f2cc6da83ed228b3a5ef5cf3a8aeca22ef41a0ca GIT binary patch literal 1010 zcmVEX>4Tx04R}tkv&MmKpe$iQ%glE4(%W!lA$_TC@SKpRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRe3JS*_Mt`=0!Tp@O!u%ypW>NMaF7NJE5-Ix48bLX1|86cZWRPk8u;9DkZzGPx>X zjdyW16NwdUuyz0pQJZB zTJ#7Q*aj}HJDR))T)T7dbEq>{I{%02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00GKLL_t(&-tCyZP8&fKM$hby7t4;ESXct%M9`tQN*7Tg zUcfB{@B~OmJOIxE4XxXxNf|){mFc3SaBu+u0k#(J&rsl95ME>j*|4_mSIyO(S?S#U zc6R0}QleV5vIndsr1t8K=Ek7)789b00a0&kr+r`vV6Nbna*mgOI;YdkwEtdZ&wAm{ zdZW3T^ep|xg`5HA0hBUmE9kGZ(s>{P{3X^Jk)39G;TNC?kkujDHhuH`K;imvy)S^{ zv{-8?veRR^z6JikwMAfgqOGN0$xge`c&^}<1Wh z#me|NRw&jI5CIVo0g)f#3s1u82)G3Bjr}<^YPPS^%Cxi!PErl>&&zJt8|Oa;Ty?+8 gRaZa+L_lKQ0U#f8kSs6RXaE2J07*qoM6N<$g0!Zx(EtDd literal 0 HcmV?d00001