From a57003ec241296ec52fd72edb4a2e63e9ac7d0ce Mon Sep 17 00:00:00 2001
From: Adam <torontocaper@gmail.com>
Date: Wed, 5 Nov 2025 21:10:37 -0500
Subject: [PATCH] cleaned up player code and animations a bit; mapped new
 colours onto veg assets

---
 graphics/objects/mushroom_32x64.png | Bin 1203 -> 1133 bytes
 graphics/objects/veg_32x32.png      | Bin 675 -> 291 bytes
 project.godot                       |   8 +++----
 scenes/{game.tscn => level_1.tscn}  |   0
 scenes/player.tscn                  |  35 ++++++++--------------------
 scripts/game_controller.gd          |   2 +-
 scripts/player.gd                   |  17 +++++---------
 7 files changed, 21 insertions(+), 41 deletions(-)
 rename scenes/{game.tscn => level_1.tscn} (100%)

diff --git a/graphics/objects/mushroom_32x64.png b/graphics/objects/mushroom_32x64.png
index 957e81672bbf46a1814ab97e870aef8bec5d53b1..81212df3ef633a5c982c58796e2d88177ab80d46 100644
GIT binary patch
delta 1030
zcmV+h1o`{33GE1wBnkm@Qb$4o*~u(_ks%Y2K`fDf9DfT20tPvy|8>Uz00YBGL_t(&
z-tCrMXdG1(fWLd^?##~qWV`KRHnBEow6xL{Ew<eziUA3+;)5ZnAXHK@K_l2mz@HbN
z1VN-=!PZKNf)D<HDE3W65q*%FwrFiqQ6ZphleF39Z+EkQvvYlDEfEcyY*M8%-|OL=
z`R+M)4u2OsJUl!+JUl!+{%^GJ=zhO5`MCL?N<4bUP}m!VhlhuUhsO<rs5Wt5|F{M?
zK05-y&+oP^zgDs{T$RB72ZnUS6vWpk04~isOl4gTeVJT#J-OV3j<!CXtT(x5gO87n
z-o@Q@ik1dHEe#e=-hW(Q*AaBI_37qtFL$oDuzzhEp#q3<4qeWXD{4-kFYxW$AfJBm
zmRPk8?B3aJZrSu$xTCF418k}@353^@i{DEBD|KXQn~>5VXh}BLEqIGI?>0$xnyc1<
zj<!CX2=&m?5JWWH&P)AJ4~zi^Ue4po{!X?~<jBZjfTeXI*%_8wx9zQH+11*s8;vJu
zs((?~%HYFY6C{Qv07wi?P*#4>4t^!*SpO7pt9z;ED#(%V-zzQ_O)QWL+mdL=K*=)u
zK3l_{lW_p{oQ&g}zlfGLQV1eJNsV7FJmumC{O*&YSjy>rxgMG~T5PWM5wawpaeYx7
zYb~lU#oG@{hIht!?fFrD9h>EBs>C-l2Y&(hVdw)<^&RMH?bUX!hj_@KDW(Wmk_|D1
zsRW=wyMUk=*+O0`#(z1(@cBF!GG!*^n@r<Wlu(sAP#ZK@XM<zMn6+z2J1P9-++Y1C
zf1>PYGV>0poW?%fh#FAfI2A8JMS*o8K}fk2Yi?pbYVq5-c~oZRYE%OPfxy*}E`Per
zs3Xk0XyP+{#9Wt@TU?pIbXFq+f?zs@bRx(?8m<36NXOMoWi_s=@f95u;A*|HMfCC4
zgJQINlryO^*~u}~#j_ZtG*TKk(MHm@ZO4gjWG3TqZrbJYtGA%b8q0B*bMmBgY2_mT
zD7$ber-=%Q&(I)T@~$EyA*c<Urhfz%PMl`4{{<X00?4CR{ud;+?KOw5?uo9}-fR8z
z>t061JLq75ye^T-%wn0rEBhincP+ot$18SVc#$QQ7lXK=FtJz^M+%DLf<mdZ<d3fS
zL9(NLKu2OBwzfZr0De4njC8ihiO*kOc0EOv_ya-aN1G7>0^zSnXH!+xscTxmv@B{O
zAOu{t?W*5|RSQTVF^nq$LdvQIs?S^{Jb@cqK!|@?VEaSQh97zQpa!Vhbuaa`r?@$O
ziu#uO0QfU@T{q#5_5uCObNl}>cIdzx%ie~60526(!*s?1NdN!<07*qoM6N<$g7LTU
ADF6Tf

delta 1112
zcmV-e1gHD$2(t;0BpL)~K}|sb0I`n?{9y$E0004VQb$4o*~u(_kv=aE24YJ`L;(K)
z{{a7>y{D6rY9D_J8y5mKP1`$x000B`Nkl<ZXx{CZOK%%h7>1v78QXJ-ox~%@Zqhm_
z7dN6HRYfYOV#S8CEB^o?ShZ?}_zkSs(H(yQfe=DPVhsYME+|ziT2OFllaRP}QeQK-
z!y+Y6TI@Kjh>GS}&dm9~ci!`zZ_XJ=Nl8gbNl8gb`M-bh*1?i{u38rRD&qZxS(#2n
zN=iyf%9F#XN-?(|dHt$wRjQ674NUBZfJVI^0$Ku@{c>MGNAG3eM<-`ZAtNYHZVzAE
zjA(X~jd#9Vo*F04a=n*~E#U0Yd2`}`py<G)V?by&CpFD(JbA%XHqU&&QWz(m95?yv
zl{of2h2wvEgw_m^aB#AMqNjLzQoCo5&YP3|wAyV<4Ftm;c>7RE{Mt&yk*XI1JX6Ui
zXJVS3{~WFIvrMkuU}E(f+-yRvl2KnQ$9&yr#w;La6NlUNo*C+ZfX)b!nXlT71mKl&
zM9$K5XO3~#U!Ywm(e~#F-FXn2oEAGyv4jyY)QNve)sfP`U}(YJT-!Qdn={7>A&2uC
zTPwDl0zu9JAjrAI+6EJm(}FjTz+$lvKm<d#=LU@Ya^;R0(xi3*OxThsPoZT@e)%$m
z^*R8B^*UB>6(en=5ENWVKDS+3Inc9J=U+vv)_Z2;0pfgZ&XiQd%L`d*GZtP}0*1tz
zBFcYGqqmwgo_duiV^jR$V{R;Oa<vii*{y9CKEK%#BYMH`<Ofs~l|7{o`x+-JIpk|H
zTHG@*0R%ze2m_;8x&9+pZVkBIiMig3X%USSF|rTLxJnmoh-{xtJ5M`mkc<2G>tDY{
z92q*jh(_PAktnnl5JkIMhC?ZO0#7Fd`4WG<sTu0O_0XM-zsd-KK#&+{2MJ4qgbgc$
zl~MRfLL&(tO+c$_kdDA@H;_??+-hUYgA*AghGy50BnB&p&_H6$ZoUVji?CuvJYQ6}
zS%X#zgd!*$q+guFzH^)It)FQQ1Xr68t<YeA77+u?qt^gHoWNS&FeN0GG9VHLiKc%e
zGq^_4>V>TLCBH`r5e5OfN<PwoQ<b8)c&|^Kug&fFS#e`7buEnRFfbvF&L-K6yWKC^
zcX!5L5rGac$*^`j)PajDcg#zrY4z<|GyePam98T3Tzr3uND6`#!B!aF_r}vz+vxy7
zy>A|=1|G&6FD#mZ?{Vlr838Q)a+7~{H{g@Y*T#;w=RX-a$Hgy|@n_076Zt*wipJiM
zoIYN&2qBZrk}nhxLXfrXJqy^g15!woQYfVmQvO-A_J1beaghpm@&tT(>8Eg~iHLtJ
z`v)#OW&x*<*W|mWUo!xn=VH4aj^{Cv-#*<fo_Mi)s!|+lX^SxhWJD;p&b%OZ_M!JL
eeDLAe-S7|V0dwwk9O97x0000<MNUMnLSTZG>j9Pk

diff --git a/graphics/objects/veg_32x32.png b/graphics/objects/veg_32x32.png
index 4e09fa94c72733804bbf24e8b93c93c7daf096c0..5bbf314f67e88a8af722a9b91617f2665e3f5fec 100644
GIT binary patch
delta 265
zcmZ3?x|nH#ay<iMage(c<IR&g^$ZLQEa{HEjtmSN`?>!lvI6-E$sR$z3=CCj3=9n|
z3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@pr;JNj1^1m%YcIHC7!;n
z>@T_5nAojU--?3NReHKOhD02GJ6TcafI>YF3-f#D@XuSaO8&cx8VjD}@$|^f6K&d5
zzC?f#sF;D_gYnZVj%)jOUOQhq)t|ZI=`)5&8cOO)tEQceIdD{P)mP@VOPBA}ba<US
zFY7JWf%J7-V-<BBPrvJ5&N?CGUSZ2R`)rp-!c$yUe)74=9lG5;-cz%GE67|=S3j3^
IPD}|+0MIg8D*ylh

delta 624
zcmV-$0+0Qp0;2_xBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iTcsiu5i5!~
zWT;Lph>AFB6^c+H)C#RSm|Xe=O&XFE7e~Rh;NZt%)xpJCR|i)?5c~jf7n~Gbq{ROv
zg%&X$9QWhhy~o`<z+W#j)$AAtRLwF{iMWu-t_s0d1ki^;41XXhF;kxt#Uwn(*FAiE
zy^HZI?{j~S9wlcoz$XyTGTpF<H;AV<EuHf|ahMe)h4`E}YS0CVAGt2O{KmQ9u%Bm!
zjdW_BI7}=Q+E{L5Ry0)NDdLEtYLxHKxU6vA;;fddta(rV!cb0IS>`&;5hSpPC5R9p
zqlyyBun?nFBY(w2iuU6k{$a;2l1nC635*;Is6d6}_`(0+ceiGKa>7jt#evQj+x{2@
zg1bPYX4~J#w%s@Z0?)ve*78^Cz|1G<wU!n+0(!TBi|dvq?*W%Pz|fN}8ImIfX!`Sc
z;QfrgDGT)90^MtFZ_Rz2J^*RzDtQAO90Fqn%3k+)cOzGOZ~vZY_V)vXf^x1@{Q;5y
z000JJOGiWi{{a60|De66laXp4e*+O0Dmi<dTNMBR02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{004VQL_t(o!|ju?4Zt7_1PueQT$ad4EWvVFfK*5>Yzf;q
zY5pn-!u{hw1ONa4006+xlv4-w(dJs;*Hb<X;FX&LNTP_Gh^SgNa{(7eLa5dcw3eRs
zrT~4kd8)N50H3+mc7?PAExSLS7C@4D#}T^ztPzP%P!greGi5J4Zbw1D2SGLf0000<
KMNUMnLSTaGqY&Hx

diff --git a/project.godot b/project.godot
index 8bf18b8..82cb4ab 100644
--- a/project.godot
+++ b/project.godot
@@ -22,10 +22,10 @@ GameController="*res://scripts/game_controller.gd"
 
 [display]
 
-window/size/viewport_width=320
-window/size/viewport_height=180
-window/size/window_width_override=640
-window/size/window_height_override=360
+window/size/viewport_width=480
+window/size/viewport_height=270
+window/size/window_width_override=1280
+window/size/window_height_override=720
 window/stretch/mode="viewport"
 
 [file_customization]
diff --git a/scenes/game.tscn b/scenes/level_1.tscn
similarity index 100%
rename from scenes/game.tscn
rename to scenes/level_1.tscn
diff --git a/scenes/player.tscn b/scenes/player.tscn
index 6e9716e..3c2f63a 100644
--- a/scenes/player.tscn
+++ b/scenes/player.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=58 format=3 uid="uid://d3y1iqmpknpyo"]
+[gd_scene load_steps=56 format=3 uid="uid://d3y1iqmpknpyo"]
 
 [ext_resource type="Script" uid="uid://d3hp5rjoph7hg" path="res://scripts/player.gd" id="1_3vyb7"]
 [ext_resource type="Texture2D" uid="uid://dr3rp5hv7rexv" path="res://graphics/animations/player_idle/Player Idle 48x48.png" id="2_g2els"]
@@ -132,10 +132,6 @@ region = Rect2(288, 0, 48, 48)
 atlas = ExtResource("4_qlg0r")
 region = Rect2(336, 0, 48, 48)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_f1ej7"]
-atlas = ExtResource("5_tuyoq")
-region = Rect2(0, 0, 48, 48)
-
 [sub_resource type="AtlasTexture" id="AtlasTexture_l71n6"]
 atlas = ExtResource("5_tuyoq")
 region = Rect2(48, 0, 48, 48)
@@ -164,6 +160,10 @@ region = Rect2(288, 0, 48, 48)
 atlas = ExtResource("5_tuyoq")
 region = Rect2(336, 0, 48, 48)
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_f1ej7"]
+atlas = ExtResource("5_tuyoq")
+region = Rect2(0, 0, 48, 48)
+
 [sub_resource type="AtlasTexture" id="AtlasTexture_wnwbv"]
 atlas = ExtResource("6_fjrip")
 region = Rect2(0, 0, 48, 48)
@@ -196,14 +196,6 @@ region = Rect2(288, 0, 48, 48)
 atlas = ExtResource("6_fjrip")
 region = Rect2(336, 0, 48, 48)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_j2b1d"]
-atlas = ExtResource("6_fjrip")
-region = Rect2(384, 0, 48, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_cs1tg"]
-atlas = ExtResource("6_fjrip")
-region = Rect2(432, 0, 48, 48)
-
 [sub_resource type="SpriteFrames" id="SpriteFrames_3vyb7"]
 animations = [{
 "frames": [{
@@ -323,9 +315,6 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_f1ej7")
-}, {
-"duration": 1.0,
 "texture": SubResource("AtlasTexture_l71n6")
 }, {
 "duration": 1.0,
@@ -345,6 +334,9 @@ animations = [{
 }, {
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_wqfne")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_f1ej7")
 }],
 "loop": false,
 "name": &"shoot_run",
@@ -374,12 +366,6 @@ animations = [{
 }, {
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_t4otl")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_j2b1d")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_cs1tg")
 }],
 "loop": false,
 "name": &"shoot_still",
@@ -411,13 +397,12 @@ position = Vector2(-16, -7)
 
 [node name="PlayerSprite" type="AnimatedSprite2D" parent="."]
 sprite_frames = SubResource("SpriteFrames_3vyb7")
-animation = &"punch"
+animation = &"shoot_still"
 autoplay = "idle"
-frame = 9
-frame_progress = 1.0
 
 [node name="Camera2D" type="Camera2D" parent="."]
 offset = Vector2(0, -50)
+position_smoothing_enabled = true
 
 [node name="DebugInfo" type="CanvasLayer" parent="."]
 
diff --git a/scripts/game_controller.gd b/scripts/game_controller.gd
index 7e347c0..f08d3c3 100644
--- a/scripts/game_controller.gd
+++ b/scripts/game_controller.gd
@@ -2,7 +2,7 @@ extends Node2D
 
 var coins_collected : int = 0
 var total_coins : int = 0
-var levels = ["res://scenes/game.tscn", "res://scenes/level_2.tscn", "res://scenes/level_3.tscn"]
+var levels = ["res://scenes/level_1.tscn", "res://scenes/level_2.tscn", "res://scenes/level_3.tscn"]
 var timers = [10, 15, 20]
 var time_available : int = 0
 var current_level = 0
diff --git a/scripts/player.gd b/scripts/player.gd
index 7814c64..6a0037e 100644
--- a/scripts/player.gd
+++ b/scripts/player.gd
@@ -18,17 +18,17 @@ enum State {
 	PUNCH
 }
 
-const JUMP_VELOCITY = -500.0
-const SPEED = 200.0
+const JUMP_VELOCITY := -500.0 ## Power applied for jumping
+const SPEED := 200.0 ## (Max) movement speed
 
 @export var BUMP_POWER := 50 ## Power from bumping into objects
 @export var PUNCH_POWER := 300 ## Power from shoving objects
 @export var ACCELERATION := 10 ## Amount of "slide-y-ness" in side-to-side-movement
 @export var HARD_GRAVITY := 2 ## Factor applied during FALL state
 
-var current_state: State = State.IDLE
-var facing : FaceDirection = FaceDirection.RIGHT
-var direction : float = 0.0
+var current_state: State = State.IDLE ## Player state for FSM
+var facing : FaceDirection = FaceDirection.RIGHT ## Facing direction for animation orientation
+var direction : float = 0.0 
 var punch_target : RigidBody2D
 var punch_enabled : bool = false
 var jump_buffer_timer : Timer
@@ -42,6 +42,7 @@ var shoot_cooldown_timer : Timer
 
 func _ready() -> void:
 	jump_buffer_timer = Timer.new()
+	jump_buffer_timer.one_shot = true
 	add_child(jump_buffer_timer)
 	shoot_cooldown_timer = Timer.new()
 	shoot_cooldown_timer.one_shot = true
@@ -95,28 +96,22 @@ func handle_input() -> void:
 				current_state = State.SHOOT_RUN
 			else:
 				current_state = State.SHOOT_STILL
-			print("pew-pew")
 			match facing:
 				FaceDirection.RIGHT:
 					%SceneManager.make_bullet(right_spawn.global_transform, 700)
-					print("shoot right")
 				FaceDirection.LEFT:
 					%SceneManager.make_bullet(left_spawn.global_transform, -700)
-					print("shoot left")
 			shoot_cooldown_timer.start(0.2)
 		else:
 			print("can't shoot right now because there are %s seconds left in the cooldown timer" % shoot_cooldown_timer.time_left)
 
 	# Handle throwing grenades
 	if Input.is_action_just_pressed("throw"):
-		print("grenade!")
 		match facing:
 			FaceDirection.RIGHT:
 				%SceneManager.make_grenade(right_spawn.global_transform, 1.0)
-				print("throwing right")
 			FaceDirection.LEFT:
 				%SceneManager.make_grenade(left_spawn.global_transform, -1.0)
-				print("throwing left")
 
 func handle_movement(delta) -> void:
 	# Left-right movement. Use acceleration for smoothing