Merge branch 'programming' into main

project.godot

@@ -11,18 +11,19 @@ config_version=5
 [application]
 
 config/name="Same Day Shipping"
-run/main_scene="res://scenes/tests/arena.tscn"
+run/main_scene="res://scenes/GAME.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"
 config/icon="res://assets/textures/ui/icon.png"
 
 [autoload]
 
-AudioDispatcher="*res://scripts/audio/AudioDispatcher.gd"
-GameStateManager="*res://scripts/game/GameStateManager.gd"
+UI="*res://scenes/game/ui/UI.tscn"
 PackageZoneManager="*res://scripts/game/PackageZoneManager.gd"
 GameStopwatch="*res://scripts/game/GameStopwatch.gd"
+GameStateManager="*res://scripts/game/GameStateManager.gd"
+AudioDispatcher="*res://scripts/audio/AudioDispatcher.gd"
 
 [display]
 

scenes/game/ui/CountdownPanel.tscn

@@ -0,0 +1,41 @@
+[gd_scene load_steps=2 format=3 uid="uid://1yjtudp4xvsi"]
+
+[ext_resource type="Script" path="res://scripts/game/ui/CountdownPanel.gd" id="1_x00dc"]
+
+[node name="COUNTDOWN_PANEL" type="Panel"]
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -50.0
+offset_top = -50.0
+offset_right = 50.0
+offset_bottom = 50.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_x00dc")
+
+[node name="timer" type="Timer" parent="."]
+one_shot = true
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/margin_left = 15
+theme_override_constants/margin_top = 15
+theme_override_constants/margin_right = 15
+theme_override_constants/margin_bottom = 15
+
+[node name="NUMBER_LABEL" type="Label" parent="MarginContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_vertical = 1
+theme_override_font_sizes/font_size = 72
+text = "3"
+horizontal_alignment = 1
+vertical_alignment = 1

scenes/game/ui/NewGamePanel.tscn

@@ -0,0 +1,94 @@
+[gd_scene load_steps=4 format=3 uid="uid://1foa2euwwg63"]
+
+[ext_resource type="Script" path="res://scripts/game/ui/NewGamePanel.gd" id="1_2j5o4"]
+[ext_resource type="Script" path="res://scripts/game/ui/FocusAwareSpinbox.gd" id="2_dap12"]
+[ext_resource type="Script" path="res://scripts/game/ui/FocusAwareControl.gd" id="3_hv201"]
+
+[node name="NewGamePanel" type="Panel"]
+custom_minimum_size = Vector2(300, 200)
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_2j5o4")
+
+[node name="Margins" type="MarginContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_vertical = 3
+theme_override_constants/margin_left = 15
+theme_override_constants/margin_top = 5
+theme_override_constants/margin_right = 15
+theme_override_constants/margin_bottom = 15
+
+[node name="TitleStack" type="VBoxContainer" parent="Margins"]
+layout_mode = 2
+theme_override_constants/separation = 10
+
+[node name="Title" type="Label" parent="Margins/TitleStack"]
+layout_mode = 2
+size_flags_vertical = 1
+theme_override_font_sizes/font_size = 32
+text = "NEW GAME"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="OptionsStack" type="VBoxContainer" parent="Margins/TitleStack"]
+layout_mode = 2
+theme_override_constants/separation = 15
+
+[node name="DestinationCount" type="HBoxContainer" parent="Margins/TitleStack/OptionsStack"]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_constants/separation = 15
+
+[node name="Label" type="Label" parent="Margins/TitleStack/OptionsStack/DestinationCount"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Destination Count"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="DEST_COUNT_SPINBOX" type="SpinBox" parent="Margins/TitleStack/OptionsStack/DestinationCount"]
+unique_name_in_owner = true
+layout_mode = 2
+min_value = 1.0
+max_value = 10.0
+value = 5.0
+script = ExtResource("2_dap12")
+
+[node name="Seed" type="HBoxContainer" parent="Margins/TitleStack/OptionsStack"]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_constants/separation = 15
+
+[node name="Label" type="Label" parent="Margins/TitleStack/OptionsStack/Seed"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Seed"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="SEED_LINEEDIT" type="LineEdit" parent="Margins/TitleStack/OptionsStack/Seed"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+script = ExtResource("3_hv201")
+
+[node name="Start" type="HBoxContainer" parent="Margins/TitleStack/OptionsStack"]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_constants/separation = 15
+
+[node name="START_BUTTON" type="Button" parent="Margins/TitleStack/OptionsStack/Start"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+text = "START"

scenes/game/ui/UI.tscn

@@ -0,0 +1,82 @@
+[gd_scene load_steps=4 format=3 uid="uid://conhwwg6txvy"]
+
+[ext_resource type="PackedScene" uid="uid://1foa2euwwg63" path="res://scenes/game/ui/NewGamePanel.tscn" id="1_0u5ot"]
+[ext_resource type="Script" path="res://scripts/game/ui/UI.gd" id="1_2wjvs"]
+[ext_resource type="PackedScene" uid="uid://1yjtudp4xvsi" path="res://scenes/game/ui/CountdownPanel.tscn" id="2_2cmfg"]
+
+[node name="UI" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_2wjvs")
+
+[node name="NEW_GAME_PANEL" parent="." instance=ExtResource("1_0u5ot")]
+unique_name_in_owner = true
+layout_mode = 1
+offset_left = -150.0
+offset_top = -100.0
+offset_right = 150.0
+offset_bottom = 100.0
+
+[node name="COUNTDOWN_PANEL" parent="." instance=ExtResource("2_2cmfg")]
+unique_name_in_owner = true
+layout_mode = 1
+offset_top = -354.0
+offset_bottom = -254.0
+
+[node name="Control" type="MarginContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+theme_override_constants/margin_left = 15
+theme_override_constants/margin_top = 15
+theme_override_constants/margin_right = 15
+theme_override_constants/margin_bottom = 15
+
+[node name="Control" type="Control" parent="Control"]
+layout_mode = 2
+mouse_filter = 2
+
+[node name="Label3" type="Label" parent="Control/Control"]
+layout_mode = 1
+anchors_preset = 3
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -313.0
+offset_top = -26.0
+grow_horizontal = 0
+grow_vertical = 0
+text = "(R)estart          (E)xplore          (N)ew Game"
+
+[node name="Label2" type="Label" parent="Control/Control"]
+layout_mode = 1
+anchors_preset = 2
+anchor_top = 1.0
+anchor_bottom = 1.0
+offset_top = -26.0
+offset_right = 313.0
+grow_vertical = 0
+text = "(WASD) Move     (SPACE) Jump     (Q) Grapple     (MOUSE2) Slide"
+
+[node name="PRACTICE_CONTROLS" type="Label" parent="Control/Control"]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
+anchors_preset = 2
+anchor_top = 1.0
+anchor_bottom = 1.0
+offset_top = -80.0
+offset_right = 313.0
+offset_bottom = -28.0
+grow_vertical = 0
+text = "(Z) Set Practice Position
+(X) Go to Practice Position"

scenes/objects/world/industrial/SemiTruck-1StackShipping.tscn

@@ -8,4 +8,4 @@
 [node name="SemiTruckTractor" parent="." instance=ExtResource("1_u7om5")]
 
 [node name="ShippingContainer" parent="." instance=ExtResource("2_3yyyi")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0410785, 0.970148, -8.76804)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.041, 1.42, -8.768)

scenes/objects/world/industrial/SemiTruck-2StackShipping.tscn

@@ -8,7 +8,7 @@
 [node name="SemiTruckTractor" parent="." instance=ExtResource("2_7menb")]
 
 [node name="ShippingContainer" parent="." instance=ExtResource("1_xn68x")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0410785, 0.970148, -8.76804)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0410785, 1.41997, -8.76804)
 
 [node name="ShippingContainer2" parent="." instance=ExtResource("1_xn68x")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0738124, 3.48779, -8.76804)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0738124, 3.93761, -8.76804)

scenes/tests/arena.tscn → scenes/tests/MAP.tscn

@@ -1,9 +1,8 @@
-[gd_scene load_steps=31 format=3 uid="uid://b3ykullr8bjs6"]
+[gd_scene load_steps=26 format=3 uid="uid://b3ykullr8bjs6"]
 
 [ext_resource type="Script" path="res://scripts/game/MAIN.gd" id="1_tclly"]
 [ext_resource type="PackedScene" uid="uid://c1hrewm6ssdu3" path="res://scenes/objects/world/industrial/CoolingTower.tscn" id="1_yo6jh"]
 [ext_resource type="PackedScene" uid="uid://ckan458vckop6" path="res://scenes/objects/world/harbor/ShippingContainer-3x6Wall.tscn" id="2_cfmih"]
-[ext_resource type="PackedScene" uid="uid://ri62cf8h14pg" path="res://scenes/game/player.tscn" id="2_el38y"]
 [ext_resource type="PackedScene" uid="uid://b0thocf5ngfje" path="res://scenes/objects/world/harbor/ShippingContainer-SixPyramid.tscn" id="2_kyex0"]
 [ext_resource type="PackedScene" uid="uid://cf32gvijxjjy7" path="res://scenes/game/PackageZone.tscn" id="2_v53fs"]
 [ext_resource type="PackedScene" uid="uid://dyty5ev20vicf" path="res://scenes/objects/world/harbor/ShippingContainer-ThreePyramid.tscn" id="3_omhcv"]
@@ -17,7 +16,6 @@
 [ext_resource type="PackedScene" uid="uid://dwdi4w2812bjb" path="res://scenes/objects/world/industrial/PickupTruck.tscn" id="11_pcncm"]
 [ext_resource type="PackedScene" uid="uid://cew4d4rve6rco" path="res://scenes/objects/world/trainyard/Traincar-2StackShipping.tscn" id="12_jo64f"]
 [ext_resource type="PackedScene" uid="uid://cl6kaobwokadg" path="res://scenes/objects/world/farmlands/GrainTower.tscn" id="15_15j8p"]
-[ext_resource type="Script" path="res://scripts/game/StartZone.gd" id="18_ldebt"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0363p"]
 sky_top_color = Color(0.478431, 0.619608, 0.8, 1)
@@ -75,16 +73,6 @@ albedo_texture = SubResource("NoiseTexture2D_g4euf")
 [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_6ri35"]
 points = PackedVector3Array(-150, 0, -150, -150, 0, 150, 150, 0, -150, 150, 0, 150)
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_m0v1a"]
-margin = 0.0
-size = Vector3(3, 2, 2)
-
-[sub_resource type="PlaneMesh" id="PlaneMesh_0wmxf"]
-size = Vector2(3, 2)
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_le7yp"]
-albedo_color = Color(0, 1, 0, 1)
-
 [node name="SCENE" type="Node3D"]
 script = ExtResource("1_tclly")
 
@@ -11631,24 +11619,3 @@ transform = Transform3D(0.997023, 0, 0.0771019, 0, 1, 0, -0.0771019, 0, 0.997023
 [node name="PackageZone" parent="SCENERY/Q4/road" instance=ExtResource("2_v53fs")]
 transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 18.6911, 0.145459, -12.2871)
 zone_name = &"Pump Station Parking Lot"
-
-[node name="GAME" type="Node" parent="."]
-
-[node name="Player" parent="GAME" instance=ExtResource("2_el38y")]
-transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -54.9508, 0.287041, -35.4468)
-floor_max_angle = 0.959931
-
-[node name="StartZone" type="Area3D" parent="."]
-transform = Transform3D(3, 0, 0, 0, 3, 0, 0, 0, 3, -54.8142, 0.0354595, -34.7179)
-collision_layer = 8
-collision_mask = 2
-script = ExtResource("18_ldebt")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="StartZone"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
-shape = SubResource("BoxShape3D_m0v1a")
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="StartZone"]
-mesh = SubResource("PlaneMesh_0wmxf")
-skeleton = NodePath("")
-surface_material_override/0 = SubResource("StandardMaterial3D_le7yp")