Work SFX work

Fix up Eden Pillar behavior
This commit is contained in:
2025-11-26 02:12:24 -08:00
parent db7a1df1f7
commit ed9e611fd9
86 changed files with 2822 additions and 2603 deletions

View File

@@ -24,7 +24,7 @@ public partial class MonsterRoom : DungeonRoom
public void SpawnEnemies(Godot.Collections.Dictionary<EnemyType, float> enemyInfo)
{
if (enemyInfo == null || enemyInfo.Count == 0)
if (enemyInfo == null || !enemyInfo.Any(x => x.Value > 0))
return;
var rng = new RandomNumberGenerator();

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=21 format=3 uid="uid://c5ekisphioovm"]
[gd_scene load_steps=22 format=3 uid="uid://c5ekisphioovm"]
[ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_cfhj4"]
[ext_resource type="PackedScene" uid="uid://dhkbvos11tkdw" path="res://src/map/dungeon/rooms/Set A/12. Jump Scare Room.tscn" id="1_crv4e"]
@@ -13,6 +13,7 @@
[ext_resource type="PackedScene" uid="uid://cam640h4euewx" path="res://src/map/dungeon/rooms/Set A/05. Pit Room A.tscn" id="12_4sygy"]
[ext_resource type="PackedScene" uid="uid://cdkcvd7pwmr2r" path="res://src/map/assets/Dungeon Doors/DOORA.tscn" id="12_hkp1m"]
[ext_resource type="Script" uid="uid://b8bvom6o034gm" path="res://src/quest/QuestTest.cs" id="13_hkp1m"]
[ext_resource type="PackedScene" uid="uid://cmvimr0pvsgqy" path="res://src/enemy/enemy_types/10. Eden Pillar/Eden Pillar.tscn" id="14_hsujv"]
[sub_resource type="Environment" id="Environment_yrcgx"]
background_mode = 1
@@ -227,3 +228,11 @@ navigation_mesh = SubResource("NavigationMesh_hkp1m")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.41175, 1.02274, 0)
visible = false
mesh = SubResource("PlaneMesh_hkp1m")
[node name="Eden Pillar" parent="." instance=ExtResource("14_hsujv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.8435, 0, 0)
[node name="CSGBox3D" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.4918, 1.20905, -1.40112)
use_collision = true
size = Vector3(1, 3.41809, 3.80225)

View File

@@ -794,10 +794,8 @@ radius = 2.0
size = Vector3(36, 8, 36)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_06rpm"]
shading_mode = 0
albedo_texture = ExtResource("6_5ju0l")
emission_enabled = true
emission = Color(1, 1, 1, 1)
emission_energy_multiplier = 0.0
texture_filter = 0
[sub_resource type="PlaneMesh" id="PlaneMesh_gx7da"]
@@ -1119,6 +1117,7 @@ shape = SubResource("BoxShape3D_c4wqw")
[node name="Minimap" type="MeshInstance3D" parent="Minimap"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18, 0, 17.9999)
visible = false
layers = 2
mesh = SubResource("PlaneMesh_gx7da")

View File

@@ -565,8 +565,8 @@ layers = 2
mesh = SubResource("PlaneMesh_5n72k")
surface_material_override/0 = SubResource("StandardMaterial3D_l1s1j")
[node name="Sprite3D" type="Sprite3D" parent="Minimap"]
transform = Transform3D(5.67, 0, 0, 0, -2.47844e-07, 5.67, 0, -5.67, -2.47844e-07, 0, 0.721614, -4.4148)
[node name="Sprite3D" type="Sprite3D" parent="Minimap/Minimap"]
transform = Transform3D(-2.47844e-07, -5.67, -2.47844e-07, 0, -2.47844e-07, 5.67, -5.67, 2.47844e-07, 1.08336e-14, -2.4288, 3.94786, 0)
layers = 2
texture_filter = 0
texture = ExtResource("4_ljhl3")