From 873d6d024e92a2f48ad4ff492c7aa377f898e2da Mon Sep 17 00:00:00 2001
From: Squinternator <ufinii@gmail.com>
Date: Mon, 8 Apr 2024 19:45:42 +0000
Subject: [PATCH] Consolidate player capsule

---
 characters/player/collision_shape.res | Bin 0 -> 230 bytes
 characters/player/player.tscn         |  13 ++++---------
 2 files changed, 4 insertions(+), 9 deletions(-)
 create mode 100644 characters/player/collision_shape.res

diff --git a/characters/player/collision_shape.res b/characters/player/collision_shape.res
new file mode 100644
index 0000000000000000000000000000000000000000..bb30465a8a6879fb70f4f740182fd5ef567b608b
GIT binary patch
literal 230
zcmV<C02%*MQ$s@n000005C8y70RRBb0000ewJ-f(OaLVY0HVt!CV)%Q7&EZy!3#W<
zNH!_RCg<7PC1lx#27WQ*@?TQ*EnLLh_qQpI2jo%kFqv2^ys52W(ZbZKwHO{vid)QC
z&4#C!@EnIth9BU@D8+3lqB3oxBu*C<(Np$R1k#*XY>~p+Huxi)$}Nm@NnFGlT8C_*
zL~Yon{tCar%0)v`ksx9G0z)*Cxdh48EOU<k;3xP4{(%n>0B1<uEne2(WG!G=3bKZg
g+r(okG%gId0$OoNnF-g(PmTnbKX?uUSW;6%L-ZnI{r~^~

literal 0
HcmV?d00001

diff --git a/characters/player/player.tscn b/characters/player/player.tscn
index 24463fa..02d4322 100644
--- a/characters/player/player.tscn
+++ b/characters/player/player.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=11 format=3 uid="uid://cbhx1xme0sb7k"]
+[gd_scene load_steps=10 format=3 uid="uid://cbhx1xme0sb7k"]
 
 [ext_resource type="Script" path="res://characters/player/player.gd" id="1_ymjub"]
 [ext_resource type="PackedScene" uid="uid://bcv81ku26xo" path="res://interfaces/hud/hud.tscn" id="2_5qvi2"]
 [ext_resource type="PackedScene" uid="uid://c8co0qa2omjmh" path="res://weapons/space_gun/space_gun.tscn" id="2_ka38u"]
+[ext_resource type="Shape3D" uid="uid://dkwljsgaflf31" path="res://characters/player/collision_shape.res" id="2_y6kgj"]
 
 [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_clur0"]
 resource_local_to_scene = true
@@ -12,12 +13,6 @@ absorbent = true
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_vmqfq"]
 radius = 0.3
 
-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_rm4oh"]
-radius = 0.3
-
-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_3l0v2"]
-radius = 0.3
-
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_rqdp6"]
 properties/0/path = NodePath(".:linear_velocity")
 properties/0/spawn = true
@@ -113,11 +108,11 @@ script = ExtResource("1_ymjub")
 mesh = SubResource("CapsuleMesh_vmqfq")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-shape = SubResource("CapsuleShape3D_rm4oh")
+shape = ExtResource("2_y6kgj")
 
 [node name="ShapeCast3D" type="ShapeCast3D" parent="."]
 transform = Transform3D(1.05, 0, 0, 0, 1.05, 0, 0, 0, 1.05, 0, 0, 0)
-shape = SubResource("CapsuleShape3D_3l0v2")
+shape = ExtResource("2_y6kgj")
 target_position = Vector3(0, 0, 0)
 collide_with_areas = true