From 077e6b4bb9c628aceedb0ae26f28d8dc1ff42c05 Mon Sep 17 00:00:00 2001 From: derek Date: Sat, 22 Mar 2025 20:41:34 -0500 Subject: [PATCH] more playing with async loading --- project.godot | 1 + scenes/HUBWORLD.tscn | 6 +- scenes/enemy_working_scene_ASYNCTEST.tscn | 135 +++++----------------- scripts/scene_changer.gd | 11 +- 4 files changed, 35 insertions(+), 118 deletions(-) diff --git a/project.godot b/project.godot index a285b27..9e99c68 100644 --- a/project.godot +++ b/project.godot @@ -251,6 +251,7 @@ holster={ textures/canvas_textures/default_texture_filter=0 lights_and_shadows/directional_shadow/soft_shadow_filter_quality=5 lights_and_shadows/positional_shadow/soft_shadow_filter_quality=5 +anti_aliasing/quality/screen_space_aa=1 [shader_globals] diff --git a/scenes/HUBWORLD.tscn b/scenes/HUBWORLD.tscn index 700d58b..35f36c9 100644 --- a/scenes/HUBWORLD.tscn +++ b/scenes/HUBWORLD.tscn @@ -171,18 +171,18 @@ size = Vector3(18.9743, 2.36012, 19.9824) transform = Transform3D(1, 0.000164476, 0.000583754, -0.000165075, 0.999999, 0.00104027, -0.000583585, -0.00104036, 0.999999, 0.818877, 1.17009, 3.09268) [node name="EnemyWorkingScene" parent="." instance=ExtResource("5_alya6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.0764, -57.3609, -5.67549) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.3745, -57.3609, -4.76346) scene_path = "res://scenes/enemy_working_scene.tscn" scene_name = "Enemy Working Scene" level_gamemode = ExtResource("6_t16kj") hub_portal = true [node name="Blockout2" parent="." instance=ExtResource("5_alya6")] -transform = Transform3D(0.00439817, 0, 0.99999, 0, 1, 0, -0.99999, 0, 0.00439817, -17.949, -57.3609, -2.74808) +transform = Transform3D(0.00439817, 0, 0.99999, 0, 1, 0, -0.99999, 0, 0.00439817, -18.9232, -57.3609, -0.308022) hub_portal = true [node name="Gulag of Money" parent="." instance=ExtResource("5_alya6")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.602371, -57.3609, 24.0114) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.869051, -57.3609, 22.9677) scene_path = "res://scenes/Arena of Money.tscn" scene_name = "The Gulag" level_gamemode = ExtResource("6_pf4wj") diff --git a/scenes/enemy_working_scene_ASYNCTEST.tscn b/scenes/enemy_working_scene_ASYNCTEST.tscn index 03f26d0..decf933 100644 --- a/scenes/enemy_working_scene_ASYNCTEST.tscn +++ b/scenes/enemy_working_scene_ASYNCTEST.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=26 format=3 uid="uid://cc35ndioyc20v"] +[gd_scene load_steps=19 format=3 uid="uid://cc35ndioyc20v"] [ext_resource type="PackedScene" uid="uid://cwy8iv8nlwqrc" path="res://assets/realtime_day_night_cycle.tscn" id="3_38kne"] [ext_resource type="Script" uid="uid://12l74jckdnpl" path="res://scripts/room_manager.gd" id="5_i3n20"] [ext_resource type="PackedScene" uid="uid://djr7vnr1hcx82" path="res://assets/spider2.tscn" id="6_j0dwy"] -[ext_resource type="Script" uid="uid://bw1uh8yc13tjy" path="res://scripts/switch_door.gd" id="7_2o44g"] [ext_resource type="Script" uid="uid://dv1oc7x3gwtes" path="res://scripts/room_check.gd" id="8_d3g4j"] [ext_resource type="Material" uid="uid://br2pyyyl2n3cx" path="res://assets/materials/prototype/prototype1.tres" id="9_gs0bi"] [ext_resource type="Material" uid="uid://bjryln3so1lgw" path="res://assets/materials/prototype/prototype_green.tres" id="10_sfyjt"] @@ -15,50 +14,9 @@ [ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="16_dsika"] [ext_resource type="PackedScene" uid="uid://bessq6hl7qsh8" path="res://assets/stats.tscn" id="17_sj72j"] [ext_resource type="PackedScene" uid="uid://hp4xn8oqdxnd" path="res://assets/machete_pickup.tscn" id="18_goxwj"] -[ext_resource type="Material" uid="uid://b6hhomp4kcjvb" path="res://assets/materials/prototype/tadaoando.tres" id="19_6g6g0"] [ext_resource type="PackedScene" uid="uid://dgapcuvg0gtmm" path="res://assets/scene_changer.tscn" id="20_2rc8f"] [ext_resource type="PackedScene" uid="uid://db7xqf12sayj0" path="res://assets/chest_spawner.tscn" id="21_8d2no"] -[sub_resource type="Animation" id="Animation_3e03q"] -length = 0.001 -tracks/0/type = "position_3d" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Door") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = PackedFloat32Array(0, 1, 26.3852, 31.9616, -34.5929) - -[sub_resource type="Animation" id="Animation_haspb"] -resource_name = "close" -tracks/0/type = "position_3d" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Door") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/keys = PackedFloat32Array(0, 1, 26.3852, 31.9616, -40.6238, 1, 1, 26.3852, 31.9616, -34.5929) - -[sub_resource type="Animation" id="Animation_pkxro"] -resource_name = "open" -tracks/0/type = "position_3d" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Door") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/keys = PackedFloat32Array(0, 1, 26.3852, 31.9616, -34.5929, 1, 1, 26.3852, 31.9616, -40.6238) - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_s1qpx"] -_data = { -&"RESET": SubResource("Animation_3e03q"), -&"close": SubResource("Animation_haspb"), -&"open": SubResource("Animation_pkxro") -} - -[sub_resource type="BoxShape3D" id="BoxShape3D_oood3"] -size = Vector3(19.709, 15.8262, 9.0301) - [sub_resource type="NavigationMesh" id="NavigationMesh_8aw3d"] vertices = PackedVector3Array(-24.6969, -4.637, -268.188, -24.6969, -4.637, -219.188, 24.5531, -4.637, -219.188, 24.5531, -4.637, -268.188, -24.6969, -30.137, -227.688, -24.6969, -30.137, -178.438, 24.5531, -30.137, -178.438, 24.5531, -30.137, -227.688, -24.6969, -71.387, -164.688, -24.6969, -71.387, -115.438, 24.5531, -71.387, -115.438, 24.5531, -71.387, -164.688, -24.6969, -71.387, -96.188, -24.6969, -71.387, -46.938, 24.5531, -71.387, -46.938, 24.5531, -71.387, -96.188, -13.1969, 0.112999, -35.938, -12.1969, 0.112999, -36.438, -12.1969, 0.112999, -41.688, -13.4469, 0.112999, -34.688, -19.4469, 0.112999, -28.188, -18.4469, 0.112999, -28.438, -37.1969, 0.112999, -41.688, -37.1969, 0.112999, -28.188, -10.9469, 0.112999, -35.938, 7.05309, 0.112999, -32.688, 8.30309, 0.112999, -33.688, 8.30309, 0.112999, -41.688, -3.19691, 0.112999, -29.438, 7.80309, 0.112999, -30.938, 7.05309, 0.112999, -31.688, 36.3031, 0.112999, -25.188, 36.5531, 0.112999, -24.188, 37.0531, 0.112999, -24.188, 37.0531, 0.112999, -41.688, 19.3031, 0.112999, -25.188, -10.9469, 0.112999, -23.188, -6.69691, 0.112999, -28.688, -6.69691, 0.112999, -29.438, -11.6969, 0.112999, -22.938, -7.44691, 4.863, -28.188, -6.69691, 4.863, -28.688, -6.94691, 4.863, -29.688, -10.1969, 4.863, -24.438, -8.69691, 4.863, -23.938, -7.69691, 4.863, -25.188, -6.94691, 4.863, -26.188, -17.4469, 4.863, -27.438, -11.1969, 4.863, -22.938, -12.9469, 4.863, -34.188, -17.6969, 4.863, -28.188, -11.4469, 9.863, -23.188, -6.94691, 9.863, -28.938, -6.94691, 9.863, -29.688, -12.9469, 9.863, -34.188, -17.6969, 9.863, -28.188, -17.4469, 9.863, -27.438, -3.19691, 0.112999, -28.688, -4.94691, 0.112999, -27.438, -9.94691, 0.112999, -20.688, -8.19691, 0.112999, -17.438, 2.30309, 0.112999, -17.438, 2.55309, 0.112999, -16.938, 12.5531, 0.112999, -27.438, -6.69691, 11.113, -27.938, -6.69691, 11.113, -27.438, -5.94691, 11.113, -27.438, -5.94691, 11.113, -27.938, -4.44691, 11.363, -29.438, -6.19691, 11.363, -30.438, -5.69691, 11.113, -28.938, -4.44691, 11.363, -28.938, -28.9469, 0.112999, -14.188, -28.4469, 0.112999, -10.188, -28.4469, 0.112999, -16.188, -37.1969, 0.112999, -14.188, -26.1969, 0.112999, -16.188, -18.9469, 0.112999, -25.688, -19.9469, 0.112999, -26.438, -19.9469, 0.112999, -27.688, 28.3031, 0.112999, -22.938, 22.0531, 0.112999, -22.938, 22.0531, 0.112999, -22.188, 26.8031, 0.112999, -16.438, 28.5531, 0.112999, -16.688, 21.3031, 0.112999, -21.438, 20.0531, 0.112999, -21.438, 26.8031, 0.112999, -8.68799, 2.55309, 0.112999, -8.93799, -7.69691, 11.113, -26.688, -7.69691, 11.113, -26.188, -7.19691, 11.113, -26.438, -7.19691, 11.113, -26.938, -8.44691, 11.113, -25.688, -8.44691, 11.113, -25.188, -7.94691, 11.113, -25.438, -7.94691, 11.113, -25.938, -10.4469, 0.112999, -19.938, -8.69691, 0.112999, -17.188, -8.69691, 0.112999, -8.68799, -11.6969, 0.112999, -19.938, -26.4469, 0.112999, -8.43799, -9.44691, 11.113, -24.438, -9.44691, 11.113, -23.938, -8.94691, 11.113, -24.188, -8.94691, 11.113, -24.688, 18.8031, 5.613, -24.188, 20.5531, 5.613, -22.438, 20.8031, 5.613, -23.938, 35.5531, 5.613, -23.938, 36.3031, 0.112999, -22.938, 37.0531, 0.112999, -16.688, -11.1969, 11.363, -21.938, -12.1969, 11.363, -21.938, -10.9469, 11.363, -20.938, -10.4469, 11.113, -22.188, -9.44691, 11.113, -22.938, -9.69691, 11.113, -23.938, -43.1969, 50.863, -17.188, -43.1969, 50.863, -8.68799, -33.9469, 50.863, -8.68799, -33.9469, 50.863, -17.188, -7.69691, 20.613, -16.438, -7.69691, 20.613, -7.93799, 1.55309, 20.613, -7.93799, 1.55309, 20.613, -16.438, -7.44691, 0.112999, -16.188, -7.44691, 0.112999, -8.18799, 1.30309, 0.112999, -8.18799, 1.30309, 0.112999, -16.188, 27.8031, 20.613, -15.688, 27.8031, 20.613, -7.43799, 37.0531, 20.613, -7.43799, 37.0531, 20.613, -15.688, 28.0531, 0.112999, -15.438, 28.0531, 0.112999, -7.68799, 36.8031, 0.112999, -7.68799, 36.8031, 0.112999, -15.438, -38.9469, 20.613, -13.188, -38.9469, 20.613, -8.93799, -34.1969, 20.613, -8.93799, -34.1969, 20.613, -13.188, -33.1969, 20.613, -7.68799, -38.9469, 20.613, -7.68799, -38.9469, 20.613, -4.68799, -29.6969, 20.613, -4.68799, -29.6969, 20.613, -13.188, -32.9469, 20.613, -13.188, -37.1969, 0.112999, -12.938, -37.1969, 0.112999, -4.93799, -29.9469, 0.112999, -4.93799, -29.9469, 0.112999, -12.938, -30.6969, 16.613, -11.188, -30.6969, 16.613, -10.188, -29.9469, 16.613, -10.188, -29.9469, 16.613, -11.188, -28.6969, 16.613, -11.188, -28.6969, 16.613, -10.188, -8.69691, 16.613, -10.188, -8.69691, 16.613, -11.188, -7.44691, 16.613, -11.188, -7.44691, 16.613, -10.188, 1.30309, 16.613, -10.188, 1.30309, 16.613, -11.188, 2.55309, 16.613, -11.188, 2.55309, 16.613, -10.188, 26.8031, 16.613, -10.188, 26.8031, 16.613, -11.188, 28.0531, 16.613, -11.188, 28.0531, 16.613, -10.188, 29.5531, 16.613, -10.188, 29.5531, 16.613, -11.188, -35.9469, 48.363, -9.68799, -35.9469, 48.363, -8.93799, -34.1969, 48.363, -8.93799, -34.1969, 48.363, -9.68799, -21.9469, 48.363, -9.68799, -32.9469, 48.363, -9.68799, -33.1969, 48.363, -7.68799, -23.9469, 48.363, 34.062, -21.9469, 48.363, 34.062, -35.9469, 48.363, 35.562, -24.1969, 48.363, 35.812, -35.9469, 48.363, -7.68799, -37.6969, 37.613, -9.43799, -37.6969, 37.613, -8.93799, -36.9469, 37.613, -8.93799, -36.9469, 37.613, -9.43799, 2.55309, 0.112999, -7.18799, 2.05309, 0.112999, -6.93799, 2.80309, 0.112999, -5.68799, 27.0531, 0.112999, -6.43799, 28.0531, 0.112999, -0.937988, 30.0531, 0.112999, -0.937988, 30.0531, 0.112999, -6.43799, 27.8031, 0.112999, -0.437988, -29.6969, 0.112999, 26.062, -18.6969, 0.112999, 26.062, -18.4469, 0.112999, 25.312, -29.6969, 0.112999, 17.062, -27.1969, 0.112999, 4.81201, -28.6969, 0.112999, 4.56201, -26.6969, 0.112999, 3.56201, -8.19691, 0.112999, 25.312, -7.94691, 0.112999, -6.93799, -8.69691, 0.112999, -7.18799, -37.6969, 37.613, -7.68799, -37.6969, 37.613, 19.562, -36.9469, 37.613, 19.562, -36.9469, 37.613, -7.68799, -7.44691, 0.112999, 30.562, 0.0530853, 0.112999, 30.562, 0.303085, 0.112999, 28.312, -7.44691, 0.112999, 25.562, 2.80309, 0.112999, 28.312, 37.0531, 0.112999, -0.937988, 37.0531, 0.112999, -6.43799, 27.8031, 0.112999, 9.06201, 10.8031, 0.112999, 28.312, -29.1969, 0.112999, 4.06201, -28.9469, 0.112999, -3.68799, -37.1969, 0.112999, -3.68799, -37.1969, 0.112999, 4.06201, 28.8031, 20.613, 0.0620117, 28.8031, 20.613, 8.56201, 38.0531, 20.613, 8.56201, 38.0531, 20.613, 0.0620117, 29.0531, 0.112999, 0.312012, 29.0531, 0.112999, 8.31201, 37.0531, 0.112999, 8.31201, 37.0531, 0.112999, 0.312012, -37.1969, 0.112999, 16.562, -29.9469, 0.112999, 16.562, 28.0531, 0.112999, 9.56201, 11.3031, 0.112999, 28.562, 11.3031, 0.112999, 37.062, 37.0531, 0.112999, 37.062, 37.0531, 0.112999, 9.56201, -41.1969, 12.363, 16.812, -39.4469, 12.363, 16.562, -43.4469, 12.363, 14.562, -43.9469, 12.363, 15.312, -33.1969, 20.613, 19.562, -32.9469, 20.613, 26.062, -30.6969, 20.613, 26.062, -30.6969, 20.613, 17.562, -39.9469, 20.613, 17.562, -39.9469, 20.613, 19.562, -32.6969, 12.363, 20.562, -30.9469, 12.363, 21.062, -30.9469, 12.363, 20.062, -33.1969, 12.363, 19.562, -36.1969, 12.363, 17.812, -38.1969, 12.363, 17.812, -34.9469, 12.363, 19.562, -37.1969, 0.112999, 17.812, -37.1969, 0.112999, 19.562, -32.9469, 0.112999, 19.812, -30.9469, 0.112999, 17.812, -32.9469, 0.112999, 25.812, -30.9469, 0.112999, 25.812, -43.1969, 43.613, 20.562, -43.1969, 43.613, 29.062, -33.9469, 43.613, 29.062, -33.9469, 43.613, 20.562, -39.9469, 20.613, 20.812, -39.9469, 20.613, 26.062, -34.1969, 20.613, 26.062, -34.1969, 20.613, 20.812, -37.6969, 37.613, 20.812, -37.6969, 37.613, 28.812, -36.9469, 37.613, 28.812, -36.9469, 37.613, 20.812, -37.1969, 0.112999, 20.812, -37.1969, 0.112999, 25.812, -34.1969, 0.112999, 25.812, -34.1969, 0.112999, 20.812, -29.6969, 12.363, 21.812, -18.6969, 12.363, 26.562, -18.6969, 12.363, 25.562, -29.6969, 12.363, 20.812, -16.4469, 0.112999, 37.062, -16.4469, 0.112999, 35.562, -18.6969, 0.112999, 35.312, -29.9469, 0.112999, 27.062, -32.9469, 0.112999, 27.062, -33.1969, 0.112999, 30.062, -37.1969, 0.112999, 30.062, -37.1969, 0.112999, 37.062, -17.6969, 20.613, 34.562, -16.1969, 20.613, 34.562, -15.9469, 20.613, 27.812, -17.6969, 20.613, 26.312, -8.44691, 20.613, 27.812, -8.44691, 20.613, 26.312, -17.4469, 0.112999, 26.562, -17.4469, 0.112999, 34.312, -8.69691, 0.112999, 34.312, -8.69691, 0.112999, 26.562, -16.1969, 12.363, 27.812, -14.1969, 12.363, 27.812, -15.6969, 12.363, 26.812, -17.4469, 12.363, 26.562, -17.4469, 12.363, 27.312, -37.1969, 0.112999, 27.062, -37.1969, 0.112999, 28.812, -34.1969, 0.112999, 28.812, -34.1969, 0.112999, 27.062, -15.1969, 50.863, 37.312, -13.1969, 50.863, 37.312, -12.9469, 50.863, 31.312, -15.1969, 50.863, 28.812, -5.94691, 50.863, 31.312, -5.94691, 50.863, 28.812, -14.9469, 20.613, 34.562, -13.1969, 20.613, 34.562, -12.9469, 20.613, 31.312, -14.9469, 20.613, 29.062, -8.44691, 20.613, 31.312, -8.44691, 20.613, 29.062, -8.69691, 12.363, 31.062, -8.69691, 12.363, 30.062, -9.44691, 12.363, 29.562, -12.9469, 12.363, 29.062, 1.05309, 20.613, 29.312, 1.05309, 20.613, 31.312, 10.3031, 20.613, 31.312, 10.3031, 20.613, 29.312, 1.30309, 0.112999, 29.562, 1.30309, 0.112999, 37.062, 10.0531, 0.112999, 37.062, 10.0531, 0.112999, 29.562, -7.69691, 0.112999, 35.562, 0.0530853, 0.112999, 37.062, -7.44691, 12.363, 30.562, -7.44691, 12.363, 31.312, -6.19691, 12.363, 31.312, -12.1969, 72.613, 32.312, -12.1969, 72.613, 40.812, 16.8031, 72.613, 40.812, 16.8031, 72.613, 32.312, -11.9469, 20.613, 32.562, -11.9469, 20.613, 34.562, -8.44691, 20.613, 34.562, -8.44691, 20.613, 32.562, -11.9469, 50.863, 32.562, -11.9469, 50.863, 37.312, -5.94691, 50.863, 37.312, -5.94691, 50.863, 32.562, 0.0530853, 12.363, 34.812, 0.0530853, 12.363, 33.812, -0.446915, 12.363, 33.562, -2.69691, 12.363, 32.562, -4.94691, 12.363, 32.562, 1.05309, 20.613, 32.562, 1.05309, 20.613, 37.812, 10.3031, 20.613, 37.812, 10.3031, 20.613, 32.562, 1.30309, 12.363, 34.562, 1.30309, 12.363, 35.562, 2.30309, 12.363, 36.062, 5.80309, 12.363, 37.562, 8.05309, 12.363, 37.562, -10.9469, 49.613, 43.312, -10.9469, 49.613, 41.812, -13.1969, 49.613, 41.562, -23.1969, 49.613, 43.312, -13.1969, 49.613, 38.312, -16.1969, 49.613, 38.062, -16.1969, 49.613, 35.062, -23.1969, 49.613, 35.062, -5.19691, 49.613, 38.312, -11.9469, 49.613, 38.312, -11.9469, 49.613, 40.562, 16.5531, 49.613, 40.562, 16.5531, 49.613, 35.062, -4.94691, 49.613, 35.062, 20.0531, 49.613, 35.062, 17.8031, 49.613, 35.062, 17.5531, 49.613, 41.812, 20.0531, 49.613, 43.312, -35.9469, 48.363, 43.312, -24.1969, 48.363, 43.312, 9.05309, 12.363, 38.812, 11.3031, 12.363, 39.812, 11.3031, 12.363, 38.812) polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1), PackedInt32Array(7, 6, 4), PackedInt32Array(4, 6, 5), PackedInt32Array(11, 10, 8), PackedInt32Array(8, 10, 9), PackedInt32Array(15, 14, 12), PackedInt32Array(12, 14, 13), PackedInt32Array(16, 18, 17), PackedInt32Array(19, 18, 16), PackedInt32Array(21, 20, 19), PackedInt32Array(19, 20, 18), PackedInt32Array(18, 20, 23), PackedInt32Array(18, 23, 22), PackedInt32Array(24, 17, 18), PackedInt32Array(26, 25, 27), PackedInt32Array(27, 25, 28), PackedInt32Array(27, 28, 24), PackedInt32Array(27, 24, 18), PackedInt32Array(28, 30, 29), PackedInt32Array(25, 30, 28), PackedInt32Array(32, 31, 33), PackedInt32Array(33, 31, 34), PackedInt32Array(26, 27, 35), PackedInt32Array(35, 27, 31), PackedInt32Array(31, 27, 34), PackedInt32Array(37, 36, 38), PackedInt32Array(38, 36, 39), PackedInt32Array(38, 39, 19), PackedInt32Array(19, 39, 21), PackedInt32Array(42, 41, 40), PackedInt32Array(45, 44, 46), PackedInt32Array(46, 44, 43), PackedInt32Array(46, 43, 40), PackedInt32Array(42, 40, 43), PackedInt32Array(43, 48, 42), PackedInt32Array(42, 48, 47), PackedInt32Array(42, 47, 50), PackedInt32Array(42, 50, 49), PackedInt32Array(52, 51, 53), PackedInt32Array(53, 51, 56), PackedInt32Array(53, 56, 55), PackedInt32Array(53, 55, 54), PackedInt32Array(58, 57, 59), PackedInt32Array(59, 57, 60), PackedInt32Array(60, 57, 61), PackedInt32Array(28, 29, 57), PackedInt32Array(57, 29, 63), PackedInt32Array(57, 63, 61), PackedInt32Array(61, 63, 62), PackedInt32Array(67, 66, 64), PackedInt32Array(64, 66, 65), PackedInt32Array(71, 70, 68), PackedInt32Array(68, 70, 69), PackedInt32Array(64, 70, 67), PackedInt32Array(67, 70, 71), PackedInt32Array(74, 73, 72), PackedInt32Array(74, 72, 75), PackedInt32Array(78, 77, 76), PackedInt32Array(78, 76, 79), PackedInt32Array(79, 76, 74), PackedInt32Array(23, 20, 79), PackedInt32Array(75, 23, 74), PackedInt32Array(74, 23, 79), PackedInt32Array(82, 81, 80), PackedInt32Array(82, 80, 85), PackedInt32Array(85, 80, 83), PackedInt32Array(83, 80, 84), PackedInt32Array(85, 83, 86), PackedInt32Array(86, 83, 87), PackedInt32Array(63, 86, 62), PackedInt32Array(62, 86, 88), PackedInt32Array(88, 86, 87), PackedInt32Array(92, 91, 89), PackedInt32Array(89, 91, 90), PackedInt32Array(96, 95, 93), PackedInt32Array(93, 95, 94), PackedInt32Array(98, 97, 60), PackedInt32Array(60, 97, 59), PackedInt32Array(98, 99, 100), PackedInt32Array(100, 99, 77), PackedInt32Array(77, 99, 76), PackedInt32Array(76, 99, 101), PackedInt32Array(100, 97, 98), PackedInt32Array(105, 104, 102), PackedInt32Array(102, 104, 103), PackedInt32Array(108, 107, 106), PackedInt32Array(109, 108, 106), PackedInt32Array(32, 33, 110), PackedInt32Array(110, 33, 111), PackedInt32Array(80, 110, 84), PackedInt32Array(84, 110, 111), PackedInt32Array(114, 113, 112), PackedInt32Array(115, 114, 112), PackedInt32Array(115, 112, 116), PackedInt32Array(116, 112, 117), PackedInt32Array(121, 120, 118), PackedInt32Array(118, 120, 119), PackedInt32Array(125, 124, 122), PackedInt32Array(122, 124, 123), PackedInt32Array(129, 128, 126), PackedInt32Array(126, 128, 127), PackedInt32Array(133, 132, 130), PackedInt32Array(130, 132, 131), PackedInt32Array(137, 136, 134), PackedInt32Array(134, 136, 135), PackedInt32Array(141, 140, 138), PackedInt32Array(138, 140, 139), PackedInt32Array(143, 142, 144), PackedInt32Array(144, 142, 145), PackedInt32Array(147, 146, 142), PackedInt32Array(142, 146, 145), PackedInt32Array(151, 150, 148), PackedInt32Array(148, 150, 149), PackedInt32Array(155, 154, 152), PackedInt32Array(152, 154, 153), PackedInt32Array(159, 158, 156), PackedInt32Array(156, 158, 157), PackedInt32Array(163, 162, 160), PackedInt32Array(160, 162, 161), PackedInt32Array(167, 166, 164), PackedInt32Array(164, 166, 165), PackedInt32Array(171, 170, 168), PackedInt32Array(168, 170, 169), PackedInt32Array(175, 174, 172), PackedInt32Array(172, 174, 173), PackedInt32Array(177, 176, 178), PackedInt32Array(178, 176, 179), PackedInt32Array(179, 176, 180), PackedInt32Array(182, 181, 179), PackedInt32Array(179, 181, 178), PackedInt32Array(178, 181, 183), PackedInt32Array(187, 186, 184), PackedInt32Array(184, 186, 185), PackedInt32Array(190, 189, 188), PackedInt32Array(188, 88, 190), PackedInt32Array(190, 88, 87), PackedInt32Array(190, 87, 191), PackedInt32Array(193, 192, 194), PackedInt32Array(194, 192, 191), PackedInt32Array(192, 195, 191), PackedInt32Array(191, 195, 190), PackedInt32Array(197, 196, 198), PackedInt32Array(198, 196, 199), PackedInt32Array(199, 201, 200), PackedInt32Array(200, 202, 199), PackedInt32Array(199, 202, 198), PackedInt32Array(198, 202, 203), PackedInt32Array(203, 202, 204), PackedInt32Array(205, 204, 101), PackedInt32Array(101, 204, 202), PackedInt32Array(101, 99, 205), PackedInt32Array(209, 208, 206), PackedInt32Array(206, 208, 207), PackedInt32Array(211, 210, 212), PackedInt32Array(212, 210, 213), PackedInt32Array(189, 190, 204), PackedInt32Array(204, 190, 203), PackedInt32Array(203, 190, 213), PackedInt32Array(213, 190, 214), PackedInt32Array(214, 212, 213), PackedInt32Array(194, 216, 193), PackedInt32Array(193, 216, 215), PackedInt32Array(195, 217, 190), PackedInt32Array(190, 217, 218), PackedInt32Array(190, 218, 214), PackedInt32Array(222, 221, 219), PackedInt32Array(219, 221, 220), PackedInt32Array(226, 225, 223), PackedInt32Array(223, 225, 224), PackedInt32Array(230, 229, 227), PackedInt32Array(227, 229, 228), PackedInt32Array(219, 201, 222), PackedInt32Array(222, 201, 232), PackedInt32Array(222, 232, 231), PackedInt32Array(201, 199, 232), PackedInt32Array(234, 218, 233), PackedInt32Array(233, 218, 217), PackedInt32Array(235, 234, 236), PackedInt32Array(236, 234, 233), PackedInt32Array(236, 233, 237), PackedInt32Array(241, 240, 238), PackedInt32Array(238, 240, 239), PackedInt32Array(243, 242, 244), PackedInt32Array(244, 242, 245), PackedInt32Array(247, 246, 242), PackedInt32Array(242, 246, 245), PackedInt32Array(249, 248, 250), PackedInt32Array(250, 248, 251), PackedInt32Array(251, 254, 252), PackedInt32Array(252, 254, 253), PackedInt32Array(252, 250, 251), PackedInt32Array(256, 255, 257), PackedInt32Array(257, 255, 258), PackedInt32Array(259, 257, 260), PackedInt32Array(260, 257, 258), PackedInt32Array(264, 263, 261), PackedInt32Array(261, 263, 262), PackedInt32Array(268, 267, 265), PackedInt32Array(265, 267, 266), PackedInt32Array(272, 271, 269), PackedInt32Array(269, 271, 270), PackedInt32Array(276, 275, 273), PackedInt32Array(273, 275, 274), PackedInt32Array(280, 279, 277), PackedInt32Array(277, 279, 278), PackedInt32Array(283, 282, 281), PackedInt32Array(286, 285, 284), PackedInt32Array(288, 287, 286), PackedInt32Array(196, 197, 284), PackedInt32Array(284, 197, 283), PackedInt32Array(286, 284, 288), PackedInt32Array(288, 284, 283), PackedInt32Array(288, 283, 281), PackedInt32Array(290, 289, 291), PackedInt32Array(291, 289, 292), PackedInt32Array(293, 291, 294), PackedInt32Array(294, 291, 292), PackedInt32Array(298, 297, 295), PackedInt32Array(295, 297, 296), PackedInt32Array(303, 302, 299), PackedInt32Array(299, 302, 301), PackedInt32Array(299, 301, 300), PackedInt32Array(307, 306, 304), PackedInt32Array(304, 306, 305), PackedInt32Array(309, 308, 310), PackedInt32Array(310, 308, 311), PackedInt32Array(312, 310, 313), PackedInt32Array(313, 310, 311), PackedInt32Array(315, 314, 316), PackedInt32Array(316, 314, 317), PackedInt32Array(318, 316, 319), PackedInt32Array(319, 316, 317), PackedInt32Array(321, 320, 322), PackedInt32Array(322, 320, 323), PackedInt32Array(327, 326, 324), PackedInt32Array(324, 326, 325), PackedInt32Array(331, 330, 328), PackedInt32Array(328, 330, 329), PackedInt32Array(282, 332, 281), PackedInt32Array(281, 332, 333), PackedInt32Array(210, 211, 332), PackedInt32Array(332, 211, 333), PackedInt32Array(336, 335, 334), PackedInt32Array(340, 339, 337), PackedInt32Array(337, 339, 338), PackedInt32Array(344, 343, 341), PackedInt32Array(341, 343, 342), PackedInt32Array(348, 347, 345), PackedInt32Array(345, 347, 346), PackedInt32Array(350, 349, 351), PackedInt32Array(351, 349, 352), PackedInt32Array(352, 349, 353), PackedInt32Array(357, 356, 354), PackedInt32Array(354, 356, 355), PackedInt32Array(359, 358, 360), PackedInt32Array(360, 358, 361), PackedInt32Array(361, 358, 362), PackedInt32Array(364, 363, 365), PackedInt32Array(365, 363, 366), PackedInt32Array(368, 367, 365), PackedInt32Array(370, 369, 368), PackedInt32Array(365, 366, 368), PackedInt32Array(368, 366, 370), PackedInt32Array(372, 371, 373), PackedInt32Array(373, 371, 374), PackedInt32Array(376, 375, 371), PackedInt32Array(371, 375, 374), PackedInt32Array(378, 377, 379), PackedInt32Array(379, 377, 380), PackedInt32Array(364, 379, 363), PackedInt32Array(363, 379, 380), PackedInt32Array(382, 381, 182), PackedInt32Array(182, 381, 181), PackedInt32Array(385, 384, 383)] @@ -67,12 +25,13 @@ polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1), PackedInt32Arr albedo_color = Color(0.300579, 0.462784, 0.249767, 1) [node name="EnemyWork" type="Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.7334, 0, 0.541018) [node name="Realtime Day Night Cycle" parent="." instance=ExtResource("3_38kne")] -transform = Transform3D(-0.582719, 0, -0.812674, 0, 1, 0, 0.812674, 0, -0.582719, -26.5361, -458.963, 32.6209) +transform = Transform3D(-0.582719, 0, -0.812674, 0, 1, 0, 0.812674, 0, -0.582719, -9.5575, -269.75, 32.0499) [node name="Level" type="Node3D" parent="." groups=["enemy_hivemind"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.5361, -458.963, 32.6209) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.5575, -269.75, 32.0499) script = ExtResource("5_i3n20") room_lockdown = true number_of_drops = 30 @@ -155,32 +114,14 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28.322, 48.4515, 21.6052) [node name="spider18" parent="Level" instance=ExtResource("6_j0dwy")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.8747, 48.4515, 14.3065) -[node name="Door" type="CSGBox3D" parent="Level" node_paths=PackedStringArray("anim_player")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.3852, 31.9616, -34.5929) -use_collision = true -size = Vector3(16.8439, 1, 8.61108) -script = ExtResource("7_2o44g") -anim_player = NodePath("AnimationPlayer") -door_open_start = true - -[node name="AnimationPlayer" type="AnimationPlayer" parent="Level/Door"] -root_node = NodePath("../..") -libraries = { -&"": SubResource("AnimationLibrary_s1qpx") -} - [node name="RoomCheck" type="Area3D" parent="Level"] collision_layer = 2 collision_mask = 2 script = ExtResource("8_d3g4j") one_way = true -[node name="CollisionShape3D" type="CollisionShape3D" parent="Level/RoomCheck"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.9144, 29.7998, -34.0515) -shape = SubResource("BoxShape3D_oood3") - [node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.5361, -458.963, 32.6209) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.5575, -269.75, 32.0499) navigation_mesh = SubResource("NavigationMesh_8aw3d") [node name="CSGBox3D" type="CSGBox3D" parent="NavigationRegion3D"] @@ -405,92 +346,68 @@ size = Vector3(1, 7.98377, 3.19559) material = ExtResource("9_gs0bi") [node name="CSGBox3D" type="CSGBox3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.5361, -455.333, 32.6209) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.5575, -266.12, 32.0499) use_collision = true [node name="vendingmachine" parent="." instance=ExtResource("11_b2hh7")] -transform = Transform3D(0.813009, 0, -0.582251, 0, 1, 0, 0.582251, 0, 0.813009, -38.8393, -459.133, -1.79586) +transform = Transform3D(0.813009, 0, -0.582251, 0, 1, 0, 0.582251, 0, 0.813009, -21.8607, -269.92, -2.36685) [node name="Water Tower" parent="." instance=ExtResource("12_j6njk")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.15087, -459.133, 58.5932) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.1295, -269.92, 58.0222) [node name="LadderCollisionCheck" parent="." instance=ExtResource("13_xddwn")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -39.2548, -459.464, -4.73396) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.2762, -270.251, -5.30495) [node name="Ladder" parent="." instance=ExtResource("14_cd23o")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -39.2606, -459.133, -3.40816) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.282, -269.92, -3.97915) [node name="PostProcessing" parent="." instance=ExtResource("15_n66pm")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.5361, -458.963, 32.6209) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.5575, -269.75, 32.0499) [node name="JumpPlatform" parent="." instance=ExtResource("16_dsika")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -43.5298, -459.133, 56.5538) +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -26.5512, -269.92, 55.9828) jump_amount = 15 [node name="JumpPlatform2" parent="." instance=ExtResource("16_dsika")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -43.5954, -438.871, 60.2349) +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -26.6168, -249.658, 59.6639) [node name="Stats" parent="." instance=ExtResource("17_sj72j")] -transform = Transform3D(-0.98212, 0, 0.188255, 0, 1, 0, -0.188255, 0, -0.98212, -4.53633, -457.499, 6.65524) +transform = Transform3D(-0.98212, 0, 0.188255, 0, 1, 0, -0.188255, 0, -0.98212, 12.4423, -268.286, 6.08425) [node name="machete_pickup" parent="." instance=ExtResource("18_goxwj")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.02743, -458.635, 2.69704) - -[node name="CSGBox3D2" type="CSGBox3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.67417, -48.0559, -6.45306) -material_override = ExtResource("19_6g6g0") -use_collision = true -size = Vector3(21.6041, 760.743, 6.07715) - -[node name="CSGBox3D3" type="CSGBox3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.62847, -52.3069, 5.05654) -material_override = ExtResource("19_6g6g0") -use_collision = true -size = Vector3(21.6041, 769.246, 6.07715) - -[node name="CSGBox3D4" type="CSGBox3D" parent="."] -transform = Transform3D(0.00661471, 0, -0.999978, 0, 1, 0, 0.999978, 0, 0.00661471, -9.42013, -56.2669, -3.61646) -material_override = ExtResource("19_6g6g0") -use_collision = true -size = Vector3(21.6041, 756.867, 6.07715) - -[node name="CSGBox3D5" type="CSGBox3D" parent="."] -transform = Transform3D(0.00661471, 0, -0.999978, 0, 1, 0, 0.999978, 0, 0.00661471, 9.16297, -53.2239, -0.450359) -material_override = ExtResource("19_6g6g0") -use_collision = true -size = Vector3(21.6041, 771.124, 6.07715) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.95117, -269.422, 2.12605) [node name="JumpPlatform3" parent="." instance=ExtResource("16_dsika")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0.696367, -459.133, 0.12764) +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 17.675, -269.92, -0.443348) jump_amount = 100 [node name="Scene Changer" parent="." instance=ExtResource("20_2rc8f")] -transform = Transform3D(15.1486, 0, 0, 0, 405.877, 0, 0, 0, 9.59561, 2.59967, 85.1501, -0.416958) +transform = Transform3D(15.1486, 0, 0, 0, 405.877, 0, 0, 0, 9.59561, 19.5783, 274.363, -0.987946) scene_path = "res://scenes/HUBWORLD.tscn" [node name="ChestSpawner" parent="." instance=ExtResource("21_8d2no")] -transform = Transform3D(-0.718236, 0, 0.6958, 0, 1, 0, -0.6958, 0, -0.718236, -62.8071, -438.099, 52.1711) +transform = Transform3D(-0.718236, 0, 0.6958, 0, 1, 0, -0.6958, 0, -0.718236, -45.8285, -248.886, 51.6001) [node name="ChestSpawner2" parent="." instance=ExtResource("21_8d2no")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -36.4103, -409.226, 74.4482) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.4317, -220.013, 73.8772) [node name="ChestSpawner3" parent="." instance=ExtResource("21_8d2no")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -54.8681, -410.188, 39.8077) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -37.8895, -220.975, 39.2367) [node name="ChestSpawner4" parent="." instance=ExtResource("21_8d2no")] -transform = Transform3D(-0.518087, 0, -0.855328, 0, 1, 0, 0.855328, 0, -0.518087, -37.53, -447.775, 7.36184) +transform = Transform3D(-0.518087, 0, -0.855328, 0, 1, 0, 0.855328, 0, -0.518087, -20.5514, -258.562, 6.79085) [node name="ChestSpawner5" parent="." instance=ExtResource("21_8d2no")] -transform = Transform3D(-0.999671, 0, -0.0256362, 0, 1, 0, 0.0256362, 0, -0.999671, -29.6835, -437.742, 19.2452) +transform = Transform3D(-0.999671, 0, -0.0256362, 0, 1, 0, 0.0256362, 0, -0.999671, -12.7049, -248.529, 18.6742) [node name="ChestSpawner6" parent="." instance=ExtResource("21_8d2no")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.01047, -432.047, 58.5853) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.9891, -242.834, 58.0143) [node name="ChestSpawner7" parent="." instance=ExtResource("21_8d2no")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.71877, -437.768, 38.9165) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.6974, -248.555, 38.3455) [node name="ChestSpawner8" parent="." instance=ExtResource("21_8d2no")] -transform = Transform3D(-0.379876, 0, -0.925037, 0, 1, 0, 0.925037, 0, -0.379876, -14.934, -385.736, 70.2497) +transform = Transform3D(-0.379876, 0, -0.925037, 0, 1, 0, 0.925037, 0, -0.379876, 2.0446, -196.523, 69.6787) [node name="ChestSpawner9" parent="." instance=ExtResource("21_8d2no")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -66.5504, -407.467, 20.0761) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -49.5718, -218.254, 19.5051) diff --git a/scripts/scene_changer.gd b/scripts/scene_changer.gd index f55620d..f0505b2 100644 --- a/scripts/scene_changer.gd +++ b/scripts/scene_changer.gd @@ -25,12 +25,11 @@ func _on_body_entered(body: Node3D) -> void: if body.is_in_group("player"): if active and timer_active: active = false + var scene = ENEMY_WORKING_SCENE_ASYNCTEST.instantiate() - scene.global_basis = global_basis + get_tree().current_scene.add_child(scene) scene.global_position = global_position - scene.rotation = rotation - scene.scale = Vector3.ONE - add_child(scene) + ##Let the Bounds detector know player is exiting #SignalBus.emit_signal("player_exiting_tree") # @@ -44,8 +43,8 @@ func _on_body_entered(body: Node3D) -> void: #SaveLoad.save_game_data(get_tree().current_scene.get_name()) #SaveLoad.save_user_data() #get_tree().change_scene_to_file(scene_path) - else: - body.velocity = -body.velocity * 1.1 + #else: + #body.velocity = -body.velocity * 1.1 func _on_start_activation_timeout() -> void: