From 32bc684f495dc3c7b6a3b2496548c6f75a635cc4 Mon Sep 17 00:00:00 2001
From: Jakob Feldmann <jakob-feldmann@outlook.com>
Date: Wed, 11 Oct 2023 17:36:47 +0200
Subject: [PATCH] feat: Sold out vending machine

---
 .../contraption/ShieldVendingMachine.aseprite  | Bin 1191 -> 969 bytes
 assets/contraption/ShieldVendingMachine.png    | Bin 516 -> 685 bytes
 src/Contraptions/VendingMachine.gd             |   3 +++
 src/Contraptions/VendingMachine.tscn           |   1 +
 src/Levels/Level 3.tscn                        |   2 +-
 src/Levels/Level 4.tscn                        |   6 ++----
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/assets/contraption/ShieldVendingMachine.aseprite b/assets/contraption/ShieldVendingMachine.aseprite
index 68d9c31770085f1dd4c5eb408db374ab8d9fe459..a32849f5af3decfbfe9851332a1cf0032f223914 100644
GIT binary patch
literal 969
zcmcJL`Ad^w0LR}-@s~0q=m2xCX=Rsfn#$6gSej;`n5oUuhAFzG%XwgVg=yje%cGVq
z)<ILmsThLQDm%<0%@ve3BUX7PIGQB$oyXHxyZi@w9^MZR&-23P^E_QEDC)Cv8RbRM
zn9C@NI)m@uz}~_pWrg`ahClo!gZZM>9D;TDEa*k$65RmS8)^FY4r|HD;*wC*W_mB^
z<KO|tayg(h)E(3%Z3VTrVnO|jDsX1f6|5W%0)<c5pj$;E7!bb)3=XgdojkZ8kCy_n
zPv?RWiC@5IIRT?y4}skuXF-BNQS$m0FfY3Rj28;Q6QRLins*VXa&iK-VbNfJ#zRml
zI}8?y*+hs7m@T|JjRh`&8z3L;2uC%N(TiA=A`^`WL><!5g(wsuXQ71<R3HI<$YF*S
zP6%OxinU;(@!Wq05-1Dmh~RvTgyuX&gE{@{j4c22j~BYqZ%kA+B|c|cU3RurScGq=
z-N#`+d;TH6u=KVjD0N&EGH#b!GBiGE)Mxtlrg=A|NN$8PdSi~ieNFs8f~!0#*|$8-
zg-Pm7GG55yZQ^I$Oh3`c&)QK?l_^f^w{CxGj1_T93R(ST+UB=2g29om*GDee_+@JR
z3@)xUEa|cRvP*3wa@W1Q_WtIGspR<p&$!tubuGl8=<FC6yi=TA>v(R}clAMr6V~lq
z&9r?Roi0loQYv!lZJJ%YJl|{T)pw)#;)ZGmow`qDYj7cte~4zA#sZo7F%y?O;MmCC
zNO#u|8;%d@P_^cfYsQ;bc|Jt_$fz)7O+^R;<%b%N9_P9BNlGQ<5^K}k&WYBL)xn+z
zrZRkWqrBk^N0QtYM3joUwGFN&RZegEq}ouQ(If5A>2><1lVbiFO<<|`lXzvaMyBC$
z+mi0b4vS`3N=9(D%XTu}vLa!4FfudYNve+9GdFEwVgz}j?Vc^GPsszde9O|t{C3&=
h%XcGo5w8TDGwZcgM9EmYkCJW0WD7&MiPExM)lUYidUOB)

literal 1191
zcmcJOi%*SV9LJv{m1`O)9oBhAVwy-9=}6^r6w_8}a+xV)x!2BC7Rg-K9Gg~dNh@jD
z+=XK0(!6sWjbqfD+;SgE%c-N|^MvUi@Vt9Jd-uHW&hPzxzV9jRE<{6#Mkt+!MhLN#
z^WQQEjocKj9RFjDV1C;-$Ihva3~=XkRys#^8CS!Gr(*cCGo#BLA)K6g*oAO&9RPzp
zhQm~k(eS)73R*&j!M5aH&{{kg+8>8W+CrhZX(`OFn+oHvjfZZ9eo(t11bRmY!~TjQ
z_XFjVBNx`l{UgtzVpicXTOG8sgy?9#3fs(=U`ydX_%1mWUWq&e(<g0)p#d?_duSjW
zIz$V{`HqC^!{n^XMgy!nnh3ww=EG+VAK<x)hcG+m6kKiG4I}3!z<?l`CEPmzF7TfS
zP0`V?(wGe2mlwlVjq=?ps@vh#L$Bey-Br-AaT^?#GzX5`D$^}GC4YHueI>lt`Vzjb
zJr32=*|2cCoS2>z3+K<72E&773cX%0ufxNk!64uNxmM;X9yk!DxwycZ2w}I-T6aN_
z1{$L-x}qprq9Xc{<<N{RlujswHmHIgD1iphk9)*pT`ITRk&S6I;~2r%MJ-;Dicxgp
z5|LO$A^wnuIke#nVc0?yo{)qg^xy_DSV0Lskbwy_-~a)nCpx(aO=9Abm7t^~BKdSO
zp5oBu(<HZW7PFV6FH2GUrx4sx`F+>k?eA0aUze8ud7r<_^|5`X2gKGp=b02AC!cwP
z;`a~ooam77QmNmu>%c5G$6L9HtJH|Wu0^?3MS*dai#Zo|rM`%bEk1TMKPBw$@}RY*
z%f<(dE8?QI#5F&d5d3&*&kK!NcMhLj+iLK&=`(aU6E=RzGH*_dDR`vnPrT93EPtC)
z{<XqZQXxW4OfGe+n(OgFQ=QX4*w|6NVTD)Q{I_M=AJ&XDefwDLQ5_}Lyf4}AJJb~G
z!o}^?>oWX&CS;a*4LRp)IoLX)`QrV|PdZ!gkBhVSlzC^Kc~%v8vNWq<lZ&PDNz0k`
z8`gUc-+%7UjcV1o_q(ckjjg*~nxy$yU{MSFp5#q`qb6jm(V3nebZ%H#`=d5~=h@-?
X7MZ6kQ=7)5cNAGOW1>vj>XW|!$D+34

diff --git a/assets/contraption/ShieldVendingMachine.png b/assets/contraption/ShieldVendingMachine.png
index 8c1f5a19b2e61eae5f4393353e00e6e3900076f8..5cdf75ab52a4f2433ab5436e1d359c44a287b302 100644
GIT binary patch
literal 685
zcmV;e0#f~nP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00001b5ch_0Itp)
z=>Px%XGugsRA_<CnK4VmFcioCSIXh2f~Y7b>ZseTH!8TOAh)QKpW#Nohu`3wL^vnm
z9NomtRYg%$gws)6bdc9epUG>QOPl`TNRzzF@8$KiP172f>h-Z7-sV%^-(NMUzifW0
zLh$xR3k$OoczF3pN*BGpe`028JSk7kFSSmD<R=Hd;dz`0$&XZH-*5ma`0M*8+8ZsS
zZ3uo045QEC-CjR2+}~bLj@5SR<F>r6Izdc23nsoV@gS)Dn2b6HoB!Z6X+B|7pA-ny
ziB@wJm)AF`@l<~E>K08eQ%~zi!%qTWio9;}CUM(tub;{sH3(cPzX{-Ue$tw2qn)RL
zmLKu-<5DMJBh{W~1b}~ODDk_!e)2Qbxows>KLUp7$0ZG_>*EtP{g={^Wa879Jg6q=
z0-nW>0f=zhc536L<OE5&;n9ThW@46zA7$7D6+in$sL}z@U1n09-*jyhXPcOvQ&q&7
z;$up6SH5!qicZb4ROt-REvk4qD!=j>AU)dDV7RK%H^DMw41j6Xr7K5WorRQm3D~BV
z&FaiGO|u?@qe=__Uxi7_;t-EPQ(GPx17P#I>&pq9cAf^_$JEIf0GHQbHE6nHTlsz!
zmQ<_P$9|-3sv<@Eb0PV;)&b;jmWrBC5&YZ>p|!0&0KnVxeX4zWZV>=*adw<{$e{cP
z_}h)K)$-y>3aB1apN(i&CNw_+hWl|YPPoGPhDa!W4CLF6ZZwwg_;{xUHX2LTaGn97
z_{o-7UMF0{ztWIG^0gTtIdRz8^#YeNpiI6o19VQfKHhZjtPCiNUn}}^bk+3>U2b38
Tv!lM^00000NkvXXu0mjfq##Ki

literal 516
zcmV+f0{i`mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$zDYzuR9J=GSHDlfKp1@`O~a^zQDagAj=H%rI<V-(BAfpJ3nNSa2L1>pCMO0*
zRySvjBt{H_jHC+=<h$N|*SlWNN)ul~dcVqh-}|oDuK^gMsJZ21RU%C{f!tR*MBeLm
zaDIA-_s?%}^}%wr#>vrvxK3wtO@wGvP3|h9Auq0)9DqW;T&>aTc9i)L$fD=u$#^0b
zCWC&~md0t0ujPGN1aYS6CJ+t`A8xhClR;l0)=1f$tuH&#xxNzPLV(G39<2?UGvkR-
zgb={(*Z$PtfKh~;DwYaa1h7j(2xRsbMN~9Lge1arKc!**{DL5gnp?gz_l4<fu0Do!
zpmqVF?~Qq9!F~mJ5>_YRzc^6)CNv62#uM?QzUi8`PM)*DngUmwZR_~y$YD(ZkH8d7
znHQF`0GHQo(fIEKIONZ?R@(;_fwjMkN}U5#P!^#~K&20&o4cKzUmtJE`0-f_0Pyr!
zZbLSJT{Yy2i`Jz=D7R_O1ymI^fUF+$5#dWtbzunT<+u%T+{R+@noAhRZD(?FAOzHk
z*j0oN_*aq;z{zbQM#K9`$O|3F6XAPa<dKsD!C!xl7vTpv2R0O~vPLxk0000<MNUMn
GLSTY5w&%qF

diff --git a/src/Contraptions/VendingMachine.gd b/src/Contraptions/VendingMachine.gd
index 1101e4e..2ab4830 100644
--- a/src/Contraptions/VendingMachine.gd
+++ b/src/Contraptions/VendingMachine.gd
@@ -9,6 +9,8 @@ export var cost := 3
 
 var activatable = false
 
+func _ready():
+	$Sprite.frame = 0
 
 func _process(delta):
 	# TODO Global currency count?? Maybe just level intern currency
@@ -40,3 +42,4 @@ func _on_Timer_timeout():
 		$Highlight.visible = false
 		$Label.visible = false
 		activatable = false
+		$Sprite.frame = 1
diff --git a/src/Contraptions/VendingMachine.tscn b/src/Contraptions/VendingMachine.tscn
index ae869bd..60fca0d 100644
--- a/src/Contraptions/VendingMachine.tscn
+++ b/src/Contraptions/VendingMachine.tscn
@@ -50,6 +50,7 @@ text = "Orbs in wallet: 999"
 [node name="Sprite" type="Sprite" parent="."]
 position = Vector2( 0, -4 )
 texture = ExtResource( 1 )
+hframes = 2
 
 [node name="ActivatorArea" type="Area2D" parent="."]
 unique_name_in_owner = true
diff --git a/src/Levels/Level 3.tscn b/src/Levels/Level 3.tscn
index 6e4ca99..fb48063 100644
--- a/src/Levels/Level 3.tscn	
+++ b/src/Levels/Level 3.tscn	
@@ -1011,7 +1011,7 @@ position = Vector2( -88, 96 )
 scale = Vector2( 0.878906, 0.936025 )
 
 [node name="BlobbySprite" parent="Blobby" index="5"]
-frame = 7
+frame = 5
 
 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 6 )
diff --git a/src/Levels/Level 4.tscn b/src/Levels/Level 4.tscn
index 21511b4..f2849ec 100644
--- a/src/Levels/Level 4.tscn	
+++ b/src/Levels/Level 4.tscn	
@@ -119,9 +119,6 @@ unique_name_in_owner = true
 position = Vector2( -183, 111 )
 scale = Vector2( 0.878906, 0.936025 )
 
-[node name="BlobbySprite" parent="Blobby" index="5"]
-frame = 7
-
 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 6 )
 
@@ -171,10 +168,12 @@ position = Vector2( 169, -712 )
 
 [node name="FlyingLaserCutter2" parent="." instance=ExtResource( 13 )]
 position = Vector2( 514, -592 )
+avoid_crushing = true
 
 [node name="FlyingLaserCutter4" parent="." instance=ExtResource( 13 )]
 position = Vector2( 432, -628 )
 rotation = -3.14159
+avoid_crushing = true
 
 [node name="FlyingLaserCutter5" parent="." instance=ExtResource( 13 )]
 position = Vector2( 603, -801 )
@@ -226,7 +225,6 @@ position = Vector2( 268, -977 )
 
 [node name="DartingEnemy" parent="." instance=ExtResource( 14 )]
 position = Vector2( 408, -461 )
-mass = 1.0
 killable = false
 
 [node name="Spikes" parent="." instance=ExtResource( 15 )]