All Steles placed, some specific objects placed, secret NPC placed

This commit is contained in:
Pal
2026-04-13 00:57:37 -07:00
parent 87fdc85353
commit c2fca6a16f
73 changed files with 1059 additions and 286 deletions

View File

@@ -31,53 +31,53 @@ public partial class BossRoomA : SpecialFloor, IBossRoom, IDungeonFloor
public void OnReady()
{
ActivateTrap.BodyEntered += ActivateTrap_BodyEntered;
_exit.AreaEntered += Exit_AreaEntered;
OxFace.HealthComponent.HealthReachedZero += CheckForBossFightEnd;
HorseHead.HealthComponent.HealthReachedZero += CheckForBossFightEnd;
ActivateTrap.BodyEntered += ActivateTrap_BodyEntered;
_exit.AreaEntered += Exit_AreaEntered;
OxFace.HealthComponent.HealthReachedZero += CheckForBossFightEnd;
HorseHead.HealthComponent.HealthReachedZero += CheckForBossFightEnd;
}
private void ActivateTrap_BodyEntered(Node3D body)
{
ActivateTrap.BodyEntered -= ActivateTrap_BodyEntered;
StartBossFight();
ActivateTrap.BodyEntered -= ActivateTrap_BodyEntered;
StartBossFight();
}
public void StartBossFight()
{
OxFaceStatue.Hide();
HorseHeadStatue.Hide();
OxFace.StartFight();
HorseHead.StartFight();
OxFaceStatue.Hide();
HorseHeadStatue.Hide();
OxFace.StartFight();
HorseHead.StartFight();
}
private void CheckForBossFightEnd()
{
if (OxFace.HealthComponent.CurrentHP.Value <= 0 && HorseHead.HealthComponent.CurrentHP.Value <= 0)
OnBossFightEnded();
if (OxFace.HealthComponent.CurrentHP.Value <= 0 && HorseHead.HealthComponent.CurrentHP.Value <= 0)
OnBossFightEnded();
}
public void OnBossFightEnded()
{
BossDoor.CallDeferred(MethodName.QueueFree);
BossDoor.CallDeferred(MethodName.QueueFree);
}
public void ExitReached()
=> Game.FloorExitReached();
=> Game.FloorExitReached();
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public override (Vector3 Rotation, Vector3 Position) GetPlayerSpawnPoint() { return (PlayerSpawnPoint.Rotation, new Vector3(PlayerSpawnPoint.GlobalPosition.X, -2.5f, PlayerSpawnPoint.GlobalPosition.Z)); }
public void OnExitTree()
{
ActivateTrap.BodyEntered -= ActivateTrap_BodyEntered;
_exit.AreaEntered -= Exit_AreaEntered;
OxFace.HealthComponent.HealthReachedZero -= CheckForBossFightEnd;
HorseHead.HealthComponent.HealthReachedZero -= CheckForBossFightEnd;
ActivateTrap.BodyEntered -= ActivateTrap_BodyEntered;
_exit.AreaEntered -= Exit_AreaEntered;
OxFace.HealthComponent.HealthReachedZero -= CheckForBossFightEnd;
HorseHead.HealthComponent.HealthReachedZero -= CheckForBossFightEnd;
}
}

View File

@@ -22,8 +22,8 @@ public partial class BossRoomB : SpecialFloor, IBossRoom, IDungeonFloor
public void OnReady()
{
ActivateTrap.BodyEntered += ActivateTrap_AreaEntered;
_exit.AreaEntered += Exit_AreaEntered;
ActivateTrap.BodyEntered += ActivateTrap_AreaEntered;
_exit.AreaEntered += Exit_AreaEntered;
}
private void ActivateTrap_AreaEntered(Node3D area) => StartBossFight();
@@ -35,21 +35,21 @@ public partial class BossRoomB : SpecialFloor, IBossRoom, IDungeonFloor
public void StartBossFight()
{
DemonWall.Activate();
DemonWall.Activate();
}
public void ExitReached()
=> Game.FloorExitReached();
=> Game.FloorExitReached();
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public void OnExitTree()
{
ActivateTrap.BodyEntered -= ActivateTrap_AreaEntered;
_exit.AreaEntered -= Exit_AreaEntered;
ActivateTrap.BodyEntered -= ActivateTrap_AreaEntered;
_exit.AreaEntered -= Exit_AreaEntered;
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,7 +1,8 @@
[gd_scene load_steps=19 format=3 uid="uid://bo20ffw2ygbks"]
[gd_scene load_steps=20 format=3 uid="uid://bo20ffw2ygbks"]
[ext_resource type="Script" uid="uid://xd6tx3lifebl" path="res://src/map/dungeon/code/SpecialFloor.cs" id="1_j4ho3"]
[ext_resource type="PackedScene" uid="uid://bodjd0em1q8s1" path="res://src/map/dungeon/models/Special Floors & Rooms/35. Goddess of Guidance's Floor/35_A2_GUIDANCE_FLOOR.glb" id="3_1ee1y"]
[ext_resource type="Texture2D" uid="uid://ctc2r4jjjyt4l" path="res://src/map/Placeables/Paintings/P1953216.jpg" id="4_teics"]
[ext_resource type="Shader" uid="uid://beg8sp6kw66w8" path="res://src/map/map shaders/GOGROOM Water.gdshader" id="16_q4do2"]
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_iajdo"]
@@ -176,4 +177,8 @@ surface_material_override/0 = SubResource("ShaderMaterial_savej")
[node name="35_A2_GUIDANCE_FLOOR" parent="." instance=ExtResource("3_1ee1y")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.74532, 0)
[node name="Sprite3D" type="Sprite3D" parent="."]
transform = Transform3D(-1.61732e-08, 0, 0.37, 0, 0.37, 0, -0.37, 0, -1.61732e-08, 4.88614, 2.41552, -67.5184)
texture = ExtResource("4_teics")
[editable path="35_A2_GUIDANCE_FLOOR"]

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=59 format=4 uid="uid://cnlw4fistem53"]
[gd_scene load_steps=60 format=4 uid="uid://cnlw4fistem53"]
[ext_resource type="Texture2D" uid="uid://dlku6x3aq0pns" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-Server/EXserver_WIRE.jpg" id="1_n13ju"]
[ext_resource type="Texture2D" uid="uid://c025gjwdd0ikh" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-Server/EXserver_metl27L.jpg" id="2_ymi8t"]
@@ -11,6 +11,7 @@
[ext_resource type="Texture2D" uid="uid://drpqtk8mbf4k" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-Server/EXserver_32.png" id="9_ymi8t"]
[ext_resource type="Texture2D" uid="uid://3cwvemmb1pc3" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-Server/EXserver_rust07L.jpg" id="10_7v3tx"]
[ext_resource type="Texture2D" uid="uid://swoxwtgtik0j" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-Server/EXserver_Panels 2_1024.png" id="11_s23v0"]
[ext_resource type="PackedScene" uid="uid://d6pjtdg6wh38" path="res://src/map/Placeables/Stele F.tscn" id="12_u8xph"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_f4kri"]
resource_name = "Material.001"
@@ -1100,3 +1101,12 @@ camera_attributes = SubResource("CameraAttributesPractical_8ry6s")
transform = Transform3D(-0.980955, 0.175167, -0.0839258, 0, 0.432086, 0.901833, 0.194234, 0.884657, -0.423857, -49.49, 69.351, 0)
shadow_enabled = true
shadow_blur = 3.051
[node name="SteleF" parent="." instance=ExtResource("12_u8xph")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.3072, 0.636905, 18.7862)
[node name="SteleF2" parent="." instance=ExtResource("12_u8xph")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -32.4542, 0.622075, 5.49706)
[node name="SteleF3" parent="." instance=ExtResource("12_u8xph")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -32.4542, 0.622075, -4.79838)

File diff suppressed because one or more lines are too long

View File

@@ -1,8 +1,11 @@
[gd_scene load_steps=22 format=3 uid="uid://ceo7ph483io44"]
[gd_scene load_steps=25 format=3 uid="uid://ceo7ph483io44"]
[ext_resource type="Script" uid="uid://cvj30id0i8ska" path="res://src/map/dungeon/code/BossRoomB.cs" id="1_bxvob"]
[ext_resource type="PackedScene" uid="uid://b3owhc620qisb" path="res://src/map/Placeables/Stele A.tscn" id="3_qmgbg"]
[ext_resource type="PackedScene" uid="uid://b1sapqymt8fo8" path="res://src/map/dungeon/special collision models/Boss Floor 2 Collision.glb" id="3_s7h55"]
[ext_resource type="PackedScene" uid="uid://863fl3tl6c07" path="res://src/map/dungeon/models/Special Floors & Rooms/34. Boss Floor B/34_A2_BOSS FLOOR B_VER.1.glb" id="8_7okc1"]
[ext_resource type="PackedScene" uid="uid://d6pjtdg6wh38" path="res://src/map/Placeables/Stele F.tscn" id="10_yfh3m"]
[ext_resource type="Texture2D" uid="uid://d0uya1t48x1xl" path="res://src/map/Placeables/Paintings/unnamed.jpg" id="11_j7n5i"]
[ext_resource type="PackedScene" uid="uid://bkfgwv46bvgnn" path="res://src/enemy/enemy_types/16. demon wall/DemonWall.tscn" id="25_k2q0o"]
[ext_resource type="Shader" uid="uid://crbilces53hat" path="res://src/map/map shaders/B2 Night Sky World Environment.gdshader" id="27_yu47a"]
[ext_resource type="Texture2D" uid="uid://bk2irsqn0sbex" path="res://src/map/assets/B2 Night Sky Star Textures.png" id="28_nlpir"]
@@ -108,6 +111,12 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -25.2903, 0)
[node name="34_A2_BOSS FLOOR B_VER_1" parent="Model" instance=ExtResource("8_7okc1")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.01132, 0, 0)
[node name="SteleA" parent="Model" instance=ExtResource("3_qmgbg")]
transform = Transform3D(-0.803815, 0, 0.594879, 0, 1, 0, -0.594879, 0, -0.803815, 7.70146, 25.3286, 111.481)
[node name="SteleA2" parent="Model" instance=ExtResource("3_qmgbg")]
transform = Transform3D(-0.689708, 0, -0.724088, 0, 1, 0, 0.724088, 0, -0.689708, 16.762, 25.3425, 111.331)
[node name="Collision" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -25.2903, 0)
@@ -184,33 +193,33 @@ unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.747, 0.102548, 55.334)
[node name="Skeleton3D" parent="DemonWall/EnemyModelView/RightArms/Arm7/Pivot/ARM7/7_ L AGNI CONE ARM" index="0"]
bones/0/position = Vector3(2.06259, -0.598552, -1.5676)
bones/0/rotation = Quaternion(0.517484, 0.168389, 0.622293, 0.562678)
bones/1/rotation = Quaternion(0.285883, 0.703599, -0.430296, 0.48792)
bones/2/rotation = Quaternion(-0.0956035, -0.0508778, -0.611516, 0.783786)
bones/3/rotation = Quaternion(-0.0133043, -0.0556612, 0.158815, 0.985648)
bones/4/rotation = Quaternion(-0.0185446, -0.0772043, 0.452899, 0.888019)
bones/5/rotation = Quaternion(0.247294, 0.0181257, -0.267751, 0.931035)
bones/6/rotation = Quaternion(-0.0881956, -0.030464, 0.162201, 0.982336)
bones/7/rotation = Quaternion(-0.197662, -0.0250548, 0.00315675, 0.979945)
bones/8/rotation = Quaternion(-0.331482, -0.055511, 0.0485094, 0.940577)
bones/9/rotation = Quaternion(0.24425, -0.0585444, 0.00495322, 0.967931)
bones/10/rotation = Quaternion(-0.116142, -0.0047481, 0.0156639, 0.993098)
bones/11/rotation = Quaternion(-0.181127, -0.0174884, 0.00400077, 0.983296)
bones/12/rotation = Quaternion(-0.402087, -0.0331238, 0.0554563, 0.91332)
bones/13/rotation = Quaternion(0.13286, -0.182256, 0.27098, 0.935789)
bones/14/rotation = Quaternion(-0.106977, 0.0136637, -0.138093, 0.98453)
bones/15/rotation = Quaternion(-0.247873, -0.00542301, 0.0679436, 0.966392)
bones/16/rotation = Quaternion(-0.316859, 0.0413942, 0.0545353, 0.945998)
bones/17/rotation = Quaternion(0.0620475, -0.161533, 0.513107, 0.840701)
bones/18/rotation = Quaternion(-0.0928098, 0.0289632, -0.265015, 0.95933)
bones/19/rotation = Quaternion(-0.142674, -0.0184692, -0.00334156, 0.989592)
bones/20/rotation = Quaternion(-0.393678, 0.0725746, 0.149042, 0.904178)
bones/21/position = Vector3(2.9239, 0.0601906, -3.33161)
bones/21/rotation = Quaternion(0.696872, 0.0493484, 0.416484, 0.581786)
bones/0/position = Vector3(2.24831, -0.602061, -1.50285)
bones/0/rotation = Quaternion(0.207458, 0.328286, 0.602457, 0.697305)
bones/1/rotation = Quaternion(0.050732, 0.564201, 0.177708, 0.804688)
bones/2/rotation = Quaternion(-0.0498223, 0.161951, -0.616795, 0.76867)
bones/3/rotation = Quaternion(-0.141599, -0.131086, 0.316286, 0.928832)
bones/4/rotation = Quaternion(0.0118663, 0.0360458, 0.229793, 0.972499)
bones/5/rotation = Quaternion(-0.0193011, 0.0238847, -0.235585, 0.971368)
bones/6/rotation = Quaternion(-0.166946, -0.0328334, 0.190411, 0.966848)
bones/7/rotation = Quaternion(-0.00712458, 0.0555583, 0.0162706, 0.998297)
bones/8/rotation = Quaternion(-0.199205, -0.0885586, 0.00298552, 0.975944)
bones/9/rotation = Quaternion(-0.0217858, 0.0258664, -0.0133952, 0.999338)
bones/10/rotation = Quaternion(-0.0510715, -0.00215271, -0.00483241, 0.998681)
bones/11/rotation = Quaternion(-0.12082, 0.00900195, 0.0128971, 0.99255)
bones/12/rotation = Quaternion(-0.115374, -0.0462822, -0.00618517, 0.992224)
bones/13/rotation = Quaternion(-0.0826512, -0.032811, 0.184509, 0.9788)
bones/14/rotation = Quaternion(-0.015995, 0.0897936, -0.167573, 0.981632)
bones/15/rotation = Quaternion(-0.248973, -0.0914085, 0.0414219, 0.963297)
bones/16/rotation = Quaternion(-0.087096, -0.000779027, -0.0713414, 0.993642)
bones/17/rotation = Quaternion(-0.0320236, -0.0865694, 0.360399, 0.928221)
bones/18/rotation = Quaternion(-0.0662556, 0.15776, -0.239014, 0.955821)
bones/19/rotation = Quaternion(-0.0158778, -0.0661597, -0.0346487, 0.997081)
bones/20/rotation = Quaternion(-0.182607, -0.0365199, 0.0743319, 0.979692)
bones/21/position = Vector3(2.73817, 0.0636646, -3.39638)
bones/21/rotation = Quaternion(0.758403, 0.0676363, 0.293461, 0.578041)
[node name="BoneAttachment3D" parent="DemonWall/EnemyModelView/RightArms/Arm7/Pivot/ARM7/7_ L AGNI CONE ARM/Skeleton3D" index="1"]
transform = Transform3D(-0.828966, -0.378655, 0.411626, 0.0379145, 0.69623, 0.716817, -0.558013, 0.609823, -0.562794, 1.08445, -1.17514, -0.0950186)
transform = Transform3D(-0.853993, -0.469564, 0.224067, 0.263099, -0.0182096, 0.964597, -0.44886, 0.88271, 0.139093, 0.93926, -0.252453, -0.229317)
[node name="CollisionShape3D" parent="DemonWall/EnemyModelView/RightArms/Arm7/Pivot/ARM7/7_ L AGNI CONE ARM/Skeleton3D/BoneAttachment3D/Projectile/Hitbox" index="0"]
transform = Transform3D(0.635844, 0.528577, -0.562441, 0.375355, 0.425019, 0.823709, 0.674439, -0.734846, 0.0718229, -1.8153, 4.65171, 12.6822)
@@ -301,6 +310,13 @@ mesh = SubResource("PlaneMesh_s2vdx")
skeleton = NodePath("../..")
surface_material_override/0 = SubResource("ShaderMaterial_3plo0")
[node name="SteleF" parent="." instance=ExtResource("10_yfh3m")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.93516, 0.236206, 149.418)
[node name="Sprite3D" type="Sprite3D" parent="."]
transform = Transform3D(-1.66103e-08, 0, -0.38, 0, 0.38, 0, 0.38, 0, -1.66103e-08, -8.01569, 3.62448, 149.91)
texture = ExtResource("11_j7n5i")
[editable path="Collision/Boss Floor 2 Collision"]
[editable path="DemonWall"]
[editable path="DemonWall/EnemyModelView"]

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=185 format=4 uid="uid://dvnc26rebk6o0"]
[gd_scene load_steps=188 format=4 uid="uid://dvnc26rebk6o0"]
[ext_resource type="Script" uid="uid://cuhfkyh3d7noa" path="res://src/map/dungeon/code/Overworld.cs" id="1_5hmt3"]
[ext_resource type="Texture2D" uid="uid://co6h8vyi11sl2" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_63.png" id="2_g6b7b"]
[ext_resource type="AudioStream" uid="uid://ym4ur8a2qxhp" path="res://src/audio/AMB/amb_perlin.wav" id="2_wbbo3"]
[ext_resource type="AudioStream" uid="uid://b7wxddjx3qw5o" path="res://src/audio/AMB/amb_white_noise.wav" id="3_c2gp5"]
[ext_resource type="AudioStream" uid="uid://ddii3pi8x75xc" path="res://src/audio/AMB/amb_beach.wav" id="3_pvi8n"]
[ext_resource type="AudioStream" uid="uid://ym4ur8a2qxhp" path="res://src/audio/amb/amb_perlin.wav" id="2_wbbo3"]
[ext_resource type="AudioStream" uid="uid://b7wxddjx3qw5o" path="res://src/audio/amb/amb_white_noise.wav" id="3_c2gp5"]
[ext_resource type="AudioStream" uid="uid://ddii3pi8x75xc" path="res://src/audio/amb/amb_beach.wav" id="3_pvi8n"]
[ext_resource type="Texture2D" uid="uid://w33fr6exryiy" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_37.png" id="3_uyygh"]
[ext_resource type="Texture2D" uid="uid://dv10yaqvp3mub" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_71.png" id="4_r8r3k"]
[ext_resource type="Shader" uid="uid://brhf7s3riyag5" path="res://src/map/map shaders/Metal.gdshader" id="5_d1qcb"]
@@ -37,8 +37,11 @@
[ext_resource type="Texture2D" uid="uid://b88bm86hnc8m6" path="res://src/map/overworld/Overworld Fixes Models/Overworld Reexport Fixes_stone_column_carved.png" id="29_8ti3u"]
[ext_resource type="Texture2D" uid="uid://co3s2s5tswuj4" path="res://src/map/overworld/Overworld Fixes Models/Overworld Reexport Fixes_MOSAIC.png" id="30_6gklp"]
[ext_resource type="Texture2D" uid="uid://pu4o1pwi6hnf" path="res://src/map/overworld/Overworld Fixes Models/Overworld Reexport Fixes_rock_outside_colored_CORRECTED1.png" id="31_kdqo4"]
[ext_resource type="PackedScene" uid="uid://r5d74jsx8tq6" path="res://src/map/Placeables/Stele B.tscn" id="32_xqf5a"]
[ext_resource type="PackedScene" uid="uid://dqjovmlt1y4tb" path="res://src/map/Placeables/Sarco.tscn" id="59_mic3u"]
[ext_resource type="PackedScene" uid="uid://doncarj3f8iua" path="res://src/vfx/Torch.tscn" id="60_xqf5a"]
[ext_resource type="PackedScene" uid="uid://b3owhc620qisb" path="res://src/map/Placeables/Stele A.tscn" id="61_v60tm"]
[ext_resource type="PackedScene" uid="uid://cn13lho2so7sr" path="res://src/map/Placeables/Stele E.tscn" id="62_o5pdk"]
[ext_resource type="Script" uid="uid://b83kye8yinfxs" path="res://src/audio/AmbientSFXPlayer3D.cs" id="66_q7hpd"]
[ext_resource type="Texture2D" uid="uid://c38grr8d22ukg" path="res://src/map/assets/Overworld Assetts/cloudscape.png" id="67_uyygh"]
[ext_resource type="Shader" uid="uid://d3pf3ubk3lwwt" path="res://src/map/map shaders/Overworld Sea Fog Layer.gdshader" id="70_uyygh"]
@@ -357,19 +360,6 @@ subdivide_depth = 100
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gdgdy"]
albedo_texture = ExtResource("80_0u0mt")
[sub_resource type="FastNoiseLite" id="FastNoiseLite_2wk0d"]
noise_type = 2
frequency = 0.0141
[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_vmdvy"]
seamless = true
noise = SubResource("FastNoiseLite_2wk0d")
[sub_resource type="FogMaterial" id="FogMaterial_b6pah"]
density = 0.5
albedo = Color(0.0177324, 0.0177324, 0.0177324, 1)
density_texture = SubResource("NoiseTexture3D_vmdvy")
[sub_resource type="Animation" id="Animation_r8r3k"]
resource_name = "Cloud Rotation 1"
length = 1600.0
@@ -1083,6 +1073,19 @@ shader_parameter/emission_energy = 0.33
shader_parameter/uv1_scale = Vector3(5, 0, 0)
shader_parameter/uv1_offset = Vector3(0, 1, 0)
[sub_resource type="FastNoiseLite" id="FastNoiseLite_2wk0d"]
noise_type = 2
frequency = 0.0141
[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_vmdvy"]
seamless = true
noise = SubResource("FastNoiseLite_2wk0d")
[sub_resource type="FogMaterial" id="FogMaterial_b6pah"]
density = 0.5
albedo = Color(0.0177324, 0.0177324, 0.0177324, 1)
density_texture = SubResource("NoiseTexture3D_vmdvy")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5c8gu"]
resource_name = "FAR CLIFFS"
transparency = 2
@@ -1970,7 +1973,6 @@ skeleton = NodePath("")
[node name="Utility Meshes" type="Node3D" parent="Node3D"]
transform = Transform3D(27.9, 0, 0, 0, 27.9, 0, 0, 0, 27.9, -248.608, 139.71, 58.538)
visible = false
[node name="BLOCKER1" type="MeshInstance3D" parent="Node3D/Utility Meshes"]
transform = Transform3D(1.325, 0, 0, 0, 1.325, 0, 0, 0, 1.325, 0.466, -3.173, -0.192)
@@ -1992,11 +1994,6 @@ transform = Transform3D(0.43369, 0.901062, 0, -0.901062, 0.43369, 0, 0, 0, 1.46,
mesh = SubResource("PlaneMesh_322om")
skeleton = NodePath("../../Lighting And Environment/DirectionalLight3D")
[node name="BLOCKER5" type="MeshInstance3D" parent="Node3D/Utility Meshes"]
transform = Transform3D(0.636254, 0, 0.77148, 0, 1, 0, -0.77148, 0, 0.636254, -13.6112, -3.08228, -1.75127)
mesh = SubResource("PlaneMesh_322om")
skeleton = NodePath("../../Lighting And Environment/DirectionalLight3D")
[node name="OW_gate" parent="Node3D" instance=ExtResource("109_8vsb2")]
transform = Transform3D(1.00285, 0, -4.02701, 0, 4.15, 0, 4.02701, 0, 1.00285, -468.91, 8.74117, -47.3348)
@@ -2039,16 +2036,6 @@ transform = Transform3D(0.713424, 0, -0.394023, 0, 0.6, 0, 0.621242, 0, 0.452489
mesh = SubResource("PlaneMesh_cqjgr")
surface_material_override/0 = SubResource("StandardMaterial3D_gdgdy")
[node name="FogVolume" type="FogVolume" parent="Node3D"]
transform = Transform3D(0.836056, 0, -0.548643, 0, 1, 0, 0.548643, 0, 0.836056, -568.667, 3.30841, -40.5499)
size = Vector3(52.6559, 36.9058, 49.8839)
material = SubResource("FogMaterial_b6pah")
[node name="FogVolume2" type="FogVolume" parent="Node3D"]
transform = Transform3D(0.981734, 0, 0.190261, 0, 1, 0, -0.190261, 0, 0.981734, -529.086, 3.30841, -30.809)
size = Vector3(75.5916, 36.9058, 44.4758)
material = SubResource("FogMaterial_b6pah")
[node name="Audio" type="Node3D" parent="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -350.758, -3.90238, 113.556)
@@ -2156,6 +2143,9 @@ cast_shadow = 0
mesh = SubResource("ArrayMesh_5chdm")
skeleton = NodePath("")
[node name="SteleB" parent="Node3D/VFX/Overworld_CLOUD_RINGS_OUTTER" instance=ExtResource("32_xqf5a")]
transform = Transform3D(0.0229694, 0, 1.00984, 0, 1.0101, 0, -1.00984, 0, 0.0229694, -231.055, -92.9588, 87.3177)
[node name="GPUParticles3D" type="GPUParticles3D" parent="Node3D/VFX"]
transform = Transform3D(0.0335086, 0, -3.28487, 0, 1.155, 0, 3.83985, 0, 0.0286656, 140.149, 46.4442, -43.7444)
amount = 56
@@ -2208,7 +2198,7 @@ environment = SubResource("Environment_8isf0")
camera_attributes = SubResource("CameraAttributesPractical_8nnl3")
[node name="Well Spotlight 2" type="SpotLight3D" parent="Node3D/Lighting And Environment"]
transform = Transform3D(1.45636, 0.0100008, -0.417868, 0.417988, -0.0348448, 1.45594, 0, -1.51472, -0.0362516, -283.819, 49.9075, -89.6986)
transform = Transform3D(0.961195, 0.00660047, -0.275792, 0.275871, -0.0229976, 0.960919, -2.98023e-08, -0.999714, -0.023926, -283.819, 49.9075, -89.6986)
light_energy = 0.369
light_volumetric_fog_energy = 0.809
spot_range = 60.8934
@@ -2270,7 +2260,7 @@ spot_attenuation = 0.32
spot_angle = 28.5323
[node name="Interior Passage Light 2" type="OmniLight3D" parent="Node3D/Lighting And Environment"]
transform = Transform3D(1.51515, 0, 0, 0, 1.51515, 0, 0, 0, 1.51515, 150.321, 13.0597, -61.8328)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 150.321, 13.0597, -61.8328)
light_volumetric_fog_energy = 1.671
shadow_enabled = true
shadow_blur = 1.12
@@ -2278,31 +2268,41 @@ omni_range = 20.0
omni_attenuation = 1.583
[node name="Interior Passage Light" type="OmniLight3D" parent="Node3D/Lighting And Environment"]
transform = Transform3D(1.51515, 0, 0, 0, 1.51515, 0, 0, 0, 1.51515, 150.226, 12.9002, -50.4804)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 150.226, 12.9002, -50.4804)
shadow_enabled = true
shadow_blur = 3.832
omni_range = 20.163
omni_attenuation = 1.347
[node name="Water Light" type="OmniLight3D" parent="Node3D/Lighting And Environment"]
transform = Transform3D(1.51515, 0, 0, 0, 1.51515, 0, 0, 0, 1.51515, 125.782, 11.4255, 19.552)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 125.782, 11.4255, 19.552)
light_color = Color(0.672, 1, 0.59, 1)
light_energy = 1.115
omni_range = 45.654
omni_attenuation = 0.538
[node name="Temple Entrance Light 2" type="OmniLight3D" parent="Node3D/Lighting And Environment"]
transform = Transform3D(1.51515, 0, 0, 0, 1.51515, 0, 0, 0, 1.51515, 84.0754, 15.0426, -56.2706)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 84.0754, 15.0426, -56.2706)
light_energy = 0.329
shadow_enabled = true
omni_range = 60.893
[node name="Temple Entrance Light" type="OmniLight3D" parent="Node3D/Lighting And Environment"]
transform = Transform3D(1.51515, 0, 0, 0, 1.51515, 0, 0, 0, 1.51515, 84.1082, 14.7405, -56.0596)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 84.1082, 14.7405, -56.0596)
light_energy = 0.329
shadow_enabled = true
omni_range = 60.893
[node name="FogVolume" type="FogVolume" parent="Node3D/Lighting And Environment"]
transform = Transform3D(0.836056, 0, -0.548643, 0, 1, 0, 0.548643, 0, 0.836056, -217.909, 7.21079, -154.106)
size = Vector3(52.6559, 36.9058, 49.8839)
material = SubResource("FogMaterial_b6pah")
[node name="FogVolume2" type="FogVolume" parent="Node3D/Lighting And Environment"]
transform = Transform3D(0.981734, 0, 0.190261, 0, 1, 0, -0.190261, 0, 0.981734, -178.328, 7.21079, -144.365)
size = Vector3(75.5916, 36.9058, 44.4758)
material = SubResource("FogMaterial_b6pah")
[node name="Item Transport" type="Node3D" parent="Node3D"]
[node name="FAR SCENERY" type="MeshInstance3D" parent="Node3D"]
@@ -2442,6 +2442,18 @@ visible = false
[node name="Sarco" parent="." instance=ExtResource("59_mic3u")]
transform = Transform3D(0.307782, 0, -0.50921, 0, 0.595, 0, 0.50921, 0, 0.307782, -296.51, 2.61698, 3.30074)
[node name="SteleA" parent="." instance=ExtResource("61_v60tm")]
transform = Transform3D(0.895323, 0, -0.445417, 0, 1, 0, 0.445417, 0, 0.895323, -178.415, 2.68571, 22.9588)
[node name="SteleA2" parent="." instance=ExtResource("61_v60tm")]
transform = Transform3D(-0.406242, 0, -0.913765, 0, 1, 0, 0.913765, 0, -0.406242, -453.978, 2.31282, 21.9585)
[node name="SteleA3" parent="." instance=ExtResource("61_v60tm")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -246.379, 2.49829, 9.49494)
[node name="SteleE" parent="." instance=ExtResource("62_o5pdk")]
transform = Transform3D(0.0221235, 0, 0.49951, 0, 0.5, 0, -0.49951, 0, 0.0221235, -185.53, 2.42495, 46.2437)
[editable path="Node3D/Actors/Rat"]
[editable path="Node3D/Actors/Clalo"]
[editable path="Node3D/Actors/Caretaker of Saints"]

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=99 format=4 uid="uid://c5eon2dk4ojua"]
[gd_scene load_steps=100 format=4 uid="uid://c5eon2dk4ojua"]
[ext_resource type="Script" uid="uid://bccyfmj8ikewh" path="res://src/map/dungeon/code/SpecialRoom.cs" id="1_plyiv"]
[ext_resource type="Texture2D" uid="uid://b3ypwr2e1o8ip" path="res://src/map/dungeon/models/Area 1/Ran/ran-fix_COLUM6N.png" id="3_plyiv"]
@@ -24,6 +24,7 @@
[ext_resource type="Texture2D" uid="uid://28tm1duewpt" path="res://src/map/dungeon/models/Area 1/Ran/ran-fix_yellow_grunge_glass.png" id="23_e0cd2"]
[ext_resource type="PackedScene" uid="uid://jds3hr41coal" path="res://src/npc/Ran/Ran.tscn" id="24_81jou"]
[ext_resource type="Texture2D" uid="uid://c1gpougpbu4ww" path="res://src/map/dungeon/models/Area 1/Ran/ran-fix_FLOOR4.png" id="24_w2vdn"]
[ext_resource type="PackedScene" uid="uid://cn13lho2so7sr" path="res://src/map/Placeables/Stele E.tscn" id="26_8yn83"]
[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="27_x1yce"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bawr2"]
@@ -1797,7 +1798,7 @@ shape = SubResource("BoxShape3D_81jou")
unique_name_in_owner = true
[node name="MeshInstance3D" type="MeshInstance3D" parent="Room/MinimapShadow"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0729809, 0, -0.117586)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0729809, -2.05954, -0.117586)
layers = 2
sorting_offset = 100.0
mesh = SubResource("PlaneMesh_2wejk")
@@ -1865,3 +1866,6 @@ lifetime = 41.19
local_coords = true
process_material = SubResource("ParticleProcessMaterial_x03a5")
draw_pass_1 = SubResource("QuadMesh_06lbc")
[node name="SteleE" parent="." instance=ExtResource("26_8yn83")]
transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -5.37775, 0.06335, -16.6459)

View File

@@ -171,7 +171,7 @@ shape = SubResource("BoxShape3D_nuwng")
unique_name_in_owner = true
[node name="MeshInstance3D" type="MeshInstance3D" parent="Room/MinimapShadow"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.020082, -1.79194, 0.0304482)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.020082, -1.92358, 0.0304482)
layers = 2
sorting_offset = 100.0
mesh = SubResource("PlaneMesh_f607g")

View File

@@ -1,10 +1,11 @@
[gd_scene load_steps=31 format=3 uid="uid://b1oayub1dt5ag"]
[gd_scene load_steps=32 format=3 uid="uid://b1oayub1dt5ag"]
[ext_resource type="Script" uid="uid://bccyfmj8ikewh" path="res://src/map/dungeon/code/SpecialRoom.cs" id="1_2ejwg"]
[ext_resource type="PackedScene" uid="uid://daqy6iewa3wpy" path="res://src/map/dungeon/models/Area 2/Dismantled/A2-Dismantled.glb" id="2_kepl6"]
[ext_resource type="Texture2D" uid="uid://cl4tuxjoouokq" path="res://src/vfx/World/rose petal 1.png" id="4_2ejwg"]
[ext_resource type="Shader" uid="uid://dj3ut2w0lnwq2" path="res://src/map/map shaders/Overworld God Rays.gdshader" id="4_ohig7"]
[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="5_2ejwg"]
[ext_resource type="PackedScene" uid="uid://0aqllfpimgq" path="res://src/map/Placeables/Stele D.tscn" id="6_2ejwg"]
[sub_resource type="CylinderShape3D" id="CylinderShape3D_e2vx2"]
height = 5.66602
@@ -264,3 +265,6 @@ lifetime = 41.19
local_coords = true
process_material = SubResource("ParticleProcessMaterial_twy7h")
draw_pass_1 = SubResource("QuadMesh_tni1f")
[node name="SteleD" parent="." instance=ExtResource("6_2ejwg")]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3.25935, 0.0555704, 8.9957)

View File

@@ -1,9 +1,8 @@
[gd_scene load_steps=25 format=3 uid="uid://cuau7xgx3rkxu"]
[gd_scene load_steps=24 format=3 uid="uid://cuau7xgx3rkxu"]
[ext_resource type="Script" uid="uid://bccyfmj8ikewh" path="res://src/map/dungeon/code/SpecialRoom.cs" id="1_w3a78"]
[ext_resource type="PackedScene" uid="uid://dekf66gxvufrt" path="res://src/map/dungeon/models/Area 2/Proscenium/A2-Proscenium.glb" id="2_vbs5p"]
[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="5_wpyu0"]
[ext_resource type="PackedScene" uid="uid://bhsoehmr37aws" path="res://src/npc/Proscenium/Proscenium.tscn" id="32_t4lrk"]
[sub_resource type="BoxShape3D" id="BoxShape3D_u1ybt"]
size = Vector3(3.95313, 8.42651, 10.8324)
@@ -119,10 +118,12 @@ shape = SubResource("BoxShape3D_ncyu1")
[node name="CollisionShape3D5" type="CollisionShape3D" parent="Collision/StaticBody3D2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 21.358, 3.85089, 1.37329)
shape = SubResource("CylinderShape3D_orhq3")
debug_color = Color(0, 0.595, 0.7, 1)
[node name="CollisionShape3D6" type="CollisionShape3D" parent="Collision/StaticBody3D2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.7547, 2.66736, -19.7642)
shape = SubResource("CylinderShape3D_orhq3")
debug_color = Color(0, 0.595, 0.7, 1)
[node name="CollisionShape3D7" type="CollisionShape3D" parent="Collision/StaticBody3D2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.96822, -0.528496, -3.93219)
@@ -209,38 +210,11 @@ shape = SubResource("BoxShape3D_nu4bg")
unique_name_in_owner = true
[node name="MeshInstance3D" type="MeshInstance3D" parent="Room/MinimapShadow"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.0048, -2.09774, 0.0293603)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.0048, -2.36546, 0.0293603)
layers = 2
sorting_offset = 100.0
mesh = SubResource("PlaneMesh_w3a78")
[node name="NPC" type="Node3D" parent="."]
transform = Transform3D(0.535, 0, 0, 0, 0.535, 0, 0, 0, 0.535, 1.27456, 1.75386, 0)
[node name="Proscenium" parent="NPC" instance=ExtResource("32_t4lrk")]
transform = Transform3D(-5.24537e-08, 0, 1.2, 0, 1.2, 0, -1.2, 0, -5.24537e-08, 8.65444, 1.80024, -0.184306)
[node name="AnimatedSprite3D" parent="NPC/Proscenium" index="0"]
transform = Transform3D(1.1, 0, 7.10543e-15, 0, 1.1, 0, -7.10543e-15, 0, 1.1, 0, 0.0548556, 0)
[node name="Collision" parent="NPC/Proscenium" index="1"]
visible = false
[node name="CollisionShape3D" parent="NPC/Proscenium/Collision" index="0"]
visible = false
[node name="Hitbox" parent="NPC/Proscenium" index="2"]
visible = false
[node name="CollisionShape3D" parent="NPC/Proscenium/Hitbox" index="0"]
visible = false
[node name="DialogueZone" parent="NPC/Proscenium" index="4"]
visible = false
[node name="CollisionShape3D" parent="NPC/Proscenium/DialogueZone" index="0"]
visible = false
[node name="Light" type="Node3D" parent="."]
[node name="OmniLight3D2" type="OmniLight3D" parent="Light"]
@@ -260,5 +234,3 @@ lifetime = 41.19
local_coords = true
process_material = SubResource("ParticleProcessMaterial_vwwuc")
draw_pass_1 = SubResource("QuadMesh_386pt")
[editable path="NPC/Proscenium"]