Edit dialogue balloons

This commit is contained in:
2025-12-01 01:01:33 -08:00
parent 4ee4e02a51
commit edff41af22
23 changed files with 346 additions and 263 deletions

View File

@@ -17,21 +17,33 @@ public partial class Altar : Node3D, IDungeonFloor
[Node] private Marker3D PlayerSpawnPoint { get; set; } = default!;
[Node] private Area3D NoExitArea { get; set; } = default!;
public ImmutableList<IDungeonRoom> Rooms => [];
[Export] public Resource Dialogue { get; set; } = default!;
public bool FloorIsLoaded { get; set; }
public override void _Ready()
{
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
Show();
Exit.AreaEntered += Exit_AreaEntered;
NoExitArea.AreaEntered += NoExitArea_AreaEntered;
FloorIsLoaded = true;
}
private void NoExitArea_AreaEntered(Area3D area)
{
DialogueController.ShowDialogue(Dialogue, "no_exit");
//if (area.GetOwner() is IPlayer player)
// player.Deactivate();
}
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public void ExitReached() => Game.FloorExitReached();

View File

@@ -1,6 +1,7 @@
[gd_scene load_steps=58 format=4 uid="uid://dl6h1djc27ddl"]
[gd_scene load_steps=60 format=4 uid="uid://dl6h1djc27ddl"]
[ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Altar.cs" id="1_5jip8"]
[ext_resource type="Resource" uid="uid://bqnfw6r4085yv" path="res://src/dialog/Altar.dialogue" id="2_3jpsj"]
[ext_resource type="Texture2D" uid="uid://b27ksiyfefb33" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_outside_desert.png" id="2_fsslh"]
[ext_resource type="Texture2D" uid="uid://cmfhbi07s4v5x" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_BOULDER_DARK.png" id="3_ownfb"]
[ext_resource type="Texture2D" uid="uid://cfo5c1twdrnea" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_concrete_0025_color_1k.jpg" id="4_5ln1c"]
@@ -724,8 +725,12 @@ dof_blur_far_enabled = true
dof_blur_far_distance = 29.84
dof_blur_amount = 0.06
[sub_resource type="BoxShape3D" id="BoxShape3D_tp2pi"]
size = Vector3(4.52301, 7.56061, 15.4608)
[node name="Floor0" type="Node3D"]
script = ExtResource("1_5jip8")
Dialogue = ExtResource("2_3jpsj")
[node name="Model" type="Node3D" parent="."]
@@ -880,3 +885,12 @@ light_color = Color(0.741575, 0.674356, 0.615845, 1)
light_energy = 3.762
shadow_enabled = true
shadow_blur = 2.832
[node name="NoExitArea" type="Area3D" parent="."]
unique_name_in_owner = true
collision_layer = 0
collision_mask = 64
[node name="CollisionShape3D" type="CollisionShape3D" parent="NoExitArea"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 51.4926, -2.06593, -2.02953)
shape = SubResource("BoxShape3D_tp2pi")

View File

@@ -4295,36 +4295,36 @@ script = ExtResource("1_0h3lb")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.327652, -16.1644, 0)
[node name="2_001" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 28.0257)
transform = Transform3D(0.420615, 4.99653e-08, -2.03649e-08, -5.28814e-08, 0.350217, -0.232947, 1.07156e-08, -0.232947, -0.350217, -130.9, 19.1732, 28.0257)
layers = 524288
mesh = SubResource("ArrayMesh_kw6od")
skeleton = NodePath("")
[node name="2_002" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 5.78354e-08, -1.39003e-08, -5.87984e-08, 0.389404, -0.159001, 8.99407e-09, -0.159001, -0.389404, -133.608, 19.3244, 6.98554)
transform = Transform3D(0.420615, 2.12659e-08, 2.99856e-08, -3.67611e-08, 0.243457, 0.342995, 1.45129e-11, 0.342995, -0.243457, -133.608, 19.3244, 6.98554)
layers = 524288
mesh = SubResource("ArrayMesh_mug6s")
skeleton = NodePath("")
[node name="2_003" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 6.86731)
transform = Transform3D(0.420615, 4.99653e-08, -2.03649e-08, -5.28814e-08, 0.350217, -0.232947, 1.07156e-08, -0.232947, -0.350217, -130.9, 19.1732, 6.86731)
layers = 524288
mesh = SubResource("ArrayMesh_xx38s")
skeleton = NodePath("")
[node name="2_004" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 5.78354e-08, -1.39003e-08, -5.87984e-08, 0.389404, -0.159001, 8.99407e-09, -0.159001, -0.389404, -133.608, 19.3244, 28.144)
transform = Transform3D(0.420615, 2.12659e-08, 2.99856e-08, -3.67611e-08, 0.243457, 0.342995, 1.45129e-11, 0.342995, -0.243457, -133.608, 19.3244, 28.144)
layers = 524288
mesh = SubResource("ArrayMesh_ct7uo")
skeleton = NodePath("")
[node name="2_005" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 28.0257)
transform = Transform3D(0.420615, 4.99653e-08, -2.03649e-08, -5.28814e-08, 0.350217, -0.232947, 1.07156e-08, -0.232947, -0.350217, -130.9, 19.1732, 28.0257)
mesh = SubResource("ArrayMesh_2l4dv")
skeleton = NodePath("")
[node name="2_006" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 28.0257)
transform = Transform3D(0.420615, 4.99653e-08, -2.03649e-08, -5.28814e-08, 0.350217, -0.232947, 1.07156e-08, -0.232947, -0.350217, -130.9, 19.1732, 28.0257)
mesh = SubResource("ArrayMesh_k0kv6")
skeleton = NodePath("")
@@ -4853,11 +4853,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -240.071, 36.4279, 34.624)
visible = false
shape = SubResource("BoxShape3D_pkvyy")
[node name="HorseHeadStatue" parent="Room" instance=ExtResource("24_r1rk5")]
[node name="Horse Head" type="Node3D" parent="Room"]
[node name="HorseHeadStatue" parent="Room/Horse Head" instance=ExtResource("24_r1rk5")]
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -102.157, -2.30863, 13.3664)
[node name="HorseFace" parent="Room" instance=ExtResource("25_a482y")]
[node name="HorseFace" parent="Room/Horse Head" instance=ExtResource("25_a482y")]
unique_name_in_owner = true
transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -102.157, -0.510939, 13.3664)
visible = false
@@ -4865,13 +4867,17 @@ PrimaryAttackElementalType = null
PrimaryAttackElementalDamageBonus = null
InitialHP = null
[node name="OxFaceStatue" parent="Room" instance=ExtResource("26_futcf")]
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -101.555, -2.30863, 21.5833)
[node name="OxFace" type="Node3D" parent="Room"]
transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -102.157, -0.510939, 13.3664)
[node name="OxFace" parent="Room" instance=ExtResource("27_g6y6v")]
[node name="OxFaceStatue" parent="Room/OxFace" instance=ExtResource("26_futcf")]
unique_name_in_owner = true
transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -101.703, -0.479859, 22.0955)
transform = Transform3D(6.66667, 0, 0, 0, 6.66667, 0, 0, 0, 6.66667, 54.7793, -11.9846, -4.01331)
visible = false
[node name="OxFace" parent="Room/OxFace" instance=ExtResource("27_g6y6v")]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 58.194, 0.2072, -3.02661)
visible = false
PrimaryAttackElementalType = null
PrimaryAttackElementalDamageBonus = null