Merge branch 'world' into main

project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="Same Day Shipping"
-run/main_scene="res://scenes/tests/farmlands_test.tscn"
+run/main_scene="res://scenes/tests/arena.tscn"
 config/features=PackedStringArray("4.1", "Forward Plus")
 boot_splash/bg_color=Color(0.109804, 0.109804, 0.109804, 1)
 boot_splash/image="res://assets/textures/ui/iconlarge.png"
@@ -73,6 +73,7 @@ grapple={
 3d_physics/layer_2="Player"
 3d_physics/layer_3="Packages"
 3d_physics/layer_4="PackageDestinations"
+3d_physics/layer_9="NotGrappleable"
 
 [rendering]
 

scenes/game/player.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=7 format=3 uid="uid://ri62cf8h14pg"]
+[gd_scene load_steps=8 format=3 uid="uid://ri62cf8h14pg"]
 
 [ext_resource type="Script" path="res://scripts/game/player/player.gd" id="1_dr1b4"]
 [ext_resource type="Script" path="res://scripts/game/player/playercamera.gd" id="2_6e5hk"]
+[ext_resource type="Script" path="res://scripts/game/player/PlayerCollisionShape.gd" id="2_q7kq3"]
 [ext_resource type="Script" path="res://scripts/game/player/DEBUG_VECTORS.gd" id="3_neyp5"]
 [ext_resource type="Script" path="res://scripts/game/player/spedometer.gd" id="4_3juge"]
 
@@ -11,7 +12,7 @@ height = 1.75
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_0sfqo"]
 height = 1.75
 
-[node name="CharacterBody3D" type="CharacterBody3D"]
+[node name="Player" type="CharacterBody3D"]
 floor_constant_speed = true
 floor_snap_length = 1.0
 script = ExtResource("1_dr1b4")
@@ -24,6 +25,7 @@ mesh = SubResource("CapsuleMesh_mo48a")
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.875, 0)
 shape = SubResource("CapsuleShape3D_0sfqo")
+script = ExtResource("2_q7kq3")
 
 [node name="grappling_hook_obstruction_raycast" type="RayCast3D" parent="."]
 target_position = Vector3(0, 0, 0)

scenes/objects/world/harbor/ShippingContainer-3x6Wall.tscn

@@ -0,0 +1,66 @@
+[gd_scene load_steps=3 format=3 uid="uid://ckan458vckop6"]
+
+[ext_resource type="PackedScene" uid="uid://dnucop0vfw2xq" path="res://scenes/objects/world/harbor/ShippingContainer.tscn" id="1_wy5qj"]
+
+[sub_resource type="BoxOccluder3D" id="BoxOccluder3D_577m3"]
+size = Vector3(14.6084, 6.93033, 11.2377)
+
+[node name="ShippingContainer-3x6Wall" type="Node3D"]
+
+[node name="ShippingContainer" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.85479, 0, 0)
+
+[node name="ShippingContainer2" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.14755, 0, 0.278774)
+
+[node name="ShippingContainer3" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.11157, 2.47591, -0.249471)
+
+[node name="ShippingContainer4" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.56653, -0.0391762, 0)
+
+[node name="ShippingContainer5" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.86815, 2.47591, 0)
+
+[node name="ShippingContainer6" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.546, 2.51872, -0.298033)
+
+[node name="ShippingContainer7" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.03218, 0, -0.212626)
+
+[node name="ShippingContainer8" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.73942, 0, 0.278774)
+
+[node name="ShippingContainer9" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.7754, 2.47591, -0.0395279)
+
+[node name="ShippingContainer10" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.32044, 0.0383565, -0.142134)
+
+[node name="ShippingContainer13" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -6.85479, 5.00114, 0)
+
+[node name="ShippingContainer14" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -4.14755, 5.00114, 0.278774)
+
+[node name="ShippingContainer15" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -1.56653, 4.96196, 0)
+
+[node name="ShippingContainer16" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 1.03218, 5.00114, -0.212626)
+
+[node name="ShippingContainer17" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3.73942, 5.00114, 0.278774)
+
+[node name="ShippingContainer18" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 6.32044, 5.03949, -0.142134)
+
+[node name="ShippingContainer11" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.01882, 2.47591, 0)
+
+[node name="ShippingContainer12" parent="." instance=ExtResource("1_wy5qj")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.34097, 2.56753, -0.103995)
+
+[node name="OccluderInstance3D" type="OccluderInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.78231, 0)
+occluder = SubResource("BoxOccluder3D_577m3")

scenes/objects/world/harbor/ShippingContainer-4x4Wall.tscn

@@ -0,0 +1,60 @@
+[gd_scene load_steps=3 format=3 uid="uid://d1v0213ty4xri"]
+
+[ext_resource type="PackedScene" uid="uid://dnucop0vfw2xq" path="res://scenes/objects/world/harbor/ShippingContainer.tscn" id="1_fx3im"]
+
+[sub_resource type="BoxOccluder3D" id="BoxOccluder3D_577m3"]
+size = Vector3(10.2364, 9.02214, 11.2377)
+
+[node name="ShippingContainer-4x4Wall" type="Node3D"]
+
+[node name="ShippingContainer" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.85479, 0, 0)
+
+[node name="ShippingContainer2" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.14755, 0, 0.278774)
+
+[node name="ShippingContainer3" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.11157, 2.47591, -0.249471)
+
+[node name="ShippingContainer4" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.43347, -0.0391762, 0)
+
+[node name="ShippingContainer5" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.86815, 2.47591, 0)
+
+[node name="ShippingContainer6" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.454, 2.51872, -0.298033)
+
+[node name="ShippingContainer7" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.03218, 0, -0.212626)
+
+[node name="ShippingContainer13" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 4.09389, 5.00114, -0.12034)
+
+[node name="ShippingContainer14" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 1.38665, 5.00114, -0.399113)
+
+[node name="ShippingContainer15" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, -1.19437, 4.96196, -0.120339)
+
+[node name="ShippingContainer16" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, -3.79308, 5.00114, 0.0922871)
+
+[node name="ShippingContainer11" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.01882, 2.47591, 0)
+
+[node name="ShippingContainer8" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 1.35067, 7.4997, 0.129132)
+
+[node name="ShippingContainer9" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 4.10725, 7.4997, -0.12034)
+
+[node name="ShippingContainer10" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, -1.2149, 7.54251, 0.177694)
+
+[node name="ShippingContainer12" parent="." instance=ExtResource("1_fx3im")]
+transform = Transform3D(1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, -3.77972, 7.4997, -0.120339)
+
+[node name="OccluderInstance3D" type="OccluderInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.71748, 0)
+occluder = SubResource("BoxOccluder3D_577m3")

scenes/objects/world/harbor/ShippingContainer-SixPyramid.tscn

@@ -0,0 +1,30 @@
+[gd_scene load_steps=3 format=3 uid="uid://b0thocf5ngfje"]
+
+[ext_resource type="PackedScene" uid="uid://dnucop0vfw2xq" path="res://scenes/objects/world/harbor/ShippingContainer.tscn" id="1_jbouw"]
+
+[sub_resource type="BoxOccluder3D" id="BoxOccluder3D_r6yng"]
+size = Vector3(3.94203, 4.58013, 11.179)
+
+[node name="ShippingContainer-SixPyramid" type="Node3D"]
+
+[node name="ShippingContainer" parent="." instance=ExtResource("1_jbouw")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.83263, 0, 0)
+
+[node name="ShippingContainer2" parent="." instance=ExtResource("1_jbouw")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.125398, 0, 0.278774)
+
+[node name="ShippingContainer3" parent="." instance=ExtResource("1_jbouw")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.91058, 2.47591, -0.249471)
+
+[node name="ShippingContainer4" parent="." instance=ExtResource("1_jbouw")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.45563, 0.0383565, 0)
+
+[node name="ShippingContainer5" parent="." instance=ExtResource("1_jbouw")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.846, 2.47591, 0)
+
+[node name="ShippingContainer6" parent="." instance=ExtResource("1_jbouw")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.35229, 4.97012, -0.103995)
+
+[node name="OccluderInstance3D" type="OccluderInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.60323, 0)
+occluder = SubResource("BoxOccluder3D_r6yng")

scenes/objects/world/harbor/ShippingContainer-ThreePyramid.tscn

@@ -0,0 +1,21 @@
+[gd_scene load_steps=3 format=3 uid="uid://dyty5ev20vicf"]
+
+[ext_resource type="PackedScene" uid="uid://dnucop0vfw2xq" path="res://scenes/objects/world/harbor/ShippingContainer.tscn" id="1_suho4"]
+
+[sub_resource type="BoxOccluder3D" id="BoxOccluder3D_woixw"]
+size = Vector3(4.79167, 2.1765, 11.9029)
+
+[node name="ShippingContainer-ThreePyramid" type="Node3D"]
+
+[node name="ShippingContainer" parent="." instance=ExtResource("1_suho4")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.38124, 0, 0)
+
+[node name="ShippingContainer2" parent="." instance=ExtResource("1_suho4")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.32599, 0, 0)
+
+[node name="ShippingContainer3" parent="." instance=ExtResource("1_suho4")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.54269, 0)
+
+[node name="OccluderInstance3D" type="OccluderInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.17587, 0)
+occluder = SubResource("BoxOccluder3D_woixw")