From 73add013dd0b3073ad4a54472e64dcd257a4d328 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Thu, 30 Apr 2026 20:22:09 +0200 Subject: [PATCH] =?UTF-8?q?art:=20stun=20de=20sam/morcus=20refinat=20i=20m?= =?UTF-8?q?=C3=B2mia=20m=C3=A9s=20baixa=20per=20saltar=20millor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/entities/mummy/mummy.yaml | 2 +- data/player/morcus.gif | Bin 3289 -> 3282 bytes data/player/sam.gif | Bin 3289 -> 3282 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/entities/mummy/mummy.yaml b/data/entities/mummy/mummy.yaml index a59e02a..3090dc0 100644 --- a/data/entities/mummy/mummy.yaml +++ b/data/entities/mummy/mummy.yaml @@ -18,7 +18,7 @@ collision: # jugador amb jump_z > height no col·lisiona amb la momia (la salta # per damunt). Amb impulse=240 + gravity=600 el pic ronda els 48 px, # així que 24 deixa marge per esquivar amb un salt no perfecte. - height: 24 + height: 12 flags: collides: true interactable: false diff --git a/data/player/morcus.gif b/data/player/morcus.gif index d8d2dece9a7f3050aa727c45f3beea7ba904264a..48bed83d6a1a6fde291376ec08787f5f6cc09987 100644 GIT binary patch delta 1456 zcmV;h1yB0f8PXZBH3xsSur;S%hj}5BJd2_#ia1ZRkTJ_OQ<321%RKD{dfur-*qb%APvK9&ek(&v`QB zP}VpoajzOrNzF=9p%NhfEGJu9#X?i5f#@|zT2gM1W*yt;NJf7lIMVehupQ+GD zV*ItzVdYgRVx4AEm&(+wLX2S$0jn|I3PT~gg)3@NtH@>urKcVhsbxI|TC-R*!162> zcWf*?<+`(4CboZ%1S*Y~CmJCy$+Bx#du3tH9OB2iLU4d$#V88{i`e@4&wviJpnpl> zG4prA8T2jx4i8-kMH@j6QwYOy932EQp!W%uJ}xz(8>&o;2Mmxt1E{^gknDQ17n=_C zda$(JjhVXDc*+xb&Gu?N0Af#)P{eq1EsAI0SDw30Cux7{t0!6zo1TJ+i7hgB>^i+= z*@%KROx)t%d(PsY6u#wuxwudX>onWfc!syT*X>=+1;Q4U#)17oQFmkt-4cFDKPHuq z2%{>)0%5R*wIGoZH}s=Q=yyU$s5gHrAtVY}@EQbe(pGTA#R@kG!f9G0Zw=L83qJ_N zS7kzE{6v3=2a<`!LH>kg@v9zR`M8e9#}uwKl`JN9c}`=o6}*%L$1*R;kjWM0X^Xt7 zJ)f195&xs}vhWa(}%s&weNNPJD%CF%0;oqwuJYa z;R~Nq1o@4ikH2q%V&$M$F~~%h_h9CCvH3xJ{_~&@eTND?x!KV}ID{tRgz>jlGxRjGu|~7PR+@u_@}V+zB{fwTM}c%# zUMPl1qcef^G|+K|S!0G@_DE^ihEb<8XoiMz2!@6Y-ho13=#}$8w zd^m_?!&#HkHi(#es8maeXg0OrNv0P#bwfLnI6t#giPM22I0Sp0$cYf*iJ~`(q*#ik zc>jvQbY-cs#-24f5qW?t>r# z&@$&(8SUs)%b;Hp)iM#4BBC-t@*$7zkyj3MLj9Ou8}&f`6Oj9`WEN&X8H7O$hL9H& z4-DBd2N*#hB$4`dLNJviRwhLRqLGEckvheZNTFhFRYYPjl4~H6G?Zc`nUa4DQDfvX zMC@i|x-oN3MLyne4k+Z3LPV1cAuKNzUk#8(FSRQ<5tND1K`-$v6c=z{bZ9x06BVOu zBFA85EyHB|WqN7ml-VYexWpWAcpGa5mR|{vUWr3i6PBrPmSagtKLdek86%A3dW#eq zav7I!NtdHT9-34<*(Y3md5b7|d1<6X2&fm1v$Ts=a+n`hO1U^rd-gf81X7Wim5P9h KmT4go0028cA+cWo delta 1463 zcmV;o1xWhR8QB@IH3xrlo)c||(BK6joz9VZVFkg?0g-35Sq|e(DS>AvZpquH_>=XYEX0fC-#CHJ=q3B zQlWAmf~NZdZjfdj@aR+*(>FjB*0&wyz%M*b6~K)?5S}LdD1m=Mx{Y`kkiEN*2t`_H zES8edr3sdzK4q#Alhia@`;wO4ObB8B`OBy0T9*n?9F?MqrNrnc%ToE}RDZ2>Sb3f5 z2&+0xY-JTMX=y-LAp+KyJnM)tE$cDRn#GWLY-3*Z6%6Bwow?RBJUe5?Q;!+~FL^ms ziS46cnZvVbKGuH~k?q>mtf|vLmicm;^(-q$3n9=3Q?Dq{L~8N;+CKaF&wvi}Yu$@r z%fT{(#$@yVp=odg;;tdl%NcH@8?ER^ryyJ0rAYKb)U{nt zsr9h2HuS;N8_Sb*&E{%v?xDJpPz0{iDT-&nSDw3e#3g^tt0!6z8@z+DMdprOr?)8k zxU&eDTWH0(XrGPRZPsgxukj24XWMekxUWCL-R)h?1;7@ShPX3@Zf~!o-Mhj{KPHuq z0HZ3y0)e1{BXUv_!eif8kZ?l$tdUg{6v3=2a<`!LH>kg(b!TRXUk7v(o>)?HK#2$c~h^j6(Fc zuqW0R#u59q)9zO#7zdPvdHZ3D)||OBt?pyXGMaxUwVgijovwbbE8qpEO1~|NJ+fuP zDi6Q-lp@G)1cm&p926_cdyqjU!u;joz6;F@`tzU9eiK)aOV* zF><|&WPeKE+Ezz|FNN)E5Bu9Msg=?d=QWQcA17tWxnJsoejXn>G~p@u%8&JPqu-|H z!)bq>;ic0$jn_NouW5G8&VEV{wJ~|77f@z9KSRi$G5Gc~y{#nwG7Ym?`- z;rl87Oi7jN1lD3y=TOK%81+Da@ueyWQGc+4bm`+N0tkQ+cW56|bWqh&6!=r;a7(vx zV@Dws&T>=o5iAx4g7t8L7Z!rrLNf6(R5gF}Ec@b8YjGDMCN3yOAX{-1{?md47gjJh zR1qjLd{IRngfOv^gGA^HNZ2n0VT78)Rwm+vMJO>}wL~H_Lr*gsYcwlR=s_CORw<)} zaTG{*B{gDbhGm#EIulq=108IbHEZ~0Q5T0&qcnA>Gh)_;csPcJl!w}3HI6nMfLMQN zf~XsTsCH{+BW2Slp|ps#)Ha+oDUfJ3wcts77C3c7JC-;8}1=sep+Jk19@%fo+t_7ghW<80VSjoNrTwX$B(BaS*nj^*fls^JX> zl~4530;kh5>-dZE)jTn=36JnHdrR06T~3vlIXT diff --git a/data/player/sam.gif b/data/player/sam.gif index 0f15c83e4ca377d3b2c59bba333d92ba53174cbe..4cdf20f1640e630cf5be7d7e89be83ffd49adb22 100644 GIT binary patch delta 1456 zcmV;h1yB0f8PXZBH3xsSur;S%hj}5BJd2_#ia1ZRkTJ_OQ<321%RKD{dfur-*qb%APvK9&ek(&v`QB zP}VpoajzOrNzF=9p%NhfEGJu9#X?i5f#@|zT2gM1W*yt;NJf7lIMVehupQ+GD zV*ItzVdYgRVx4AEm&(+wLX2S$0jn|I3PT~gg)3@NtH@>urKcVhsbxI|TC-R*!162> zcWf*?<+`(4CboZ%1S*Y~CmJCy$+Bx#du3tH9OB2iLU4d$#V88{i`e@4&wviJpnpl> zG4prA8T2jx4i8-kMH@j6QwYOy932EQp!W%uJ}xz(8>&o;2Mmxt1E{^gknDQ17n=_C zda$(JjhVXDc*+xb&Gu?N0Af#)P{eq1EsAI0SDw30Cux7{t0!6zo1TJ+i7hgB>^i+= z*@%KROx)t%d(PsY6u#wuxwudX>onWfc!syT*X>=+1;Q4U#)17oQFmkt-4cFDKPHuq z2%{>)0%5R*wIGoZH}s=Q=yyU$s5gHrAtVY}@EQbe(pGTA#R@kG!f9G0Zw=L83qJ_N zS7kzE{6v3=2a<`!LH>kg@v9zR`M8e9#}uwKl`JN9c}`=o6}*%L$1*R;kjWM0X^Xt7 zJ)f195&xs}vhWa(}%s&weNNPJD%CF%0;oqwuJYa z;R~Nq1o@4ikH2q%V&$M$F~~%h_h9CCvH3xJ{_~&@eTND?x!KV}ID{tRgz>jlGxRjGu|~7PR+@u_@}V+zB{fwTM}c%# zUMPl1qcef^G|+K|S!0G@_DE^ihEb<8XoiMz2!@6Y-ho13=#}$8w zd^m_?!&#HkHi(#es8maeXg0OrNv0P#bwfLnI6t#giPM22I0Sp0$cYf*iJ~`(q*#ik zc>jvQbY-cs#-24f5qW?t>r# z&@$&(8SUs)%b;Hp)iM#4BBC-t@*$7zkyj3MLj9Ou8}&f`6Oj9`WEN&X8H7O$hL9H& z4-DBd2N*#hB$4`dLNJviRwhLRqLGEckvheZNTFhFRYYPjl4~H6G?Zc`nUa4DQDfvX zMC@i|x-oN3MLyne4k+Z3LPV1cAuKNzUk#8(FSRQ<5tND1K`-$v6c=z{bZ9x06BVOu zBFA85EyHB|WqN7ml-VYexWpWAcpGa5mR|{vUWr3i6PBrPmSagtKLdek86%A3dW#eq zav7I!NtdHT9-34<*(Y3md5b7|d1<6X2&fm1v$Ts=a+n`hO1U^rd-gf81X7Wim5P9h KmT4go0028cA+cWo delta 1463 zcmV;o1xWhR8QB@IH3xrlo)c||(BK6joz9VZVFkg?0g-35Sq|e(DS>AvZpquH_>=XYEX0fC-#CHJ=q3B zQlWAmf~NZdZjfdj@aR+*(>FjB*0&wyz%M*b6~K)?5S}LdD1m=Mx{Y`kkiEN*2t`_H zES8edr3sdzK4q#Alhia@`;wO4ObB8B`OBy0T9*n?9F?MqrNrnc%ToE}RDZ2>Sb3f5 z2&+0xY-JTMX=y-LAp+KyJnM)tE$cDRn#GWLY-3*Z6%6Bwow?RBJUe5?Q;!+~FL^ms ziS46cnZvVbKGuH~k?q>mtf|vLmicm;^(-q$3n9=3Q?Dq{L~8N;+CKaF&wvi}Yu$@r z%fT{(#$@yVp=odg;;tdl%NcH@8?ER^ryyJ0rAYKb)U{nt zsr9h2HuS;N8_Sb*&E{%v?xDJpPz0{iDT-&nSDw3e#3g^tt0!6z8@z+DMdprOr?)8k zxU&eDTWH0(XrGPRZPsgxukj24XWMekxUWCL-R)h?1;7@ShPX3@Zf~!o-Mhj{KPHuq z0HZ3y0)e1{BXUv_!eif8kZ?l$tdUg{6v3=2a<`!LH>kg(b!TRXUk7v(o>)?HK#2$c~h^j6(Fc zuqW0R#u59q)9zO#7zdPvdHZ3D)||OBt?pyXGMaxUwVgijovwbbE8qpEO1~|NJ+fuP zDi6Q-lp@G)1cm&p926_cdyqjU!u;joz6;F@`tzU9eiK)aOV* zF><|&WPeKE+Ezz|FNN)E5Bu9Msg=?d=QWQcA17tWxnJsoejXn>G~p@u%8&JPqu-|H z!)bq>;ic0$jn_NouW5G8&VEV{wJ~|77f@z9KSRi$G5Gc~y{#nwG7Ym?`- z;rl87Oi7jN1lD3y=TOK%81+Da@ueyWQGc+4bm`+N0tkQ+cW56|bWqh&6!=r;a7(vx zV@Dws&T>=o5iAx4g7t8L7Z!rrLNf6(R5gF}Ec@b8YjGDMCN3yOAX{-1{?md47gjJh zR1qjLd{IRngfOv^gGA^HNZ2n0VT78)Rwm+vMJO>}wL~H_Lr*gsYcwlR=s_CORw<)} zaTG{*B{gDbhGm#EIulq=108IbHEZ~0Q5T0&qcnA>Gh)_;csPcJl!w}3HI6nMfLMQN zf~XsTsCH{+BW2Slp|ps#)Ha+oDUfJ3wcts77C3c7JC-;8}1=sep+Jk19@%fo+t_7ghW<80VSjoNrTwX$B(BaS*nj^*fls^JX> zl~4530;kh5>-dZE)jTn=36JnHdrR06T~3vlIXT