From 6f2eff29ccee04376f3e959be5bf15dbcef99536 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 1 Jun 2020 18:22:49 +0200 Subject: [PATCH] added ferris wheel and fix out of bounds placing issue --- Android/Resources/Drawable/Icon.png | Bin 4173 -> 4096 bytes TouchyTickets/Attractions/AttractionType.cs | 1 + .../Content/Textures/Attractions.aseprite | Bin 1107 -> 1518 bytes .../Content/Textures/Attractions.png | Bin 1627 -> 2541 bytes TouchyTickets/ParkMap.cs | 2 +- 5 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Android/Resources/Drawable/Icon.png b/Android/Resources/Drawable/Icon.png index e2eacaadc9ef5ebb191c9ca177f5e2f51a95713c..111d522563249a77111e325622a4062be850beb7 100644 GIT binary patch delta 892 zcmX@B(4ep(o2$OT)5S5QV$Rz;XS3o$CE6b9``(g@zO{n2o2`>?QPZO4hGJ0>8SY0b zDtH>3_*`0KoLB|l`1mha)WM-Nt-%oH zRW<*>wPU{+_n!P$Q=IrS;D6hk$q%`;O@QW^)l9d%`+UA#ty$H-cjwAX?5pPgKle7; zd4BzudDZQ9_Iv#w+{h`LfB5Ux)ffM~_{{>=r~uR`_Fn1s^Ycr7|B1eB&HhF0ck!zy zIVSJz8aICDv|yb4kXL>3e=at~oU||8Ks7Jz%69e7m)d)NzSsT#R~YvmuUq=x{^kGo z8E|*2b-!o6ap#ZqEc?v`X0!aiZ`{6Y`Qo2t)z#G(|2#Xp@%NX-?-xs)<(w=apgvhn zfL-@vEyMf0g_g7I>oe^@%FDOqyM11Hc%T0~ukRm&Uw-$$Z~ynNO|ha>Ia5R0D0Ozdj{D;8M1?B6uUw*E^k%gPe@|6jjvuKl(A+2;54 zUym-$s4M!oIj7D*eX;?!2GE&oR=oT974AN-{}i>2|9`28?aVWCXY@W3&tK#AS^MZz+8C|JL2& zXP3YG{rLPFew#lR4(>Uj5dY?{)LHrYGP1w^h>OYfKHJaxUU)~*lRT68MNE?e`J_SN zWey6jSN!42H|_u6vPIzU`TfT?ANMa?^z!`sl=Jaj%Z^+B{k<~dU)hhpm!JEKZTdK~ zV7~qTzbW8Q69FZz67io3Hs4Fi<};|cz5l!%ETJXLfDV4h|KyK)c}_=aYGo}*&ePS; JWt~$(695QlxikO( delta 912 zcmZorIIFNBo2&k;r;B4q#hkZyeY>xvN*sGAd0)-@ikDAOhvo*2rl=hmin^;@ANX;s z3f=OOo9D)9C8Zg^SlC3LtP6YBqohsnwER< z&x_iB7cc#0SvM~_YPosj?EL;S{$KJ>py)9;Tt4%1?Y~~@Z!YKKBln4&?Z5YYf92y} z7oO+udwg!;dH?sqH#V8>KL7C0qnR0XUuu~q7xEa$luvy7IsH=Yztz{LU4Q9&E$#QV zwHNpNW;u3G{Q=A5dLG5e{k%L%8+{kYE8KnV|9#`-+CNu-ZVCDI@AmbVw%4@&{`UM| z=U&V-c_E*cq7TD@h#L6=OTDKr{ux_bz369&{O?!CdN0=OzIyd)#=lEbC-3F4(vsg( zWi-parp9a*(7fsEV>_P(Pu}N0&+Gfg;FsU$@2mgyyYi8T$vYN?vy&TnWh9Z&Y#!)j9c>A?t;?}A!HQV_AUpzYd;-AJ3|98j#E4Q3Azr}lL|N66XXHHGh!wR96uY|VA#Vv)K&_al!O+pYwft#YBO%P&> zAR=%VEu-2*U!ZSt>KS-0&%C~8?wz_b*F`TpoSApdd(Q8i^Uj$+Jw3k7Z0!ape{%V+ z?8d~2urW0hSla9B!@c4C+ntmj=kT}FK6tOc{+g&=_6v<_fZAn_v6ElREStOcDnQDt z>}MKJ62;;_y;%;_&i3NIdLA=MTdz{PmdyF)(BXY^?=fF`{4vG6`toxkWk(&$jyZn! z>~6xUf=}lkjGinr1#YO`f5>Hze=#pU-AmMpo!l?B)>5)LQ(qVlp0v*K>5I9z$-_A& zv$8`RpEu`^Zm*_NqLyE=9RO z*C^YDFziL7(G8{RzjNQ%4g%lpG7xH`AN=QIZ`o&AgR0 zlgaY19d8WQ#~cC&c)-V;p{!q-VU|bd*p9_p3!Pg#9*wo_FgL-|j=Xz`^7!-~%%fPY z#P0W2irpuz+Q^E_(^lSg{@cN@4{N8x-pz@CvfC_bSzPelpRY7^e^A&xuDRLSl=OPH zdDWB)ob=-udDR{j)av9DG3r;A;ZLiz5i`-kX))qcxQ*Qdb zxH9&ZR_h5a=8WFAf6V7tT#%hu=QI9?L zvffi-&vdQ@IN>8Jj>!&be3|ble6P0eSImbPx6L26SJr!qZI_dl8D{xn>_xttShG2q zhuf}IS>?i6Em tt;+hRr~eO?Ig81Y7h5F1?VHN`4>%TE6t~CU2^G!TiLsQ$^BX1}#N{$W7-|3j delta 609 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 0 && nextPos.Y >= 0 && nextPos.X < this.Width && nextPos.Y < this.Height) + if (this.PlacingAttraction.GetCoveredTiles().Select(p => nextPos + p).All(p => p.X >= 0 && p.Y >= 0 && p.X < this.Width && p.Y < this.Height)) this.PlacingPosition = nextPos; } else { // move the camera