From b1d6905eb45b310d3f28aae79c843d84f7b1513c Mon Sep 17 00:00:00 2001 From: Quantum Date: Wed, 1 Jan 2025 16:12:37 -0500 Subject: [PATCH] Updates n things --- assets | 2 +- scenes/level2.tscn | 110 ++++++++++++++++++++++++++++++++++++ scenes/level_pool.tscn | 8 +-- scenes/monitor.tscn | 21 ++----- {scenes => scripts}/kreb.gd | 0 5 files changed, 121 insertions(+), 20 deletions(-) create mode 100644 scenes/level2.tscn rename {scenes => scripts}/kreb.gd (100%) diff --git a/assets b/assets index b8f9336..30aec9c 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit b8f93367623ab37c4672c3898986e431c10ac145 +Subproject commit 30aec9cd7152c0967fca91347485589202ade0e0 diff --git a/scenes/level2.tscn b/scenes/level2.tscn new file mode 100644 index 0000000..fbc8728 --- /dev/null +++ b/scenes/level2.tscn @@ -0,0 +1,110 @@ +[gd_scene load_steps=7 format=3 uid="uid://w8rrrxh4xjcv"] + +[ext_resource type="Texture2D" uid="uid://w1hmclcq4w5h" path="res://assets/textures/dev/tiles01_orange.png" id="1_sjkrg"] +[ext_resource type="PackedScene" uid="uid://cy86jyiy6skvk" path="res://scenes/player.tscn" id="2_hh0hj"] +[ext_resource type="PackedScene" uid="uid://bfv04lp2tbxtd" path="res://scenes/monitor.tscn" id="3_pxt4l"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pg356"] +albedo_texture = ExtResource("1_sjkrg") +uv1_scale = Vector3(32, 32, 32) + +[sub_resource type="BoxShape3D" id="BoxShape3D_103ki"] +size = Vector3(6.39343, 0.369629, 3.91266) + +[sub_resource type="BoxShape3D" id="BoxShape3D_pnjbj"] +size = Vector3(0.1, 0.1, 0.1) + +[node name="Node3D" type="Node3D"] + +[node name="CSGBox3D" type="CSGBox3D" parent="."] +material_override = SubResource("StandardMaterial3D_pg356") +use_collision = true +size = Vector3(50, 1, 50) + +[node name="Player" parent="." instance=ExtResource("2_hh0hj")] +transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, -22, 0.5, -22) + +[node name="Lights" type="Node3D" parent="."] + +[node name="OmniLight3D" type="OmniLight3D" parent="Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 14, 0) +light_energy = 6.755 +omni_range = 53.419 + +[node name="OmniLight3D2" type="OmniLight3D" parent="Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 14, 15) +light_energy = 6.755 +omni_range = 53.419 + +[node name="OmniLight3D3" type="OmniLight3D" parent="Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 14, 15) +light_energy = 6.755 +omni_range = 53.419 + +[node name="OmniLight3D4" type="OmniLight3D" parent="Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 14, -15) +light_energy = 6.755 +omni_range = 53.419 + +[node name="OmniLight3D5" type="OmniLight3D" parent="Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 14, -15) +light_energy = 6.755 +omni_range = 53.419 + +[node name="Monitor" parent="." instance=ExtResource("3_pxt4l")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.616, 0.875, -21.4655) + +[node name="Monitor2" parent="." instance=ExtResource("3_pxt4l")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.5726, 0.875, -21.4655) + +[node name="Monitor3" parent="." instance=ExtResource("3_pxt4l")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.68112, 0.875, -21.4655) + +[node name="CSGBox3D2" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.731, 1.29547, -21.3074) +use_collision = true +size = Vector3(1, 1.59094, 6.75977) + +[node name="CSGBox3D3" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.874, 1.65709, -21.3074) +use_collision = true +size = Vector3(1, 2.31418, 6.75977) + +[node name="CSGBox3D4" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.54875, 2.21061, -21.3074) +use_collision = true +size = Vector3(1, 3.42122, 6.75977) + +[node name="Node3D" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.04909, 2.31377, -21.3169) + +[node name="RigidBody3D" type="RigidBody3D" parent="Node3D"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Node3D/RigidBody3D"] +shape = SubResource("BoxShape3D_103ki") + +[node name="CSGBox3D5" type="CSGBox3D" parent="Node3D/RigidBody3D/CollisionShape3D"] +size = Vector3(6.39343, 0.369629, 3.91266) + +[node name="CSGBox3D6" type="CSGBox3D" parent="Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.250772, -0.705801, 2.23987) +use_collision = true +size = Vector3(0.586426, 2.21594, 0.437988) + +[node name="CSGBox3D7" type="CSGBox3D" parent="Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.250772, -0.705801, -2.36084) +use_collision = true +size = Vector3(0.586426, 2.21594, 0.437988) + +[node name="Generic6DOFJoint3D" type="Generic6DOFJoint3D" parent="Node3D"] +node_a = NodePath("../RigidBody3D") +node_b = NodePath("../StaticBody3D") +angular_limit_z/upper_angle = 0.198968 +angular_limit_z/lower_angle = -0.159698 +angular_motor_z/target_velocity = 0.0872665 + +[node name="StaticBody3D" type="StaticBody3D" parent="Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.03115) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Node3D/StaticBody3D"] +shape = SubResource("BoxShape3D_pnjbj") diff --git a/scenes/level_pool.tscn b/scenes/level_pool.tscn index dca5e2a..6fb6506 100644 --- a/scenes/level_pool.tscn +++ b/scenes/level_pool.tscn @@ -8,7 +8,7 @@ [ext_resource type="PackedScene" uid="uid://dnq81gfo5y4oy" path="res://components/group_trigger_component.tscn" id="6_f2del"] [ext_resource type="Script" path="res://scripts/win_box.gd" id="7_oxf41"] [ext_resource type="Script" path="res://scripts/failure.gd" id="8_pee3c"] -[ext_resource type="Script" path="res://scenes/kreb.gd" id="9_wgbkn"] +[ext_resource type="Script" path="res://scripts/kreb.gd" id="9_wgbkn"] [ext_resource type="AudioStream" uid="uid://4ju4ca5wak7v" path="res://assets/sounds/dialog/kerbygreet.wav" id="10_ee2e2"] [ext_resource type="AudioStream" uid="uid://cojpnupcedga" path="res://assets/sounds/dialog/kerbywhatare.wav" id="11_nnjei"] [ext_resource type="AudioStream" uid="uid://w7jbmkwjvtvx" path="res://assets/sounds/disappoint.wav" id="11_yx3n7"] @@ -81,14 +81,14 @@ omni_range = 162.191 [node name="player" parent="levelpool" index="1"] visible = false -[node name="Text" parent="levelpool" index="7"] +[node name="Text" parent="levelpool" index="6"] visible = false -[node name="Plane" parent="levelpool" index="8"] +[node name="Plane" parent="levelpool" index="7"] visible = false [node name="Player" parent="." instance=ExtResource("2_eggmh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.012538, 19) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5.17559, 0.012538, 22.4323) [node name="EntranceDoor" parent="." instance=ExtResource("3_clecd")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 11.5) diff --git a/scenes/monitor.tscn b/scenes/monitor.tscn index c212641..c2873bd 100644 --- a/scenes/monitor.tscn +++ b/scenes/monitor.tscn @@ -1,26 +1,17 @@ -[gd_scene load_steps=4 format=3 uid="uid://bfv04lp2tbxtd"] +[gd_scene load_steps=3 format=3 uid="uid://bfv04lp2tbxtd"] [ext_resource type="PackedScene" uid="uid://duuedavsf44c7" path="res://assets/models/general/monitor01.blend" id="1_6l6n4"] -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_tfpjr"] -points = PackedVector3Array(-12, 6.00235, -12, -11.0016, 0, -12, -12, 6.00235, -7.99922, -12, 30, -12, -11.0016, 0, 12, 10.9992, 0, -12, -12, 30, -7.99922, 12, 30, -12, 10.9992, 0, 12, -11.0016, 3.00117, 12, 12, 6.00235, -12, 12, 30, -7.99922, -8.00157, 25.9975, 12, 10.9992, 3.00117, 12, 12, 6.00235, -7.99922, 7.99922, 25.9975, 12) - -[sub_resource type="BoxShape3D" id="BoxShape3D_wfrja"] -size = Vector3(0.6, 0.75, 0.6) +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_10f2x"] +points = PackedVector3Array(-0.3, -0.208738, -0.27433, -0.275039, -0.358724, -0.27433, -0.3, -0.208738, -0.174369, -0.3, 0.391276, -0.27433, 0.27498, -0.358724, -0.27433, -0.275039, -0.358724, 0.32567, -0.3, 0.391276, -0.174369, 0.3, 0.391276, -0.27433, 0.27498, -0.358724, 0.32567, 0.3, -0.208738, -0.27433, -0.275039, -0.283768, 0.32567, -0.200039, 0.291213, 0.32567, 0.3, 0.391276, -0.174369, 0.3, -0.208738, -0.174369, 0.27498, -0.283768, 0.32567, 0.19998, 0.291213, 0.32567) [node name="Monitor" type="RigidBody3D" groups=["can_hold", "monitors"]] [node name="monitor012" parent="." instance=ExtResource("1_6l6n4")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.375, 0) -[node name="@StaticBody3D@17265" parent="monitor012" index="1"] -visible = false - -[node name="CollisionShape3D" parent="monitor012/@StaticBody3D@17265" index="0"] -shape = SubResource("ConvexPolygonShape3D_tfpjr") -disabled = true - -[node name="CollisionShape3D" type="CollisionShape3D" parent="." groups=["can_hold"]] -shape = SubResource("BoxShape3D_wfrja") +[node name="CollisionShape3D2" type="CollisionShape3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0162762, -0.0256701) +shape = SubResource("ConvexPolygonShape3D_10f2x") [editable path="monitor012"] diff --git a/scenes/kreb.gd b/scripts/kreb.gd similarity index 100% rename from scenes/kreb.gd rename to scripts/kreb.gd