From 935125de831f5c6be7f17b0a6d890a349c52c3a9 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Wed, 11 Mar 2026 14:42:01 +1100
Subject: [PATCH] Added NPC ArrowGirl

---
 ArrowGirl/ArrowGirl.gd            |  14 ++++++++
 ArrowGirl/ArrowGirl.gd.uid        |   1 +
 ArrowGirl/ArrowGirl.png           | Bin 0 -> 762 bytes
 ArrowGirl/ArrowGirl.png.import    |  40 ++++++++++++++++++++++
 ArrowGirl/ArrowGirl.tscn          |  55 ++++++++++++++++++++++++++++++
 ArrowGirl/ArrowGirl.xcf           | Bin 0 -> 4634 bytes
 BoxBoy/BoxBoy.gd                  |   2 +-
 BoxBoy/BoxBoy.tscn                |   8 ++---
 BoxBoy/{boxboy.xcf => BoxBoy.xcf} | Bin
 scene.tscn => Scene.tscn          |   6 ++++
 project.godot                     |   2 +-
 11 files changed, 122 insertions(+), 6 deletions(-)
 create mode 100644 ArrowGirl/ArrowGirl.gd
 create mode 100644 ArrowGirl/ArrowGirl.gd.uid
 create mode 100644 ArrowGirl/ArrowGirl.png
 create mode 100644 ArrowGirl/ArrowGirl.png.import
 create mode 100644 ArrowGirl/ArrowGirl.tscn
 create mode 100644 ArrowGirl/ArrowGirl.xcf
 rename BoxBoy/{boxboy.xcf => BoxBoy.xcf} (100%)
 rename scene.tscn => Scene.tscn (97%)

diff --git a/ArrowGirl/ArrowGirl.gd b/ArrowGirl/ArrowGirl.gd
new file mode 100644
index 0000000..8775244
--- /dev/null
+++ b/ArrowGirl/ArrowGirl.gd
@@ -0,0 +1,14 @@
+class_name ArrowGirl extends Area2D
+
+@onready var _sprite = $AnimatedSprite2D
+
+#boilerplate
+func _ready():
+	_sprite.play("idle", 1)
+
+#animation stuff
+func _on_animation_finished() -> void:
+	if randf() < 0.2:
+		_sprite.play("idle_glance", 2)
+	else:
+		_sprite.play("idle", 2)
diff --git a/ArrowGirl/ArrowGirl.gd.uid b/ArrowGirl/ArrowGirl.gd.uid
new file mode 100644
index 0000000..1499f9d
--- /dev/null
+++ b/ArrowGirl/ArrowGirl.gd.uid
@@ -0,0 +1 @@
+uid://dqnhd2oej7xbw
diff --git a/ArrowGirl/ArrowGirl.png b/ArrowGirl/ArrowGirl.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3f698a1656440da8bb2e4a087269198dbb08ada
GIT binary patch
literal 762
zcmV<W0tNkvP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tk-ba9P!z>aQ>CI62Rn#3WT*~e7Zq`=RVYG*P%E_RVDi#0Xws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;e}FhCx=4xlC509-K6tzz=e={d?_NM?RG4OU#Q{yX
z&2%y$W^=1z=oLZq(FVq4W*Kvml!EX2x<`PYcQKyj|L)J#ujVZV1VrLEGfbO!gLr1s
zHaPDSM_5T#iO-2AOe&E0k?V@bZ=8!R3p_JoX43P-5n{2}!Ab|SlBp3-6Gv4|r+gvn
zvC4UivsS6GR-OEZ;k>@G%yrr$NMaF7kRU=q4P{hdBSxoAiiI@YCw%<Fu3sXTLas6x
zITlcb2HEw4&)|1&t-{o#mlRF_-7k*wF$#osfo9!tzK<QJc>)BVfh)c3uQq_$Ptxmc
zEqVkDYy%h9ZB5w&E_Z;TCqp)6SK`wb3I*W(jK-7$25*7hHLq{2dz?N18R}K)1~@nb
z#)_1^?(^@S&c6Norq#b6HSThbgBs`T00006VoOIv0RI600RN!9r;`8x010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru>H`Y{8Z+h*N&x@>02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{007cSL_t(&-tCt`4#gk{L>=ybXS!=#^d|}f{={KrV(n|k
z0Td$_K8-Q@Bh3d1enJEa-_l><K2AoKkBs^=96+ZFXnY%&hmmq`XTBo$!+c}qUUw~E
z@r|s0wF~HcW2oQl0w(|ZB8Xl4t*Bho5=;1MgIV<_wcqjdoLBDt7kig42QYK*M@9Co
z+>h|(fTjbDH?LcMk8RrN$W^(Lj}_H2KQdS6$ho7MZ`Hf_@9WW!e`yC)^3?@&8H%?P
s1m>CTjKWt6NB{{S0VIF~kO23_1N(P_<R7``(*OVf07*qoM6N<$f`9BtKmY&$

literal 0
HcmV?d00001

diff --git a/ArrowGirl/ArrowGirl.png.import b/ArrowGirl/ArrowGirl.png.import
new file mode 100644
index 0000000..4237e29
--- /dev/null
+++ b/ArrowGirl/ArrowGirl.png.import
@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dvuvwdk6nr4nb"
+path="res://.godot/imported/ArrowGirl.png-d4d75df81e356cd6ff3873d27dc6b64f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ArrowGirl/ArrowGirl.png"
+dest_files=["res://.godot/imported/ArrowGirl.png-d4d75df81e356cd6ff3873d27dc6b64f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/ArrowGirl/ArrowGirl.tscn b/ArrowGirl/ArrowGirl.tscn
new file mode 100644
index 0000000..bae56e7
--- /dev/null
+++ b/ArrowGirl/ArrowGirl.tscn
@@ -0,0 +1,55 @@
+[gd_scene format=3 uid="uid://cn8srrkyt4h8e"]
+
+[ext_resource type="Texture2D" uid="uid://dvuvwdk6nr4nb" path="res://ArrowGirl/ArrowGirl.png" id="1_5i1ac"]
+[ext_resource type="Script" uid="uid://dqnhd2oej7xbw" path="res://ArrowGirl/ArrowGirl.gd" id="1_53v1e"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_y2354"]
+atlas = ExtResource("1_5i1ac")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ni31j"]
+atlas = ExtResource("1_5i1ac")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_xlvrw"]
+atlas = ExtResource("1_5i1ac")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_73fnb"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_y2354")
+}],
+"loop": false,
+"name": &"idle",
+"speed": 1.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ni31j")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_xlvrw")
+}],
+"loop": false,
+"name": &"idle_glance",
+"speed": 1.0
+}]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_53v1e"]
+size = Vector2(32, 32)
+
+[node name="ArrowGirl" type="Area2D" unique_id=869288979]
+script = ExtResource("1_53v1e")
+
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=1672878033]
+sprite_frames = SubResource("SpriteFrames_73fnb")
+animation = &"idle_glance"
+metadata/_edit_lock_ = true
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1190138841]
+shape = SubResource("RectangleShape2D_53v1e")
+metadata/_edit_lock_ = true
+
+[connection signal="animation_finished" from="AnimatedSprite2D" to="." method="_on_animation_finished"]
diff --git a/ArrowGirl/ArrowGirl.xcf b/ArrowGirl/ArrowGirl.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..8274cc1e43acb57b879ab0096a4f2b7738901450
GIT binary patch
literal 4634
zcmd5<&1xe@5bha`WND<4y_R-2KMOmXO~4xvSjjz>vWKvTKw!xOXyvgiu%yLO_UGn<
z$pZ`|kS7R)JVb7KjX8xJLvjlVldo#JHPvDy?*<dxrc^&&Jw09ZO;>p|o;(j<4Nt-s
zhuyBi=z&5IjqgFXK#qf-7O46dCL)YB$OCmiceG4?cj5mXI1QSwe?6TJCed;D@Kd(A
z{Hs(Myab{(yh-mjrTRZzKvk}k``;?{*)L>Pj*wj;=X-p@enopUdHv;uI{H2H=?l5{
zEB5}8?T(OLA?JH=oK(>sH9W!T{jqwME9L&BQb)aP4<WlkuIgB^Q_%($+Mqwr(gfMH
zWE`>o!v!sN`nl{1`8MYM1O+4Hy)&FmCed`k3-Gi5_&gdckg1pB#cBA(lP|xbnLTzL
zPX?o?Gddq18}FYF=8M;7Q8=HSjgKGs2PdQ9>}+-(9x&^ikDd*}L;mYN!t}F(>2An>
zH2rG+d@vkOM`8C6+G|VGO6QyDcoB}L!_#O^D`qDr^Jo#WzmPN0cBXe0qqLhTji<tB
z#2$nYM7XRxJ&huck4Xk4fKZ)+9*}%=fnR(XAhOdcLIKG%J^&f{o{)VZheECkxgq30
z$n^HKpBXz4Xb*b+M_L9`ACjD6fIk$n`EoyoO$?8~VMY%^2-5HFWtfKnqX!B>7~YeN
zD|KHrm#zwy_f>h>R^D<~rD+p#4ZH@usoXSxUInji(Ot~v<Shdnp@DT|b09lBFYONe
zJrMI{Lsil``#bQhfVSJ~s+#)j{}19+g?~!VTW+%Z*y}I&@UhBEPnFWYNp({XtG3V9
zRM|LJv1JL5;<cp|A|mzQXRA1=e$);hMn8(;;vweEG&46@-%)#M1#S*FV!Fzi$=&ty
zW&&&^cy0o0BpMru#zvyCk!Wme)N@=AM!ZC01JAawA?y}55{(V`TiDoW*BF4mg^gsB
z-OheuV<Xu<YiB>Pv4KcQY`op9jSU<|VgoT}Y{1OeNHjJQjg3{#OztGt-yCwmac19}
zZEMEBVT?1xz+tR$7;7BH8i%pQ;YNK8hq1;Xo^9b!*ex8!8i(+=aJbQ~@dkejhw&!6
zjkMUtVZ43TMp|s+5RsBNe7jj2hd7MHA!5!rgqd*|YaGTJhpU{K++8=P+}{Jek4yPI
zLGR*beMit;)QCHRZYw`+7f?$z(tSa<aIQT;ySRIsf&#UVI+s&jwNaO@rd_<V2WsCC
zPR$Q@2O&6hL*>s0^9WpB)jE-nX`N`{O>Uj&9~UtK?v%A51Sit1Q*Z{^j1U45MsS&N
z#f?)7O_Q&iC0{p5Ikztyf2|oJU0yJmo;N>5y1Yne-qz8|m?p==Yptmz^X0neTYR)J
zt2?1Ub@R@|g>&|K`?~e;`P6jsHzTx>C{!&p5x#C7eBCtUd@WY+mzS~+-HH|KB31>u
z6&uXkx*Z%8eHl7bY8jj>R6ADKiLOFF$*w@3PfaH$Dmq2p2LIplUP6Vng`(=~V(RN6
zn)9{1z~9OXbSp2ci@X%*Rvs{K>vkeg1Z7@Oxny3hQ0=^6C(es5O+KHRPX1=(aa&=^
cj43astjKa=N{A^Prev5>QB)$Xs~ptSzlw8800000

literal 0
HcmV?d00001

diff --git a/BoxBoy/BoxBoy.gd b/BoxBoy/BoxBoy.gd
index 44c23d7..bfd7126 100644
--- a/BoxBoy/BoxBoy.gd
+++ b/BoxBoy/BoxBoy.gd
@@ -40,7 +40,7 @@ func _physics_process(_delta) -> void:
 		buffer_jumping -= 1
 	
 	#process coyote and jump buffers
-	if buffer_grounded > 0 and buffer_jumping > 0:
+	if buffer_grounded > 0 and buffer_jumping > 0 and just_bounced == false:
 		velocity.y = -JUMP_FORCE
 		buffer_grounded = 0
 		buffer_jumping = 0
diff --git a/BoxBoy/BoxBoy.tscn b/BoxBoy/BoxBoy.tscn
index 59d32b9..c815581 100644
--- a/BoxBoy/BoxBoy.tscn
+++ b/BoxBoy/BoxBoy.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=3 uid="uid://dndbf44fkm2ww"]
+[gd_scene format=3 uid="uid://dndbf44fkm2ww"]
 
 [ext_resource type="Script" uid="uid://c2x51mppxugpn" path="res://BoxBoy/BoxBoy.gd" id="1_av86f"]
 [ext_resource type="Texture2D" uid="uid://bpjhq0b2dae1d" path="res://BoxBoy/BoxBoy.png" id="2_0yqgk"]
@@ -34,15 +34,15 @@ animations = [{
 radius = 14.0
 height = 32.0
 
-[node name="BoxBoy" type="CharacterBody2D"]
+[node name="BoxBoy" type="CharacterBody2D" unique_id=904940283]
 script = ExtResource("1_av86f")
 
-[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=660463739]
 sprite_frames = SubResource("SpriteFrames_y2354")
 animation = &"idle"
 metadata/_edit_lock_ = true
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1250358515]
 shape = SubResource("CapsuleShape2D_ulcgi")
 metadata/_edit_lock_ = true
 
diff --git a/BoxBoy/boxboy.xcf b/BoxBoy/BoxBoy.xcf
similarity index 100%
rename from BoxBoy/boxboy.xcf
rename to BoxBoy/BoxBoy.xcf
diff --git a/scene.tscn b/Scene.tscn
similarity index 97%
rename from scene.tscn
rename to Scene.tscn
index aa5946a..43e9d0f 100644
--- a/scene.tscn
+++ b/Scene.tscn
@@ -3,6 +3,7 @@
 [ext_resource type="Texture2D" uid="uid://ddl0kxl0inw6r" path="res://Tileset/atlas.png" id="1_3253y"]
 [ext_resource type="Script" uid="uid://b4nlbrxto0tjp" path="res://Controllers/GameplayController.gd" id="1_u3cyc"]
 [ext_resource type="PackedScene" uid="uid://dndbf44fkm2ww" path="res://BoxBoy/BoxBoy.tscn" id="2_3253y"]
+[ext_resource type="PackedScene" uid="uid://cn8srrkyt4h8e" path="res://ArrowGirl/ArrowGirl.tscn" id="4_m7jmp"]
 [ext_resource type="PackedScene" uid="uid://b1hpr05b5sgww" path="res://Bouncy/Bouncy.tscn" id="4_u3cyc"]
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_u3cyc"]
@@ -58,3 +59,8 @@ position = Vector2(1584, -576)
 
 [node name="Bouncy6" parent="BouncyContainer" unique_id=2085472449 instance=ExtResource("4_u3cyc")]
 position = Vector2(1680, -896)
+
+[node name="NPCContainer" type="Node" parent="." unique_id=1127671677]
+
+[node name="ArrowGirl" parent="NPCContainer" unique_id=869288979 instance=ExtResource("4_m7jmp")]
+position = Vector2(-24, 48)
diff --git a/project.godot b/project.godot
index 043c351..d112414 100644
--- a/project.godot
+++ b/project.godot
@@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
 [application]
 
 config/name="colorvania"
-run/main_scene="res://scene.tscn"
+run/main_scene="res://Scene.tscn"
 config/features=PackedStringArray("4.6", "Forward Plus")
 config/icon="res://icon.svg"