network work work workHEADmaster

1 files changed, 5 insertions, 24 deletions

diff --git a/godot/scenes/characters/PlayerRigid.tscn b/godot/scenes/characters/PlayerRigid.tscn
index 9822c20..9476e78 100644
--- a/godot/scenes/characters/PlayerRigid.tscn
+++ b/godot/scenes/characters/PlayerRigid.tscn
@@ -1,8 +1,7 @@
-[gd_scene load_steps=18 format=2]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://scripts/characters/player_controller_new.gd" type="Script" id=1]
 [ext_resource path="res://theming/Rapscallion-q341.ttf" type="DynamicFontData" id=2]
-[ext_resource path="res://scenes/characters/PlayerAreaDetect.gd" type="Script" id=3]
 [ext_resource path="res://scenes/characters/viewmodel_arms.tscn" type="PackedScene" id=4]
 [ext_resource path="res://scenes/weapons/hands.res" type="Resource" id=5]
 [ext_resource path="res://scenes/weapons/pistol.tres" type="Resource" id=6]
@@ -28,9 +27,6 @@ outline_size = 1
 use_mipmaps = true
 font_data = ExtResource( 2 )
 
-[sub_resource type="BoxShape" id=1]
-extents = Vector3( 0.325, 0.9, 0.325 )
-
 [sub_resource type="SphereShape" id=9]
 radius = 50.0
 
@@ -40,10 +36,9 @@ collision_mask = 32769
 mode = 2
 mass = 80.0
 physics_material_override = SubResource( 8 )
-continuous_cd = true
 contacts_reported = 3
 contact_monitor = true
-sleeping = true
+can_sleep = false
 axis_lock_angular_x = true
 axis_lock_angular_y = true
 axis_lock_angular_z = true
@@ -61,6 +56,8 @@ shape = SubResource( 6 )
 
 [node name="WeaponSound" type="AudioStreamPlayer3D" parent="."]
 
+[node name="NavigationAgent" type="NavigationAgent" parent="."]
+
 [node name="Neck" type="Spatial" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.44, 0 )
 
@@ -98,27 +95,14 @@ cast_to = Vector3( 0, -0.05, 0 )
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0 )
 mesh = SubResource( 4 )
 
-[node name="NavigationAgent" type="NavigationAgent" parent="."]
-avoidance_enabled = true
-radius = 0.3
-
 [node name="Nametag" type="Label3D" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.08522, 0 )
 pixel_size = 0.0023
 billboard = 1
 font = SubResource( 5 )
 
-[node name="AreaDetect" type="Area" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0 )
-collision_layer = 4
-collision_mask = 4
-monitorable = false
-script = ExtResource( 3 )
-
-[node name="Collision" type="CollisionShape" parent="AreaDetect"]
-shape = SubResource( 1 )
-
 [node name="AISearchArea" type="Area" parent="."]
+monitoring = false
 monitorable = false
 
 [node name="Collision" type="CollisionShape" parent="AISearchArea"]
@@ -133,6 +117,3 @@ script = ExtResource( 11 )
 
 [node name="ManCannon" type="Node" parent="AIStateMachine"]
 script = ExtResource( 10 )
-
-[connection signal="area_entered" from="AreaDetect" to="AreaDetect" method="_on_AreaDetect_area_entered"]
-[connection signal="area_exited" from="AreaDetect" to="AreaDetect" method="_on_AreaDetect_area_exited"]