From d5bbc66242052ff8696494a5817a1f22801f4cef Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Tue, 2 Sep 2025 23:14:07 -0600 Subject: [PATCH] Removed meet-spook --- levels/ghost_ship/ghost_ship_level.tscn | 94 +----------------- levels/meet_spook_test/debug_mob.tscn | 70 ------------- levels/meet_spook_test/meet_spook_test.tscn | 98 ------------------- levels/meet_spook_test/tween_debug.gd | 19 ---- levels/meet_spook_test/tween_debug.gd.uid | 1 - levels/pathing_test/pathing_test.tscn | 42 ++++---- .../meet_spook_slutch/meet_spook_slutch.gd | 12 --- .../meet_spook_slutch.gd.uid | 1 - .../meet_spook_slutch/meet_spook_slutch.tscn | 12 --- src/world/meet_spook/meet_spook.gd | 29 ------ src/world/meet_spook/meet_spook.gd.uid | 1 - src/world/meet_spook/meet_spook_mob.gd | 52 ---------- src/world/meet_spook/meet_spook_mob.gd.uid | 1 - src/world/meet_spook/meet_spook_spawner.gd | 34 ------- .../meet_spook/meet_spook_spawner.gd.uid | 1 - src/world/spook_manager/spook_manager.gd | 8 +- 16 files changed, 20 insertions(+), 455 deletions(-) delete mode 100644 levels/meet_spook_test/debug_mob.tscn delete mode 100644 levels/meet_spook_test/meet_spook_test.tscn delete mode 100644 levels/meet_spook_test/tween_debug.gd delete mode 100644 levels/meet_spook_test/tween_debug.gd.uid delete mode 100644 src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.gd delete mode 100644 src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.gd.uid delete mode 100644 src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.tscn delete mode 100644 src/world/meet_spook/meet_spook.gd delete mode 100644 src/world/meet_spook/meet_spook.gd.uid delete mode 100644 src/world/meet_spook/meet_spook_mob.gd delete mode 100644 src/world/meet_spook/meet_spook_mob.gd.uid delete mode 100644 src/world/meet_spook/meet_spook_spawner.gd delete mode 100644 src/world/meet_spook/meet_spook_spawner.gd.uid diff --git a/levels/ghost_ship/ghost_ship_level.tscn b/levels/ghost_ship/ghost_ship_level.tscn index 77d2c27..126910d 100644 --- a/levels/ghost_ship/ghost_ship_level.tscn +++ b/levels/ghost_ship/ghost_ship_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://crydi5cjgfwe5"] +[gd_scene load_steps=15 format=3 uid="uid://crydi5cjgfwe5"] [ext_resource type="PackedScene" uid="uid://oowut88kr2ox" path="res://levels/ghost_ship/player_ship/player_ship.tscn" id="1_2pyr1"] [ext_resource type="PackedScene" uid="uid://cwhmn3w8hoads" path="res://levels/ghost_ship/level/airlock/airlock.tscn" id="2_dxmep"] @@ -13,9 +13,6 @@ [ext_resource type="PackedScene" uid="uid://b6eg8t04rkh0c" path="res://src/props/wall_switch/wall_switch.tscn" id="17_0idgf"] [ext_resource type="PackedScene" uid="uid://cubwniraol1qn" path="res://src/props/bulkhead/bulkhead.tscn" id="35_f0xh4"] [ext_resource type="PackedScene" uid="uid://ctr56p23cvupu" path="res://src/props/retinal_scanner/retinal_scanner.tscn" id="41_u2hqf"] -[ext_resource type="Script" uid="uid://cvx514gdjd5ev" path="res://src/world/meet_spook/meet_spook.gd" id="49_dxmep"] -[ext_resource type="Script" uid="uid://cisuvlqvqfqgo" path="res://src/world/meet_spook/meet_spook_spawner.gd" id="52_4akax"] -[ext_resource type="PackedScene" uid="uid://cmmx0j4md4c5p" path="res://src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.tscn" id="56_vt4uw"] [sub_resource type="NavigationMesh" id="NavigationMesh_vt4uw"] vertices = PackedVector3Array(-3.5, -2.2, -90.25, -2, -2.2, -90.25, -1.75, -2.45, -90.75, -3.5, -2.7, -93.5, -3.5, -2.7, -91.3333, 0, -2.7, -96.5, -3.5, -2.7, -96.5, 3, -2.7, -89.5, 3.75, -2.7, -90, 3.75, -2.7, -93.25, -0.5, -2.7, -87.25, 3, -2.7, -87.25, -0.5, -2.7, -90.5, 3.75, -2.7, -96.5, -2.75, 0.299999, -96.5, -3.5, 0.299999, -96.5, -3.5, 0.299999, -95.5, -2.25, 0.299999, -95.75, 3, 0.299999, -86.25, 2.5, 0.299999, -88.5, 2.5, 0.299999, -85.5, 3, 0.299999, -84, -1, 0.299999, -95.5, 0, 0.299999, -95.75, -1.75, 0.299999, -81.5, -3.5, 0.299999, -80.25, 0, 0.299999, -80.5, 1.75, 0.299999, -81.5, 3.75, 0.299999, -80.25, 3.75, 0.299999, -81, 3, 0.299999, -81.5, 3.75, 0.299999, -96.5, 2.75, 0.299999, -96.5, 2.25, 0.299999, -95.75, 2.5, 0.299999, -94.75, 3.75, 0.299999, -94.25, 1.75, 0.299999, -95.5, 2.5, 0.299999, -82.25, -2.25, 0.299999, -82, -3.5, 0.299999, -82.75, -2, -1.45, -88.25, -3.5, -1.45, -87.75, 2.5, 0.299999, -91.75, 3.75, 0.299999, -89.25, 3.75, 0.299999, -91.75, -2, -0.700001, -86, -3.5, -0.450001, -85.25, 3.75, 0.299999, -86.75, -2.25, 0.0499992, -84, -3.5, -2.7, -80.5, -2, -2.7, -80.25, -1.5, -2.7, -81, -1, -2.7, -84.25, -3.5, -2.7, -84.25, 2.25, -2.7, -81, 3, -2.7, -81.75, 3, -2.7, -84.5, -0.5, -2.7, -84.75, 0.75, 0.299999, -77.75, 0.5, 0.299999, -78.5, -0.5, 0.299999, -78.5, -0.5, 0.299999, -75.75, 0.75, 0.299999, -74.75, -0.5, 0.299999, -59.25, -0.5, 0.299999, -56.5, 0.75, 0.299999, -56.75, 0.75, 0.299999, -59.75, 0.75, 0.299999, -62.75, 0.75, 0.299999, -65.75, -0.5, 0.299999, -64.75, -0.5, 0.299999, -62, -0.5, 0.299999, -73, 0.75, 0.299999, -71.75, -0.5, 0.299999, -67.25, -1.25, 0.299999, -66.5, -1, 0.299999, -65.25, -0.5, 0.299999, -70.25, 0.75, 0.299999, -68.75, -4.25, 0.299999, -66.5, -4, 0.299999, -65.25, -7, 0.299999, -66.5, -6.75, 0.299999, -65.25, -9.75, 0.299999, -66.5, -12.5, 0.299999, -66.5, -12.5, 0.299999, -65.25, -9.75, 0.299999, -65.25, -0.5, 0.299999, -53.5, 0.75, 0.299999, -53.75, -27.5, -2.7, -63, -26.25, -2.7, -62.75, -26.25, -2.7, -64.75, -27.5, -2.7, -64.75, -25, -2.7, -65.25, -25, -2.7, -69.5, -26, -2.7, -68.75, -28, -2.7, -65.25, -27.5, -2.7, -68.75, -28.5, -2.7, -71.5, -27.5, -2.7, -72.5, -30.5, -2.7, -72.5, -30.5, -2.7, -69, -30.5, -2.7, -65.25, -28.5, -2.7, -69.75, -18.5, -2.7, -64.75, -18.5, -2.7, -63, -17.25, -2.7, -63, -17.25, -2.7, -64.75, -17.25, -2.7, -68.25, -17.5, -2.7, -71, -17.75, -2.7, -72.5, -19, -2.7, -65.25, -16.75, -2.7, -65.25, -16.75, -2.7, -67.75, -22, -2.7, -65.25, -21.75, -2.7, -72.5, -25.75, -2.7, -72.5, -24.75, -2.7, -71.25, -14.25, -2.7, -65.25, -14.25, -2.7, -67.75, -17, -2.7, -71.75, -27.5, 0.299999, -64.75, -27.5, 0.299999, -63, -26.25, 0.299999, -63, -26.25, 0.299999, -64.75, -20, 0.299999, -66.5, -23.5, 0.299999, -66.5, -22.5, 0.299999, -65.25, -19, 0.299999, -65.25, -28, 0.299999, -65.25, -25.75, 0.299999, -65.25, -27, 0.299999, -66.5, -18.5, 0.299999, -64.75, -18.5, 0.299999, -62.75, -17.25, 0.299999, -63, -17.25, 0.299999, -64.75, -14.5, 0.299999, -65.5, -15.5, 0.299999, -67.25, -16.25, 0.299999, -66.5, -16.75, 0.299999, -65.25, -30.5, 0.299999, -66.5, -30.5, 0.299999, -65.5, -15.5, -2.7, -71.25, -14.25, -2.7, -72.5, -14.25, -0.200001, -68.75, -15.5, -0.200001, -68.5833, -14.3333, 0.299999, -67.6667, -14.25, -2.7, -71.25, -31, -23.7, -69.5, -34.5, -23.7, -69.5, -34.5, -23.7, -67.5, -34.5, -23.7, -37.5, -34.5, -23.7, -35.25, -31, -23.7, -35.25, -34.5, -23.7, -65.25, -34.5, -23.7, -39.75, -34.5, -23.7, -63.25, -34.5, -23.7, -42, -34.5, -23.7, -61, -34.5, -23.7, -44, -7.5, -23.95, -59.25, -6, -24.45, -59.25, -6.25, -24.45, -69.5, -10, -23.7, -69.5, -7.75, -23.7, -58, -20.5, -23.7, -69.5, -24, -23.7, -69.5, -27.5, -23.7, -69.5, -34.5, -23.7, -59, -27.25, -23.7, -35.25, -34.5, -23.7, -46.25, -13.5, -23.7, -69.5, -34.5, -23.7, -54.75, -34.5, -23.7, -52.5, -20, -23.7, -35.25, -16.5, -23.7, -35.25, -12.75, -23.7, -35.25, -34.5, -23.7, -50.5, -23.75, -23.7, -35.25, -34.5, -23.7, -56.75, -17, -23.7, -69.5, -34.5, -23.7, -48.25, -9.25, -23.7, -35.25, -5.5, -23.7, -35.25, -5.5, -23.7, -57.75, 8.75, -24.7, -67, 8.75, -24.7, -69.5, 5, -24.7, -69.5, 5, -24.7, -59.25, 8.75, -24.7, -59.25, 8.75, -24.7, -62, 8.75, -24.7, -64.5, 1.25, -24.7, -69.5, 1.25, -24.7, -59.25, -2.5, -24.7, -69.5, -2.5, -24.7, -59.25, 16.75, 0.299999, -69.5, 14.5, 0.299999, -69.5, 14.5, 0.299999, -67.25, 23.75, 0.299999, -66.75, 23.75, 0.299999, -69.5, 21.25, 0.299999, -69.5, 24.75, 0.299999, -59.5, 24.75, 0.299999, -63.5, 23.75, 0.299999, -64, 19, 0.299999, -69.5, 14.5, 0.299999, -64.75, 14.5, 0.299999, -62.25, 14.5, 0.299999, -59.75, -34.75, 0.299999, -65.25, -32.5, 0.299999, -65.5, -32.5, 0.299999, -66.5, -36.5, 0.299999, -66.5, -35.25, 0.299999, -56.75, -36.25, 0.299999, -57.25, -36.5, 0.299999, -56.75, -36.5, 0.299999, -53.5, -35.25, 0.299999, -53.5, -35.25, 0.299999, -64.75, -36.5, 0.299999, -63.25, -35.25, 0.299999, -62.5, -36.25, 0.299999, -59.5, -36.5, 0.299999, -60, -35.25, 0.299999, -60, -27.5, -2.7, -61.25, -26.25, -2.7, -60.5, -28, -2.7, -60.75, -30.5, -2.7, -60.75, -30.5, -2.7, -57.75, -28, -2.7, -54.75, -26.25, -2.7, -56, -26.25, -2.7, -58.25, -27.5, -2.7, -53.5, -26.25, -2.7, -53.5, -30.5, -2.7, -54.75, -27.5, 0.299999, -61.25, -26.25, 0.299999, -61.25, -29.25, 0.299999, -59, -29.25, 0.299999, -56.5, -26.25, 0.299999, -56.5, -23.25, 0.299999, -58.75, -25.75, 0.299999, -60.75, -28, 0.299999, -60.75, -30.5, 0.299999, -60.75, -30.5, 0.299999, -59.5, -23.25, 0.299999, -56.5, -23.25, 0.299999, -60.75, -18.5, -2.7, -53.5, -17.25, -2.7, -53.5, -16.75, -2.7, -54.75, -18.5, -2.7, -56, -14.25, -2.7, -57.75, -14.25, -2.7, -60.75, -16.75, -2.7, -60.75, -17.25, -2.7, -61.25, -18.5, -2.7, -60.75, -14.25, -2.7, -54.75, -18.5, -2.7, -58.25, -17.25, 0.299999, -61.25, -18.5, 0.299999, -59.75, -11.25, 0.299999, -56.5, -11.25, 0.299999, -59.25, -13.75, 0.299999, -59.25, -15, 0.299999, -56.5, -16.75, 0.299999, -60.75, -14.25, 0.299999, -60.75, -18.5, 0.299999, -56.5, 22.5, 0.299999, -41.5, 24.75, 0.299999, -41.5, 24.75, 0.299999, -43.75, 11, 0.299999, -57.5, 8.5, 0.299999, -57.5, 8.5, 0.299999, -53.5, 20.5, 0.299999, -41.5, 24.75, 0.299999, -46, 8.5, 0.299999, -45.5, 8.5, 0.299999, -41.5, 12.5, 0.299999, -41.5, 24.75, 0.299999, -55, 24.75, 0.299999, -57.25, 14.5, 0.299999, -58.25, 13.75, 0.299999, -57.5, 8.5, 0.299999, -49.5, 24.75, 0.299999, -48.25, 16.5, 0.299999, -41.5, 24.75, 0.299999, -52.75, 24.75, 0.299999, -50.5, 8.75, -23.7, -55, 8.75, -23.7, -57.75, 5, -23.7, -57.75, 5, -23.7, -35.25, 8.75, -23.7, -35.25, 8.75, -23.7, -38.25, 8.75, -23.7, -52.25, 8.75, -23.7, -41, 8.75, -23.7, -49.5, 1.5, -23.7, -57.75, 1.5, -23.7, -35.25, 8.75, -23.7, -43.75, 8.75, -23.7, -46.5, -2, -23.7, -57.75, -2, -23.7, -35.25, 0.75, 0.299999, -52, -0.5, 0.299999, -51.5, -0.5, 0.299999, -43.25, 0.75, 0.299999, -43.5, 0.75, 0.299999, -45.5, -0.5, 0.299999, -46.75, 1.25, 0.299999, -51.5, -0.5, 0.299999, -49.25, 0.75, 0.299999, -49.75, 1.25, 0.299999, -50.25, -0.5, 0.299999, -32.5, 0.75, 0.299999, -32.5, 0.75, 0.299999, -34.75, -0.5, 0.299999, -36.25, 0.75, 0.299999, -47.75, -1.25, 0.299999, -48.5, -1, 0.299999, -47.25, 0.75, 0.299999, -37, -4, 0.299999, -48.5, -6.5, 0.299999, -48.5, -6.5, 0.299999, -47.25, -3.75, 0.299999, -47.25, 3.75, 0.299999, -51.5, 3.75, 0.299999, -50.25, 6.5, 0.299999, -51.5, 6.5, 0.299999, -50.25, -0.5, 0.299999, -39.75, 0.75, 0.299999, -41.25, 0.75, 0.299999, -39.25, -26.75, 0.299999, -46.25, -27.5, 0.299999, -44.5, -25.25, 0.299999, -44.5, -24.5, 0.299999, -46.25, -31, 0.299999, -51.5, -30.75, 0.299999, -50.25, -29.25, 0.299999, -51, -23.25, 0.299999, -44.25, -24, 0.299999, -46.75, -37.25, 0.299999, -49.25, -36, 0.299999, -51.5, -38.5, 0.299999, -51.5, -38.5, 0.299999, -47.75, -27.25, 0.299999, -51.5, -28.25, 0.299999, -51, -27.5, 0.299999, -50.25, -24.5, 0.299999, -50.25, -23.5, 0.299999, -51.5, -38.25, 0.299999, -46.75, -38.25, 0.299999, -44.25, -23.25, 0.299999, -48, -24, 0.299999, -49.75, -32.25, 0.299999, -48, -33.5, 0.299999, -45.5, -32.75, 0.299999, -45.5, -31, 0.299999, -48.25, -35.5, 0.299999, -44.75, -35.5, 0.299999, -44.25, -34.25, 0.299999, -44.75, -32.5, 0.299999, -44.25, -8.25, 0.299999, -37.75, -8.25, 0.299999, -38.5, -9.25, 0.299999, -39, -9.75, 0.299999, -37.5, -14.5, 0.299999, -46.75, -14.5, 0.299999, -43.25, -11.5, 0.299999, -44.75, -11.5, 0.299999, -45.75, -11.25, 0.299999, -36.5, -12.75, 0.299999, -36.5, -13, 0.299999, -36.25, -10.5, 0.299999, -36.25, -10.5, 0.299999, -46.5, -10.5, 0.299999, -37.25, -15, 0.299999, -51.5, -15, 0.299999, -50.5, -14.5, 0.299999, -50, -11.75, 0.299999, -51.5, -10.25, 0.299999, -39.75, -9.25, 0.299999, -41.25, -9.75, 0.299999, -42.25, -8.5, 0.299999, -48.75, -8.25, 0.299999, -51.5, -8.5, 0.299999, -46, -18.25, 0.299999, -51.5, -18.25, 0.299999, -50.25, -9.25, 0.299999, -43.5, -10.75, 0.299999, -43.25, -11.5, 0.299999, -43.25, -21.5, 0.299999, -51.5, -21.5, 0.299999, -50.25, -15.5, 0.299999, -42.5, -15.5, 0.299999, -40.75, -13.75, 0.299999, -40.5, -26.25, 0.299999, -41.75, -26.5, 0.299999, -42.5, -27.5, 0.299999, -42.5, -27.5, 0.299999, -39.25, -26.25, 0.299999, -39.25, -8.25, 0.299999, -30.5, -10.5, 0.299999, -30.5, -11, 0.299999, -29.25, -7.75, 0.299999, -29.25, 0.75, 0.299999, -24, 0.75, 0.299999, -27.25, -0.5, 0.299999, -26, -0.5, 0.299999, -23.25, -26.25, 0.299999, -36.5, -27.5, 0.299999, -36, -0.5, 0.299999, -20.5, -0.5, 0.299999, -17.5, 0.75, 0.299999, -17.5, 0.75, 0.299999, -20.75, -26.25, 0.299999, -33.75, -27.5, 0.299999, -32.75, -0.5, 0.299999, -28.75, 0.75, 0.299999, -30.5, -1.5, 0.299999, -30.5, -26.25, 0.299999, -31, -27.5, 0.299999, -29.25, -3.75, 0.299999, -30.5, -4.5, 0.299999, -29.25, -1, 0.299999, -29.25, -25.75, 0.299999, -30.5, -24.25, 0.299999, -29.25, -23, 0.299999, -30.5, -20.25, 0.299999, -30.5, -21, 0.299999, -29.25, -19.75, 0.299999, -29.5, -6, 0.299999, -30.5, -17.75, 0.299999, -29.25, -18, 0.299999, -29.5, -17, 0.299999, -30.5, -14.25, 0.299999, -29.25, -15, 0.299999, -30.5, -12.75, 0.299999, -30.5, -13.75, 0.299999, -38, -15, 0.299999, -36.75, -16.25, 0.299999, -39.5, -17, 0.299999, -39.5, -17, 0.299999, -37, -18.75, 0.299999, -35.25, -15.5, 0.299999, -35.25, 3, 0.299999, -9.25, 3.75, 0.299999, -8.5, 2.75, 0.299999, -9.75, 1.5, 0.299999, -9.25, -3.5, 0.299999, -15.5, -3.5, 0.299999, -14.75, -2.75, 0.299999, -14.25, 0, 0.299999, -15.5, -2.75, 0.299999, -12.75, -3.5, 0.299999, -12.25, -2.75, 0.299999, -11.25, 2.75, 0.299999, -11.25, 3.5, 0.299999, -12.25, 2.75, 0.299999, -12.75, -3, 0.299999, -9.25, -1.5, 0.299999, -9.25, -0.75, 0.299999, -8.25, 0.75, 0.299999, -8.25, 2.75, 0.299999, -14.25, 3.75, 0.299999, -15.5) @@ -46,14 +43,6 @@ label = "SWITCH_BULKHEAD_LABEL" [node name="Corridor1" parent="BeastNav" instance=ExtResource("4_4akax")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -22.5) -[node name="MessHallMeetSpookSpawner" type="Marker3D" parent="BeastNav/Corridor1"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -27, 1.5, -7.5) -script = ExtResource("52_4akax") -mob_lifespan = 2.2 - -[node name="Target" type="Marker3D" parent="BeastNav/Corridor1/MessHallMeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.90735e-06, 0, 21) - [node name="SwitchA2" parent="BeastNav/Corridor1" instance=ExtResource("17_0idgf")] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.4, 1.3, 4.8) label = "SWITCH_BULKHEAD_LABEL" @@ -65,20 +54,6 @@ label = "SWITCH_BULKHEAD_LABEL" [node name="MessHall" parent="BeastNav" instance=ExtResource("6_mgo71")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27, 0, -53) -[node name="MessHallMeetSpook" type="Marker3D" parent="BeastNav/MessHall" node_paths=PackedStringArray("spawners") groups=["MeetSpookSource"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5, 1.5, 5.1) -script = ExtResource("49_dxmep") -mob_scene = ExtResource("56_vt4uw") -spawners = [NodePath("../../Corridor1/MessHallMeetSpookSpawner"), NodePath("../../Corridor2/MessHallMeetSpookSpawner"), NodePath("../../Medbay/MessHallMeetSpookSpawner")] - -[node name="MedbayMeetSpookSpawner" type="Marker3D" parent="BeastNav/MessHall"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 1.5, 2.1) -script = ExtResource("52_4akax") -mob_lifespan = 2.2 - -[node name="Target" type="Marker3D" parent="BeastNav/MessHall/MedbayMeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 6) - [node name="SwitchB2" parent="BeastNav/MessHall" instance=ExtResource("17_0idgf")] transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -2.4, 1.3, 9.4) label = "SWITCH_BULKHEAD_LABEL" @@ -90,22 +65,6 @@ label = "SWITCH_BULKHEAD_LABEL" [node name="Corridor2" parent="BeastNav" instance=ExtResource("9_uc45a")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -36, 0, -54) -[node name="MessHallMeetSpookSpawner" type="Marker3D" parent="BeastNav/Corridor2"] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 1.5, -12) -script = ExtResource("52_4akax") -mob_lifespan = 2.2 - -[node name="Target" type="Marker3D" parent="BeastNav/Corridor2/MessHallMeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -12) - -[node name="CrewQuartersMeetSpookSpawner" type="Marker3D" parent="BeastNav/Corridor2"] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 1.5, -12) -script = ExtResource("52_4akax") -mob_lifespan = 2.2 - -[node name="Target" type="Marker3D" parent="BeastNav/Corridor2/CrewQuartersMeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 0, 0) - [node name="SwitchC2" parent="BeastNav/Corridor2" instance=ExtResource("17_0idgf")] transform = Transform3D(1.31134e-07, 0, 1, 0, 1, 0, -1, 0, 1.31134e-07, -1.4, 1.3, 0.299999) label = "SWITCH_BULKHEAD_LABEL" @@ -117,13 +76,6 @@ label = "SWITCH_BULKHEAD_LABEL" [node name="CrewQuarters" parent="BeastNav" instance=ExtResource("10_p11ap")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.8, 0, -66.3) -[node name="CrewQuartersMeetSpook" type="Marker3D" parent="BeastNav/CrewQuarters" node_paths=PackedStringArray("spawners") groups=["MeetSpookSource"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.8, 0, 0.300003) -script = ExtResource("49_dxmep") -mob_scene = ExtResource("56_vt4uw") -spawners = [NodePath("../../Corridor2/CrewQuartersMeetSpookSpawner"), NodePath("../../Corridor3/CrewQuartersMeetSpookSpawner")] -metadata/_custom_type_script = "uid://cvx514gdjd5ev" - [node name="SwitchD2" parent="BeastNav/CrewQuarters" instance=ExtResource("17_0idgf")] transform = Transform3D(-1, 0, 8.74226e-08, 0, 1, 0, -8.74226e-08, 0, -1, -7.1, 1.3, 1.7) label = "SWITCH_BULKHEAD_LABEL" @@ -135,30 +87,6 @@ label = "SWITCH_BULKHEAD_LABEL" [node name="Corridor3" parent="BeastNav" instance=ExtResource("11_d1yty")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 0, -66) -[node name="CrewQuartersMeetSpookSpawner" type="Marker3D" parent="BeastNav/Corridor3"] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 12, 1.5, 0) -script = ExtResource("52_4akax") -mob_lifespan = 2.2 - -[node name="Target" type="Marker3D" parent="BeastNav/Corridor3/CrewQuartersMeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.57361e-06, 0, -18) - -[node name="OpsMeetSpookSpawner" type="Marker3D" parent="BeastNav/Corridor3"] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 12, 1.5, 0) -script = ExtResource("52_4akax") -mob_lifespan = 3.0 - -[node name="Target" type="Marker3D" parent="BeastNav/Corridor3/OpsMeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 0, 0) - -[node name="MedbayMeetSpookSpawner" type="Marker3D" parent="BeastNav/Corridor3"] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 12, 1.5, 18) -script = ExtResource("52_4akax") -mob_lifespan = 2.2 - -[node name="Target" type="Marker3D" parent="BeastNav/Corridor3/MedbayMeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.14722e-06, 0, 42) - [node name="SwitchE2" parent="BeastNav/Corridor3" instance=ExtResource("17_0idgf")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.3, 1.3, -1.4) label = "SWITCH_BULKHEAD_LABEL" @@ -173,20 +101,6 @@ label = "SWITCH_BULKHEAD_LABEL" [node name="Medbay" parent="BeastNav" instance=ExtResource("13_ruwlj")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 0, -39) -[node name="MessHallMeetSpookSpawner" type="Marker3D" parent="BeastNav/Medbay"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 1.5, -12) -script = ExtResource("52_4akax") -mob_lifespan = 2.2 - -[node name="Target" type="Marker3D" parent="BeastNav/Medbay/MessHallMeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, 15) - -[node name="MedbayMeetSpook" type="Marker3D" parent="BeastNav/Medbay" node_paths=PackedStringArray("spawners") groups=["MeetSpookSource"]] -script = ExtResource("49_dxmep") -mob_scene = ExtResource("56_vt4uw") -spawners = [NodePath("../../MessHall/MedbayMeetSpookSpawner"), NodePath("../../Corridor3/MedbayMeetSpookSpawner")] -metadata/_custom_type_script = "uid://cvx514gdjd5ev" - [node name="SwitchH2" parent="BeastNav/Medbay" instance=ExtResource("17_0idgf")] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 4.4, 1.3, -6.6) label = "SWITCH_BULKHEAD_LABEL" @@ -198,12 +112,6 @@ label = "SWITCH_BULKHEAD_LABEL" [node name="OpsCenter" parent="BeastNav" instance=ExtResource("14_0idgf")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -84) -[node name="OpsMeetSpook" type="Marker3D" parent="BeastNav/OpsCenter" groups=["MeetSpookSource"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -4.5) -script = ExtResource("49_dxmep") -mob_scene = ExtResource("56_vt4uw") -metadata/_custom_type_script = "uid://cvx514gdjd5ev" - [node name="SwitchF2" parent="BeastNav/OpsCenter" instance=ExtResource("17_0idgf")] transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -2.4, 1.3, 4.4) label = "SWITCH_BULKHEAD_LABEL" diff --git a/levels/meet_spook_test/debug_mob.tscn b/levels/meet_spook_test/debug_mob.tscn deleted file mode 100644 index 09d4e52..0000000 --- a/levels/meet_spook_test/debug_mob.tscn +++ /dev/null @@ -1,70 +0,0 @@ -[gd_scene load_steps=11 format=3 uid="uid://8m6kh4f6pily"] - -[ext_resource type="Script" uid="uid://1trqaximxxmx" path="res://src/world/meet_spook/meet_spook_mob.gd" id="1_545xt"] -[ext_resource type="Shader" uid="uid://ckxc0ngd37rtk" path="res://src/shaders/gunk.gdshader" id="2_pte10"] -[ext_resource type="Texture2D" uid="uid://cm1jrvx7ftx4c" path="res://assets/black.png" id="3_iy8jq"] -[ext_resource type="FastNoiseLite" uid="uid://cnlvdtx68giv6" path="res://assets/materials/gunk_noise.tres" id="4_67wo7"] - -[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_2roq2"] -width = 256 -height = 256 -depth = 32 -seamless = true -seamless_blend_skirt = 0.5 -noise = ExtResource("4_67wo7") - -[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_fk1xc"] -width = 256 -height = 256 -depth = 32 -seamless = true -seamless_blend_skirt = 0.5 -noise = ExtResource("4_67wo7") - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_pte10"] -frequency = 0.0703 - -[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_omayi"] -width = 32 -height = 32 -depth = 128 -noise = SubResource("FastNoiseLite_pte10") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_iy8jq"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("2_pte10") -shader_parameter/color_1 = Color(0, 0.03, 0.1, 1) -shader_parameter/color_2 = Color(0, 0.1, 0.3, 1) -shader_parameter/emission_color = Color(0.25, 0.88, 1, 1) -shader_parameter/pixellation = 128.0 -shader_parameter/time_pixellation = 30.0 -shader_parameter/roughness = 0.15 -shader_parameter/specular_contribution = 0.8 -shader_parameter/emission_strength = 0.1 -shader_parameter/uv_scale = Vector2(4, 4) -shader_parameter/time_scale = 1.0 -shader_parameter/edge_bleed = 0.25 -shader_parameter/gunk_mask = ExtResource("3_iy8jq") -shader_parameter/gunk_noise = SubResource("NoiseTexture3D_2roq2") -shader_parameter/gunk_normal_map = SubResource("NoiseTexture3D_fk1xc") -shader_parameter/jitter_magnitude = 0.6 -shader_parameter/jitter_time_scale = 0.2 -shader_parameter/jitter_noise = SubResource("NoiseTexture3D_omayi") -shader_parameter/vertex_inflation = 0.0 -shader_parameter/inflation_pixellation = 10.0 -shader_parameter/overlay_emission_scale = 1.0 - -[sub_resource type="CapsuleMesh" id="CapsuleMesh_k8gi4"] -material = SubResource("ShaderMaterial_iy8jq") - -[node name="DebugMob" type="Node3D"] -script = ExtResource("1_545xt") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] -mesh = SubResource("CapsuleMesh_k8gi4") - -[node name="Label3D" type="Label3D" parent="MeshInstance3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2, 0) -billboard = 2 -text = "SPOOKY!" diff --git a/levels/meet_spook_test/meet_spook_test.tscn b/levels/meet_spook_test/meet_spook_test.tscn deleted file mode 100644 index 88a85cd..0000000 --- a/levels/meet_spook_test/meet_spook_test.tscn +++ /dev/null @@ -1,98 +0,0 @@ -[gd_scene load_steps=15 format=3 uid="uid://1kreuo8tc4jv"] - -[ext_resource type="PackedScene" uid="uid://bwe2jdmvinhqd" path="res://src/player/player.tscn" id="1_f3l4i"] -[ext_resource type="PackedScene" uid="uid://b6eg8t04rkh0c" path="res://src/props/wall_switch/wall_switch.tscn" id="2_eywuc"] -[ext_resource type="Script" uid="uid://cvx514gdjd5ev" path="res://src/world/meet_spook/meet_spook.gd" id="4_b6st5"] -[ext_resource type="PackedScene" uid="uid://cmmx0j4md4c5p" path="res://src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.tscn" id="4_cr4pm"] -[ext_resource type="Script" uid="uid://cisuvlqvqfqgo" path="res://src/world/meet_spook/meet_spook_spawner.gd" id="5_tak24"] -[ext_resource type="Script" uid="uid://c1gy2b2wcq127" path="res://levels/meet_spook_test/tween_debug.gd" id="6_cr4pm"] - -[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_eywuc"] - -[sub_resource type="Sky" id="Sky_cr4pm"] -sky_material = SubResource("ProceduralSkyMaterial_eywuc") - -[sub_resource type="Environment" id="Environment_nynr7"] -background_mode = 2 -sky = SubResource("Sky_cr4pm") - -[sub_resource type="PlaneMesh" id="PlaneMesh_b6st5"] -size = Vector2(50, 50) - -[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_tak24"] - -[sub_resource type="BoxMesh" id="BoxMesh_nynr7"] -size = Vector3(0.5, 2, 0.5) - -[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_b6st5"] -data = PackedVector3Array(-0.25, 1, 0.25, 0.25, 1, 0.25, -0.25, -1, 0.25, 0.25, 1, 0.25, 0.25, -1, 0.25, -0.25, -1, 0.25, 0.25, 1, -0.25, -0.25, 1, -0.25, 0.25, -1, -0.25, -0.25, 1, -0.25, -0.25, -1, -0.25, 0.25, -1, -0.25, 0.25, 1, 0.25, 0.25, 1, -0.25, 0.25, -1, 0.25, 0.25, 1, -0.25, 0.25, -1, -0.25, 0.25, -1, 0.25, -0.25, 1, -0.25, -0.25, 1, 0.25, -0.25, -1, -0.25, -0.25, 1, 0.25, -0.25, -1, 0.25, -0.25, -1, -0.25, 0.25, 1, 0.25, -0.25, 1, 0.25, 0.25, 1, -0.25, -0.25, 1, 0.25, -0.25, 1, -0.25, 0.25, 1, -0.25, -0.25, -1, 0.25, 0.25, -1, 0.25, -0.25, -1, -0.25, 0.25, -1, 0.25, 0.25, -1, -0.25, -0.25, -1, -0.25) - -[sub_resource type="SphereMesh" id="SphereMesh_tak24"] - -[node name="MeetSpookTest" type="Node3D"] - -[node name="Player" parent="." instance=ExtResource("1_f3l4i")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) - -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(0.866025, -0.156955, -0.474726, 0.5, 0.271854, 0.82225, 0, -0.949453, 0.31391, 0, 0, 0) - -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource("Environment_nynr7") - -[node name="WorldFloor" type="StaticBody3D" parent="." groups=["PlasticMaterial"]] - -[node name="MeshInstance3D" type="MeshInstance3D" parent="WorldFloor"] -mesh = SubResource("PlaneMesh_b6st5") -skeleton = NodePath("../..") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="WorldFloor"] -shape = SubResource("WorldBoundaryShape3D_tak24") - -[node name="TriggerPodium" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -2) - -[node name="MeshInstance3D" type="MeshInstance3D" parent="TriggerPodium"] -mesh = SubResource("BoxMesh_nynr7") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="TriggerPodium"] -shape = SubResource("ConcavePolygonShape3D_b6st5") - -[node name="TriggerSwitch" parent="TriggerPodium" instance=ExtResource("2_eywuc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.4, 0.35) -clean = true - -[node name="Label3D" type="Label3D" parent="TriggerPodium"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0.3) -text = "GET SCARED" - -[node name="MeetSpook" type="Marker3D" parent="." node_paths=PackedStringArray("spawners")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 1.5, 0) -script = ExtResource("4_b6st5") -mob_scene = ExtResource("4_cr4pm") -spawners = [NodePath("../MeetSpookSpawner"), NodePath("../MeetSpookSpawner2")] -metadata/_custom_type_script = "uid://cvx514gdjd5ev" - -[node name="MeetSpookSpawner" type="Marker3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 6) -script = ExtResource("5_tak24") -metadata/_custom_type_script = "uid://cisuvlqvqfqgo" - -[node name="Target" type="Marker3D" parent="MeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9, 0, 0) - -[node name="MeetSpookSpawner2" type="Marker3D" parent="."] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 9, 1.5, 0) -script = ExtResource("5_tak24") -metadata/_custom_type_script = "uid://cisuvlqvqfqgo" - -[node name="Target" type="Marker3D" parent="MeetSpookSpawner2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9, 0, 0) - -[node name="TweenDebug" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, -4.5) -mesh = SubResource("SphereMesh_tak24") -script = ExtResource("6_cr4pm") - -[connection signal="activated" from="TriggerPodium/TriggerSwitch" to="MeetSpook" method="prepare"] -[connection signal="activated" from="TriggerPodium/TriggerSwitch" to="TweenDebug" method="activate"] diff --git a/levels/meet_spook_test/tween_debug.gd b/levels/meet_spook_test/tween_debug.gd deleted file mode 100644 index 44abc70..0000000 --- a/levels/meet_spook_test/tween_debug.gd +++ /dev/null @@ -1,19 +0,0 @@ -extends MeshInstance3D - -@export var movement := Vector3(3, 0, 0) -@export var duration := 2.0 -@export var transition_type := Tween.TRANS_SINE -@export var ease_type := Tween.EASE_IN - -@onready var start_position := position - - -func activate() -> void: - var end_position := start_position + movement - position = start_position - ( - create_tween() - . tween_property(self, "position", end_position, duration) - . set_trans(transition_type) - . set_ease(ease_type) - ) diff --git a/levels/meet_spook_test/tween_debug.gd.uid b/levels/meet_spook_test/tween_debug.gd.uid deleted file mode 100644 index d6f7bcb..0000000 --- a/levels/meet_spook_test/tween_debug.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://c1gy2b2wcq127 diff --git a/levels/pathing_test/pathing_test.tscn b/levels/pathing_test/pathing_test.tscn index 3e30c94..276287d 100644 --- a/levels/pathing_test/pathing_test.tscn +++ b/levels/pathing_test/pathing_test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=63 format=4 uid="uid://tvirbm0kgvp8"] +[gd_scene load_steps=62 format=4 uid="uid://tvirbm0kgvp8"] [ext_resource type="PackedScene" uid="uid://bwe2jdmvinhqd" path="res://src/player/player.tscn" id="1_fgk6j"] [ext_resource type="Script" uid="uid://68r4ht5ut1ct" path="res://src/game/level.gd" id="1_hv7qb"] @@ -24,7 +24,6 @@ [ext_resource type="PackedScene" uid="uid://cjqayfrj2oxyr" path="res://src/props/tarp_crate/tarp_crate_logo.tscn" id="19_iuevq"] [ext_resource type="ArrayMesh" uid="uid://5jt7xxr05lw3" path="res://assets/level/hallway/hallway_2.mesh" id="20_pfbho"] [ext_resource type="ArrayMesh" uid="uid://b3f5p4o7qr1mf" path="res://assets/level/t-junction/t-junction_2.mesh" id="21_e5vs1"] -[ext_resource type="Script" uid="uid://cisuvlqvqfqgo" path="res://src/world/meet_spook/meet_spook_spawner.gd" id="22_tnoo6"] [ext_resource type="ArrayMesh" uid="uid://xn5nceqby4wd" path="res://assets/level/wall/wall_3.mesh" id="23_7rrnb"] [ext_resource type="ArrayMesh" uid="uid://c4klxlj1oop7t" path="res://assets/level/hallway/hallway_4.mesh" id="24_x0es6"] [ext_resource type="Material" uid="uid://b8xdnogrfefvf" path="res://levels/ghost_ship/guide_sign/mess_hall_sign.material" id="25_jvcry"] @@ -60,7 +59,7 @@ data = PackedVector3Array(25, 0, 25, -25, 0, 25, 25, 0, -25, -25, 0, 25, -25, 0, [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_u8j4k"] data = PackedVector3Array(-1.5, 0, -6, -1.5, 0, 6, -1.5, 3, -6, -1.5, 3, -6, -1.5, 0, 6, -1.5, 3, 6, 1.5, 0, 6, 1.5, 0, -6, 1.5, 3, 6, 1.5, 3, 6, 1.5, 0, -6, 1.5, 3, -6, -1.5, 0, 6, -1.5, 0, -6, 1.5, 0, 6, 1.5, 0, 6, -1.5, 0, -6, 1.5, 0, -6, 1.5, 3, 6, 1.5, 3, -6, -1.5, 3, 6, -1.5, 3, 6, 1.5, 3, -6, -1.5, 3, -6) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hv7qb"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e2fuu"] resource_local_to_scene = true albedo_texture = ExtResource("6_e2fuu") metallic = 1.0 @@ -86,7 +85,7 @@ _surfaces = [{ }] blend_shape_mode = 0 -[sub_resource type="ArrayMesh" id="ArrayMesh_wxmii"] +[sub_resource type="ArrayMesh" id="ArrayMesh_hv7qb"] resource_local_to_scene = true _surfaces = [{ "aabb": AABB(-0.375, -0.25, -0.75, 0.75, 0.5, 1.5), @@ -95,7 +94,7 @@ _surfaces = [{ "index_count": 84, "index_data": PackedByteArray("FgANAAwADAANABcAFwANAA4ADgANABgAGAANAA8ADwANABkAGgAHAAIAAgAHABsAEAABABEAEQABABwAHQAAAAYABgAAAAMACQAUAAgACAAUABUAFQAUAAoACgAUAB4AHgAUAAsACwAUAB8AIAATAAUABQATAAQAIQAiACMAIwAiACQAJQASACYAJgASACcAKAApACoAKgApACsALAAtAC4ALgAtAC8A"), "lods": [0.108952, PackedByteArray("DAANAA4ADgANAA8AEAABABEAEAARAAYAEQAAAAYABgAAAAMAEQABAAIAAgABAAcABwASAAIABwATABIAEgATAAUABQATAAQACQAUAAgACAAUABUAFQAUAAoACgAUAAsA"), 0.261829, PackedByteArray("AAABAAIAAQAAAAYABgAAAAMAAgABAAcABwAEAAIAAgAEAAUACAAJAAoACgAJAAsA"), 0.524037, PackedByteArray("AAABAAIAAQAAAAMAAgABAAQAAgAEAAUA")], -"material": SubResource("StandardMaterial3D_hv7qb"), +"material": SubResource("StandardMaterial3D_e2fuu"), "name": "Cube", "primitive": 3, "uv_scale": Vector4(0, 0, 0, 0), @@ -105,7 +104,7 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_isly2") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nsdlh"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wxmii"] resource_local_to_scene = true albedo_texture = ExtResource("6_e2fuu") metallic = 1.0 @@ -116,7 +115,7 @@ normal_texture = ExtResource("8_wxmii") ao_enabled = true texture_filter = 2 -[sub_resource type="ArrayMesh" id="ArrayMesh_br5h1"] +[sub_resource type="ArrayMesh" id="ArrayMesh_nsdlh"] resource_local_to_scene = true _surfaces = [{ "aabb": AABB(-0.375, -0.25, -0.75, 0.75, 0.5, 1.5), @@ -125,7 +124,7 @@ _surfaces = [{ "index_count": 84, "index_data": PackedByteArray("FgANAAwADAANABcAFwANAA4ADgANABgAGAANAA8ADwANABkAGgAHAAIAAgAHABsAEAABABEAEQABABwAHQAAAAYABgAAAAMACQAUAAgACAAUABUAFQAUAAoACgAUAB4AHgAUAAsACwAUAB8AIAATAAUABQATAAQAIQAiACMAIwAiACQAJQASACYAJgASACcAKAApACoAKgApACsALAAtAC4ALgAtAC8A"), "lods": [0.108952, PackedByteArray("DAANAA4ADgANAA8AEAABABEAEAARAAYAEQAAAAYABgAAAAMAEQABAAIAAgABAAcABwASAAIABwATABIAEgATAAUABQATAAQACQAUAAgACAAUABUAFQAUAAoACgAUAAsA"), 0.261829, PackedByteArray("AAABAAIAAQAAAAYABgAAAAMAAgABAAcABwAEAAIAAgAEAAUACAAJAAoACgAJAAsA"), 0.524037, PackedByteArray("AAABAAIAAQAAAAMAAgABAAQAAgAEAAUA")], -"material": SubResource("StandardMaterial3D_nsdlh"), +"material": SubResource("StandardMaterial3D_wxmii"), "name": "Cube", "primitive": 3, "uv_scale": Vector4(0, 0, 0, 0), @@ -135,7 +134,7 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_isly2") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qluxd"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_br5h1"] resource_local_to_scene = true albedo_texture = ExtResource("6_e2fuu") metallic = 1.0 @@ -146,7 +145,7 @@ normal_texture = ExtResource("8_wxmii") ao_enabled = true texture_filter = 2 -[sub_resource type="ArrayMesh" id="ArrayMesh_h6xp0"] +[sub_resource type="ArrayMesh" id="ArrayMesh_qluxd"] resource_local_to_scene = true _surfaces = [{ "aabb": AABB(-0.375, -0.25, -0.75, 0.75, 0.5, 1.5), @@ -155,7 +154,7 @@ _surfaces = [{ "index_count": 84, "index_data": PackedByteArray("FgANAAwADAANABcAFwANAA4ADgANABgAGAANAA8ADwANABkAGgAHAAIAAgAHABsAEAABABEAEQABABwAHQAAAAYABgAAAAMACQAUAAgACAAUABUAFQAUAAoACgAUAB4AHgAUAAsACwAUAB8AIAATAAUABQATAAQAIQAiACMAIwAiACQAJQASACYAJgASACcAKAApACoAKgApACsALAAtAC4ALgAtAC8A"), "lods": [0.108952, PackedByteArray("DAANAA4ADgANAA8AEAABABEAEAARAAYAEQAAAAYABgAAAAMAEQABAAIAAgABAAcABwASAAIABwATABIAEgATAAUABQATAAQACQAUAAgACAAUABUAFQAUAAoACgAUAAsA"), 0.261829, PackedByteArray("AAABAAIAAQAAAAYABgAAAAMAAgABAAcABwAEAAIAAgAEAAUACAAJAAoACgAJAAsA"), 0.524037, PackedByteArray("AAABAAIAAQAAAAMAAgABAAQAAgAEAAUA")], -"material": SubResource("StandardMaterial3D_qluxd"), +"material": SubResource("StandardMaterial3D_br5h1"), "name": "Cube", "primitive": 3, "uv_scale": Vector4(0, 0, 0, 0), @@ -241,7 +240,7 @@ data = PackedVector3Array(-1, 0, 0.2, -1, -0.4, 0, -1, 0, -0.2, -1, 0, -0.2, -1, [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_o1heh"] data = PackedVector3Array(-1.5, 0, -1.5, -1.5, 0, 1.5, -1.5, 3, -1.5, -1.5, 3, -1.5, -1.5, 0, 1.5, -1.5, 3, 1.5, -1.5, 0, 1.5, -1.5, 0, -1.5, 1.5, 0, 1.5, 1.5, 0, 1.5, -1.5, 0, -1.5, 1.5, 0, -1.5, 1.5, 3, 1.5, 1.5, 3, -1.5, -1.5, 3, 1.5, -1.5, 3, 1.5, 1.5, 3, -1.5, -1.5, 3, -1.5) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_irt7r"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_h6xp0"] resource_local_to_scene = true albedo_texture = ExtResource("6_e2fuu") metallic = 1.0 @@ -267,7 +266,7 @@ _surfaces = [{ }] blend_shape_mode = 0 -[sub_resource type="ArrayMesh" id="ArrayMesh_olej6"] +[sub_resource type="ArrayMesh" id="ArrayMesh_irt7r"] resource_local_to_scene = true _surfaces = [{ "aabb": AABB(-0.375, -0.25, -0.75, 0.75, 0.5, 1.5), @@ -276,7 +275,7 @@ _surfaces = [{ "index_count": 84, "index_data": PackedByteArray("FgANAAwADAANABcAFwANAA4ADgANABgAGAANAA8ADwANABkAGgAHAAIAAgAHABsAEAABABEAEQABABwAHQAAAAYABgAAAAMACQAUAAgACAAUABUAFQAUAAoACgAUAB4AHgAUAAsACwAUAB8AIAATAAUABQATAAQAIQAiACMAIwAiACQAJQASACYAJgASACcAKAApACoAKgApACsALAAtAC4ALgAtAC8A"), "lods": [0.108952, PackedByteArray("DAANAA4ADgANAA8AEAABABEAEAARAAYAEQAAAAYABgAAAAMAEQABAAIAAgABAAcABwASAAIABwATABIAEgATAAUABQATAAQACQAUAAgACAAUABUAFQAUAAoACgAUAAsA"), 0.261829, PackedByteArray("AAABAAIAAQAAAAYABgAAAAMAAgABAAcABwAEAAIAAgAEAAUACAAJAAoACgAJAAsA"), 0.524037, PackedByteArray("AAABAAIAAQAAAAMAAgABAAQAAgAEAAUA")], -"material": SubResource("StandardMaterial3D_irt7r"), +"material": SubResource("StandardMaterial3D_h6xp0"), "name": "Cube", "primitive": 3, "uv_scale": Vector4(0, 0, 0, 0), @@ -380,17 +379,17 @@ source_gunk_material = ExtResource("7_nsdlh") [node name="CrateLong" parent="NavigationRegion3D/Corridor1/Hallway1" instance=ExtResource("5_18csx")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.25, -5.9) -mesh = SubResource("ArrayMesh_wxmii") +mesh = SubResource("ArrayMesh_hv7qb") skeleton = NodePath("") [node name="CrateLong3" parent="NavigationRegion3D/Corridor1/Hallway1" instance=ExtResource("5_18csx")] transform = Transform3D(0.258819, -0.965926, 0, 0.965926, 0.258819, 0, 0, 0, 1, 1.2, 0.426927, -3.9) -mesh = SubResource("ArrayMesh_br5h1") +mesh = SubResource("ArrayMesh_nsdlh") skeleton = NodePath("") [node name="CrateLong2" parent="NavigationRegion3D/Corridor1/Hallway1" instance=ExtResource("5_18csx")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.75, -5.9) -mesh = SubResource("ArrayMesh_h6xp0") +mesh = SubResource("ArrayMesh_qluxd") skeleton = NodePath("") [node name="FloatingDust" parent="NavigationRegion3D/Corridor1/Hallway1" instance=ExtResource("10_br5h1")] @@ -526,7 +525,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -1.5) [node name="CrateLong" parent="NavigationRegion3D/Corridor1/Hallway3" instance=ExtResource("5_18csx")] transform = Transform3D(-4.37114e-08, -0.965926, 0.258819, 1.77636e-15, 0.258819, 0.965926, -1, 4.2222e-08, -1.13133e-08, 1.06072, 0.789149, 6.6) -mesh = SubResource("ArrayMesh_olej6") +mesh = SubResource("ArrayMesh_irt7r") skeleton = NodePath("../..") [node name="T-Junction2" type="MeshInstance3D" parent="NavigationRegion3D/Corridor1"] @@ -548,13 +547,6 @@ mesh_instance = NodePath("../..") initial_mask = ExtResource("5_jj0u7") source_gunk_material = ExtResource("16_x0tbd") -[node name="MessHallMeetSpookSpawner" type="Marker3D" parent="NavigationRegion3D/Corridor1/T-Junction2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) -script = ExtResource("22_tnoo6") - -[node name="Target" type="Marker3D" parent="NavigationRegion3D/Corridor1/T-Junction2/MessHallMeetSpookSpawner"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.90735e-06, 0, 21) - [node name="EndCap" type="MeshInstance3D" parent="NavigationRegion3D/Corridor1"] transform = Transform3D(2.98023e-08, 1, 0, 4.37114e-08, -1.3027e-15, -1, -1, 2.98023e-08, -4.37114e-08, -28.5, 1.5, -7.5) mesh = ExtResource("23_7rrnb") diff --git a/src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.gd b/src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.gd deleted file mode 100644 index 062ec5c..0000000 --- a/src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.gd +++ /dev/null @@ -1,12 +0,0 @@ -extends MeetSpookMob - -@onready var model: SlutchBeast = %SlutchBeast - - -func _process(_delta: float) -> void: - if not is_instance_valid(Player.instance): - return - - var face_target := target if state == State.MOVING else Player.instance - var to_target := face_target.global_position - global_position - model.set_target_rotation(atan2(to_target.x, to_target.z)) diff --git a/src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.gd.uid b/src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.gd.uid deleted file mode 100644 index edfb7e9..0000000 --- a/src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://ceoi26fevwugu diff --git a/src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.tscn b/src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.tscn deleted file mode 100644 index a5d2964..0000000 --- a/src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://cmmx0j4md4c5p"] - -[ext_resource type="Script" uid="uid://ceoi26fevwugu" path="res://src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.gd" id="1_peqio"] -[ext_resource type="PackedScene" uid="uid://cvq81xegbwv87" path="res://src/world/grunk_beast/slutch_beast/slutch_beast.tscn" id="2_i6sb8"] - -[node name="MeetSpookSlutch" type="Node3D"] -script = ExtResource("1_peqio") -metadata/_custom_type_script = "uid://1trqaximxxmx" - -[node name="SlutchBeast" parent="." instance=ExtResource("2_i6sb8")] -unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.5, 0) diff --git a/src/world/meet_spook/meet_spook.gd b/src/world/meet_spook/meet_spook.gd deleted file mode 100644 index 1c08580..0000000 --- a/src/world/meet_spook/meet_spook.gd +++ /dev/null @@ -1,29 +0,0 @@ -class_name MeetSpook extends Marker3D -## Source for a "meet-spook" event. -## -## When the event conditions are met, the MeetSpook closest to the player prepares contextual -## resources for the event. - -const GROUP := "MeetSpookSource" - -@export var mob_scene: PackedScene -@export var spawners: Array[MeetSpookSpawner] = [] - -var event_prepared := false - - -func prepare() -> void: - if event_prepared: - return - - for spawner: MeetSpookSpawner in spawners: - var instance: MeetSpookMob = mob_scene.instantiate() - instance.source = self - spawner.spawn(instance) - event_prepared = true - - -func resolve() -> void: - for spawner: MeetSpookSpawner in spawners: - spawner.resolve() - event_prepared = false diff --git a/src/world/meet_spook/meet_spook.gd.uid b/src/world/meet_spook/meet_spook.gd.uid deleted file mode 100644 index f97a517..0000000 --- a/src/world/meet_spook/meet_spook.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://cvx514gdjd5ev diff --git a/src/world/meet_spook/meet_spook_mob.gd b/src/world/meet_spook/meet_spook_mob.gd deleted file mode 100644 index f55c76d..0000000 --- a/src/world/meet_spook/meet_spook_mob.gd +++ /dev/null @@ -1,52 +0,0 @@ -class_name MeetSpookMob extends Node3D -## Mob spawned and controlled by a meet-spook event - -enum State { WAITING, FREEZE, MOVING } - -const BASE_SPEED := 3.0 - -@export var source: MeetSpook -@export var target: Node3D -@export var freeze_time: float -@export var lifespan: float - -var state := State.WAITING - -@onready var camera := get_viewport().get_camera_3d() - - -func activate() -> void: - state = State.FREEZE - get_tree().create_timer(freeze_time).timeout.connect(_unfreeze) - get_tree().create_timer(lifespan).timeout.connect(destroy) - source.resolve() - - -func is_active() -> bool: - return state != State.WAITING - - -func move_toward_target(delta: float) -> void: - # Should probably be overridden by implementations - global_position = global_position.move_toward(target.global_position, BASE_SPEED * delta) - - -func _unfreeze() -> void: - state = State.MOVING - - -func _physics_process(delta: float) -> void: - match state: - State.WAITING: - # Not yet seen by the player - if SceneTools.player_can_see(global_position): - activate() - State.FREEZE: - # Just stand there for a sec - pass - State.MOVING: - move_toward_target(delta) - - -func destroy() -> void: - queue_free() diff --git a/src/world/meet_spook/meet_spook_mob.gd.uid b/src/world/meet_spook/meet_spook_mob.gd.uid deleted file mode 100644 index 4065f80..0000000 --- a/src/world/meet_spook/meet_spook_mob.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://1trqaximxxmx diff --git a/src/world/meet_spook/meet_spook_spawner.gd b/src/world/meet_spook/meet_spook_spawner.gd deleted file mode 100644 index a69e27e..0000000 --- a/src/world/meet_spook/meet_spook_spawner.gd +++ /dev/null @@ -1,34 +0,0 @@ -class_name MeetSpookSpawner extends Marker3D -## Spawner which is part of a MeetSpook event - -## Time to freeze the mob before moving after being spotted, in seconds. -@export var freeze_time := 0.4 - -## Time after which the mob will despawn after being spotted, in seconds. -@export var mob_lifespan := 1.0 - -var _instance: MeetSpookMob - - -func get_target() -> Marker3D: - for c: Node in get_children(): - if c is Marker3D: - return c - return null - - -func spawn(instance: MeetSpookMob) -> void: - if is_instance_valid(_instance): - _instance.queue_free() - _instance = instance - _instance.target = get_target() - _instance.freeze_time = freeze_time - _instance.lifespan = mob_lifespan - add_child(_instance) - _instance.global_transform = global_transform - - -func resolve() -> void: - ## Despawn if instance is not active - if is_instance_valid(_instance) and not _instance.is_active(): - _instance.queue_free() diff --git a/src/world/meet_spook/meet_spook_spawner.gd.uid b/src/world/meet_spook/meet_spook_spawner.gd.uid deleted file mode 100644 index f2f7921..0000000 --- a/src/world/meet_spook/meet_spook_spawner.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://cisuvlqvqfqgo diff --git a/src/world/spook_manager/spook_manager.gd b/src/world/spook_manager/spook_manager.gd index 3c0ed5a..624fabe 100644 --- a/src/world/spook_manager/spook_manager.gd +++ b/src/world/spook_manager/spook_manager.gd @@ -50,12 +50,8 @@ func on_alert_raised(new_level: int) -> void: # Beast avoids the player. # Set up meet-spook. # Get closest MeetSpook point to player. - if Player.instance: - var closest := ( - SceneTools.closest_in_group(Player.instance, MeetSpook.GROUP) as MeetSpook - ) - if closest: - closest.prepare() + # TODO revise + pass 2: # LEVEL 2: AGGRESSIVE # Beast pursues player on sight.