From 71dc4b693b770c6ea4fce443de470285d9e48e41 Mon Sep 17 00:00:00 2001
From: Jenna <jenna@sudo.ca>
Date: Fri, 3 Sep 2021 16:57:14 -0700
Subject: [PATCH] added a basic inventory view on the player and a rotating
 stick to be seen in it

---
 ...2.obj-eb0216dd69c3f114cbea35b9cae645b9.md5 |   2 +-
 ...1.obj-7399287c93d0c6aafc593f1b49d9c6b1.md5 |   4 ++--
 ....obj-7399287c93d0c6aafc593f1b49d9c6b1.mesh | Bin 4354 -> 5754 bytes
 Born Without Teeth/Player/Player.tscn         |  18 +++++++++++-------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Born Without Teeth/.import/TV2.obj-eb0216dd69c3f114cbea35b9cae645b9.md5 b/Born Without Teeth/.import/TV2.obj-eb0216dd69c3f114cbea35b9cae645b9.md5
index 5f208e2..85b5a15 100644
--- a/Born Without Teeth/.import/TV2.obj-eb0216dd69c3f114cbea35b9cae645b9.md5	
+++ b/Born Without Teeth/.import/TV2.obj-eb0216dd69c3f114cbea35b9cae645b9.md5	
@@ -1,3 +1,3 @@
-source_md5="cbd7928cf85698fb7bdc5b438147e92e"
+source_md5="5ad9e16429c8f214f03b62340c45d305"
 dest_md5="01ae1686fb2b0f4f32561108eb869fae"
 
diff --git a/Born Without Teeth/.import/breadmouth_1.obj-7399287c93d0c6aafc593f1b49d9c6b1.md5 b/Born Without Teeth/.import/breadmouth_1.obj-7399287c93d0c6aafc593f1b49d9c6b1.md5
index a86d781..62aa6b5 100644
--- a/Born Without Teeth/.import/breadmouth_1.obj-7399287c93d0c6aafc593f1b49d9c6b1.md5	
+++ b/Born Without Teeth/.import/breadmouth_1.obj-7399287c93d0c6aafc593f1b49d9c6b1.md5	
@@ -1,3 +1,3 @@
-source_md5="b5d45fe4522233b64903d1245ce26f0d"
-dest_md5="8269e603b23be064b5c152ebc50d9bfe"
+source_md5="ea9d96a274f30b082d42c78895486cd5"
+dest_md5="ec64f34761079cefddec592435684435"
 
diff --git a/Born Without Teeth/.import/breadmouth_1.obj-7399287c93d0c6aafc593f1b49d9c6b1.mesh b/Born Without Teeth/.import/breadmouth_1.obj-7399287c93d0c6aafc593f1b49d9c6b1.mesh
index beeaf1c0ffef8b8ba90bdccad476a8efe4357972..c675abf63ef0c626ff2f47f8e8782c22d765b2be 100644
GIT binary patch
delta 1497
zcmZWp&5jc>3{H^%!2-+g@_#`{TtKV#$OX8wCmtYjC!S73CK);Dw##KCo`4kx9t80y
zybLGo%rtFx52KMkJ6}FKw!gpn_x49U`FOsV_IH(1gx(<Oj%*;C&eToDJg$@OAVzhc
zt=hpN>O|mU2OOT%i-ImA>ezq@E1iN49aO?`xb=JSqESZ$Iz>vj*3K^aCRx8w4~xqO
zZLmv?P8gGVRB*Ya3)Uwc?Kj-vS_N{3rP<Db2U7RSk=m}&4B=a~;O1xov#)g>sOnie
zE#~TFImJ#Nk|wOso^CRWJNX(LVeU{vJGWd3$)ZU+1nA?EP*;JNBQY7Z;G%lYH;j2#
z!3ENi5%f_HigK!Zej5jAQX4Khv{4&d*K({42J?Xtj~!M^2Q)b3!A1w`^kzV%E+fjZ
zZU7(mTXZP9Ay{3aan_?=S(BRF4I|Bk=h$3notp=s@mi_;CC^vHPR9xy_UhI)U_oJ}
zo^I`2A=fp)u{Op)>NY#a7tBS>ZMJ>V#D!NkIHtt}&e<x<-57dPrraX~+S^KcAs>{R
zOY8{hssZoO<(Z(cTr?iXnJ88vc*X>m(83@OfGy`?gV*S#hm7iFPKFjKm{f#pTWopH
z${|n{AQkihqu^}}i9&Z)-~)j}G4HTBJnZJiCyd19oO`t9vi6V?kN(Cf^OmRlqE5Mu
zuqLR|u6$8%xYpJc3Rxb@)9LWMO5}(Y>N;XlB1g<JuDudHdyp&>>T;O}uGt>fY@chk
z<r=AWkR2*nJ{^U%ZFxKCnio=5{Mw<C+<2%H_zDM4p0Dc+$BOq#I{)=q=0siLPb9g(
zt^5A?c&cXC1m8zzYB8d+TfcOWEVvWkGV@<e7?bZRf6@_iLNIMu^2VF$HVuvTi3rY4
hFg7{#gM>?O9sGVX`Ez)b8+^kj<r7_#pMUSZ`wuBI(5wIe

delta 93
zcmeyR)1)*Zjgfs~y5Z!_tllo{3=9m#$wiq3B|ruP10xV~0dY=#a$=5^zP=#?4@d|I
gK%$OCMTwQZsl^#!b*w-UDUi(OCbq5olS9PR0J*{vHUIzs

diff --git a/Born Without Teeth/Player/Player.tscn b/Born Without Teeth/Player/Player.tscn
index 1da8fa0..33ae4bc 100644
--- a/Born Without Teeth/Player/Player.tscn	
+++ b/Born Without Teeth/Player/Player.tscn	
@@ -1,16 +1,17 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://Player/Player.gd" type="Script" id=1]
+[ext_resource path="res://Menus/Inventory/Inventory.tscn" type="PackedScene" id=2]
 
-[sub_resource type="CapsuleMesh" id=2]
+[sub_resource type="CapsuleMesh" id=1]
 mid_height = 4.0
 radial_segments = 6
 rings = 1
 
-[sub_resource type="CapsuleShape" id=3]
+[sub_resource type="CapsuleShape" id=2]
 height = 4.0
 
-[sub_resource type="CapsuleShape" id=4]
+[sub_resource type="CapsuleShape" id=3]
 radius = 1.1
 height = 4.0
 
@@ -22,18 +23,21 @@ script = ExtResource( 1 )
 
 [node name="Camera" type="Camera" parent="Spatial"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -0.866904 )
+cull_mask = 1048543
 fov = 90.0
 far = 250.0
 
+[node name="Inventory" parent="Spatial/Camera" instance=ExtResource( 2 )]
+
 [node name="MeshInstance" type="MeshInstance" parent="Spatial"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 )
 visible = false
-mesh = SubResource( 2 )
+mesh = SubResource( 1 )
 material/0 = null
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 )
-shape = SubResource( 3 )
+shape = SubResource( 2 )
 
 [node name="Timer" type="Timer" parent="."]
 wait_time = 2.0
@@ -45,7 +49,7 @@ collision_mask = 2
 
 [node name="CollisionShape" type="CollisionShape" parent="KillBox"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 )
-shape = SubResource( 4 )
+shape = SubResource( 3 )
 
 [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]
 [connection signal="body_entered" from="KillBox" to="." method="_on_KillBox_body_entered"]