From e637a76e78f3833becd6eff5b0901efad2784888 Mon Sep 17 00:00:00 2001 From: SyntaX Date: Tue, 28 Jan 2020 11:26:37 +0100 Subject: [PATCH 1/2] new nav paths for worker spawner --- Level/OutsideWorld.tscn | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Level/OutsideWorld.tscn b/Level/OutsideWorld.tscn index 00bf247..99386c6 100644 --- a/Level/OutsideWorld.tscn +++ b/Level/OutsideWorld.tscn @@ -62,15 +62,12 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.14131, 0, 101.825 ) [node name="Meldewesen2" parent="Enemies" instance=ExtResource( 3 )] transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 14.9623, 0, 52.3728 ) -_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") [node name="Meldewesen3" parent="Enemies" instance=ExtResource( 3 )] transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 70.7133, 0, 4.86107 ) -_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") [node name="Meldewesen4" parent="Enemies" instance=ExtResource( 3 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 56.7007, 0, 24.1842 ) -_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") [node name="MaskedAmbience" type="AudioStreamPlayer" parent="."] stream = ExtResource( 4 ) @@ -136,7 +133,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.127018, 0, 0.00287628 ) curve = SubResource( 3 ) [node name="PathFollow" type="PathFollow" parent="WorkerSpawner/Path"] -transform = Transform( 0.981009, 0.00261139, -0.193941, -0.00238476, 0.999996, 0.00140191, 0.193943, -0.000912789, 0.98101, -15.7672, 0.284373, -190.888 ) +transform = Transform( -0.945424, 0.00431223, 0.325809, 0.00502383, 0.999987, 0.00134273, -0.325798, 0.00290627, -0.945432, -15.7672, 0.284373, -190.888 ) offset = 380.29 [node name="Touchables" type="Spatial" parent="."] From f53784c746562cd2cfb57a80e9d3d7bc93a72e36 Mon Sep 17 00:00:00 2001 From: SyntaX Date: Tue, 28 Jan 2020 11:47:16 +0100 Subject: [PATCH 2/2] preload workers --- Level/OutsideWorld.tscn | 1 - Level/WorkerSpawner.gd | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Level/OutsideWorld.tscn b/Level/OutsideWorld.tscn index 7eed95c..af4e3a3 100644 --- a/Level/OutsideWorld.tscn +++ b/Level/OutsideWorld.tscn @@ -208,7 +208,6 @@ transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 12.95 transform = Transform( -6.15088e-008, 0, 1.40716, 0, 1.40716, 0, -1.40716, 0, -6.15088e-008, 72.1424, -0.0216179, 64.9277 ) [node name="BuildingBlocks" type="Spatial" parent="NavigationMeshInstance"] -visible = false [node name="BuildingBlock" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -13 ) diff --git a/Level/WorkerSpawner.gd b/Level/WorkerSpawner.gd index 3088741..a87be3a 100644 --- a/Level/WorkerSpawner.gd +++ b/Level/WorkerSpawner.gd @@ -6,12 +6,11 @@ export(float) var _offset const SPAWN_TIME_MIN = 5000 # min spawntime in ms const SPAWN_TIME_MAX = 8000 # max spawntime in ms -var _worker +var _worker = preload("res://Characters/Worker/Worker.tscn") var _lastSpawn = 0 # timestamp of last spawned worker var _path: Path func _ready(): - _worker = load("res://Characters/Worker/Worker.tscn") assert(null != _worker) _path = get_node(_nodepath)