Misc Fixes Round 2

This commit is contained in:
Pal
2026-04-29 00:43:04 -07:00
parent ba95d4dbdf
commit 507b7e6a83
25 changed files with 131 additions and 126 deletions

View File

@@ -4639,7 +4639,6 @@ unique_name_in_owner = true
transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, 1.76027, 0)
pixel_size = 0.015
billboard = 2
shaded = true
alpha_cut = 1
texture_filter = 0
render_priority = 100

View File

@@ -17,7 +17,7 @@ Name = "Blast Armor"
StatDescription = ""
FlavorText = "Tremendously durable armor adapted from the outer casing of scouting androids that found their way to the Tower near the end of the final millenium.
The souls of synthetic life had little time to accrue grave sins and as such purified far sooner than their creators."
SpawnRate = 0.3
SpawnRate = 0.01
BonusAttack = 0
BonusDefense = 9
BonusLuck = 0

View File

@@ -18,7 +18,7 @@ StatDescription = "Raises LUCK."
FlavorText = "Attire donned by a caring, but cunning, leader in the world below.
At it's height, the temple complex was a haven for the ostracized and the estranged.
"
SpawnRate = 0.503
SpawnRate = 0.02
BonusAttack = 0
BonusDefense = 6
BonusLuck = 5

View File

@@ -14,7 +14,7 @@ Name = "Kathari"
StatDescription = ""
FlavorText = "Common punch dagger used as a sidearm.
Quick and useful in close quarters. "
SpawnRate = 0.6
SpawnRate = 0.4
BonusAttack = 1
BonusDefense = 0
BonusLuck = 0

View File

@@ -16,7 +16,7 @@ FlavorText = "A blade outside time and beyond reproach.
It's companion blade was surrendered long ago, amidst the shedding of tears.
"
SpawnRate = 0.25
SpawnRate = 0.05
BonusAttack = 9
BonusDefense = 0
BonusLuck = 0.05

View File

@@ -19,7 +19,7 @@ script = ExtResource("1_4snqm")
[node name="Model" type="Node3D" parent="."]
[node name="CA2_1BLOCK" parent="Model" instance=ExtResource("2_4snqm")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.45451, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.445, 0)
[node name="Room" type="Node3D" parent="."]

View File

@@ -19,7 +19,7 @@ script = ExtResource("1_wf6mw")
[node name="Model" type="Node3D" parent="."]
[node name="CA2_2BLOCK" parent="Model" instance=ExtResource("2_wf6mw")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.45367, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.444, 0)
[node name="Room" type="Node3D" parent="."]

View File

@@ -22,7 +22,7 @@ script = ExtResource("1_v580m")
[node name="Model" type="Node3D" parent="."]
[node name="area 2 3block" parent="Model" instance=ExtResource("2_v580m")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.46519, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.45, 0)
[node name="Room" type="Node3D" parent="."]

View File

@@ -22,7 +22,7 @@ script = ExtResource("1_hceu2")
[node name="Model" type="Node3D" parent="."]
[node name="CA2_5BLOCK" parent="Model" instance=ExtResource("2_hceu2")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.46146, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.45, 0)
[node name="Collisions" type="Node3D" parent="."]

View File

@@ -34,6 +34,7 @@ script = ExtResource("1_aknhk")
[node name="Model" type="Node3D" parent="."]
[node name="Ca2_CornerBlock1" parent="Model" instance=ExtResource("2_aknhk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.005, 0)
[node name="Collisions" type="Node3D" parent="."]

View File

@@ -22,7 +22,7 @@ script = ExtResource("1_18sbc")
[node name="Model" type="Node3D" parent="."]
[node name="CA2_CROSSBLOCK" parent="Model" instance=ExtResource("2_18sbc")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.46519, 3.98842)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.455, 3.988)
[node name="Collisions" type="Node3D" parent="."]

View File

@@ -40,7 +40,7 @@ script = ExtResource("1_8hqtj")
[node name="Model" type="Node3D" parent="."]
[node name="CA2_SBLOCK" parent="Model" instance=ExtResource("2_8hqtj")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.46486, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.455, 0)
[node name="Collisions" type="Node3D" parent="."]

View File

@@ -31,7 +31,7 @@ script = ExtResource("1_efs71")
[node name="Model" type="Node3D" parent="."]
[node name="CA2_TBLOCK" parent="Model" instance=ExtResource("2_efs71")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.43714, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.43, 0)
[node name="Collisions" type="Node3D" parent="."]

View File

@@ -40,7 +40,7 @@ script = ExtResource("1_lpude")
[node name="Model" type="Node3D" parent="."]
[node name="CA2_ZBLOCK" parent="Model" instance=ExtResource("2_lpude")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.46396, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.459, 0)
[node name="Collisions" type="Node3D" parent="."]

View File

@@ -43,7 +43,7 @@ script = ExtResource("1_a5b6m")
[node name="Model" type="Node3D" parent="."]
[node name="CA2_ZAGBLOCK" parent="Model" instance=ExtResource("2_a5b6m")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.56869, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.577, 0)
[node name="Collisions" type="Node3D" parent="."]

View File

@@ -100,7 +100,7 @@ transform = Transform3D(8.9407e-08, 0, 1, 0, 1, 0, -1, 0, 8.9407e-08, -30.8308,
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -59, 0, 44.9741)
[node name="Node3D2" parent="NavigationRegion3D" instance=ExtResource("7_4jnqu")]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -31, 0, 27)
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -31, -0.0145462, 27)
[node name="Antechamber 4" parent="NavigationRegion3D" instance=ExtResource("2_gh218")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 34.9664, -0.0101503, 59)
@@ -124,13 +124,13 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1, 2,
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 24.96, -0.025, 16.985)
[node name="CA2_CROSSBLOCK" parent="NavigationRegion3D" instance=ExtResource("11_qclr3")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31, 0, 47)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31, -0.01, 47)
[node name="CA2_2BLOCK" parent="NavigationRegion3D" instance=ExtResource("11_xfjxy")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -43, 0, 47)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -43, -0.0137534, 47)
[node name="CA2_2BLOCK2" parent="NavigationRegion3D" instance=ExtResource("11_xfjxy")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, 0, 47)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, -0.01, 47)
[node name="CA2_2BLOCK3" parent="NavigationRegion3D" instance=ExtResource("11_xfjxy")]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -31, 0, 50.9584)
@@ -142,7 +142,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.11047, 0, 17.1799)
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -31, 0, 15)
[node name="CA2_1BLOCK" parent="NavigationRegion3D" instance=ExtResource("10_2c4ye")]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -31, 0, 23)
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -31, -0.00403987, 23)
[node name="Node3D" parent="NavigationRegion3D" instance=ExtResource("15_4jnqu")]
transform = Transform3D(2.98023e-08, 0, 1, 0, 1, 0, -1, 0, 2.98023e-08, -39.3486, -0.0529781, 68.9952)

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=30 format=3 uid="uid://cny46rgfqjg8v"]
[gd_scene load_steps=29 format=3 uid="uid://cny46rgfqjg8v"]
[ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_6h8wr"]
[ext_resource type="PackedScene" uid="uid://b8tiuu3l181ke" path="res://src/map/dungeon/rooms/Set B/28. Long Room B.tscn" id="1_33c2s"]
@@ -16,7 +16,6 @@
[ext_resource type="PackedScene" uid="uid://dqew5q3bogxg7" path="res://src/map/dungeon/door/DOORB.tscn" id="13_mrx2g"]
[ext_resource type="PackedScene" uid="uid://kbrt3cos7udm" path="res://src/map/Placeables/A2-Socket.tscn" id="14_2wxas"]
[ext_resource type="Texture2D" uid="uid://dt1ww3q2g8q53" path="res://src/minimap/Floor Maps/11A.png" id="15_wrohb"]
[ext_resource type="PackedScene" uid="uid://0aqllfpimgq" path="res://src/map/Placeables/Stele D.tscn" id="17_mskj6"]
[ext_resource type="PackedScene" uid="uid://bxjcnuf2g8iox" path="res://src/map/Placeables/Stele G.tscn" id="18_es3ou"]
[ext_resource type="PackedScene" uid="uid://dye6ov6jfygke" path="res://src/map/Placeables/FloorMapPlaceable.tscn" id="19_resil"]
[ext_resource type="Texture2D" uid="uid://byd2a2hshj5s4" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_wood_final_tree.jpg" id="20_5gtpp"]
@@ -213,9 +212,6 @@ libraries = {
}
autoplay = "Pulse"
[node name="SteleD" parent="." instance=ExtResource("17_mskj6")]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -45.8008, 0.0555704, 16.3702)
[node name="SteleG" parent="." instance=ExtResource("18_es3ou")]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 32.1657, 0.0810368, 51.9696)

View File

@@ -185,9 +185,6 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 35.468
[node name="A2SOCKET3" parent="NavigationRegion3D" instance=ExtResource("14_f5oy5")]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 35.4681, 0.0171045, -12.0231)
[node name="SteleA" parent="NavigationRegion3D" instance=ExtResource("15_qvftd")]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 78.7399, 0.0231242, 89.8244)
[node name="Minimap2" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.8659, -11.2217, 66.0216)
layers = 2
@@ -216,3 +213,6 @@ transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 53.023
transform = Transform3D(0.055, 0, 0, 0, -0.01, 0, 0, 0, -0.035, -0.00890827, 0.701972, 3.96271)
mesh = SubResource("BoxMesh_1pfg1")
skeleton = NodePath("../../FLOORMAP1")
[node name="SteleA" parent="." instance=ExtResource("15_qvftd")]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 78.7399, 0.0231242, 89.8244)

View File

@@ -2,9 +2,9 @@
[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://cblhg7lmwn5ng" path="res://src/audio/AMB/amb_perlin.wav" id="2_wbbo3"]
[ext_resource type="AudioStream" uid="uid://byw0oogbgggp0" path="res://src/audio/AMB/amb_white_noise.wav" id="3_c2gp5"]
[ext_resource type="AudioStream" uid="uid://b8um78tuv72lj" 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"]
@@ -2016,7 +2016,7 @@ transform = Transform3D(-0.405705, 0, 0.533201, 0, 0.67, 0, -0.533201, 0, -0.405
transform = Transform3D(1, 0, 1.19209e-07, 0, 1, 0, -1.19209e-07, 0, 1, -36.051, 3.78707, 44.3599)
[node name="Clalo" parent="Node3D/Actors" instance=ExtResource("76_nfcfh")]
transform = Transform3D(-1.10025, 0, -1.44601, 0, 1.817, 0, 1.44601, 0, -1.10025, -244.949, 0.972024, 117.235)
transform = Transform3D(-1.15777, 0, -1.52161, 0, 1.912, 0, 1.52161, 0, -1.15777, -244.949, 1.16958, 117.235)
[node name="AnimatedSprite3D" parent="Node3D/Actors/Clalo" index="0"]
transform = Transform3D(1.11, 0, 0, 0, 1.11, 0, 0, 0, 1.11, 0, 0.179583, 0)
@@ -2455,6 +2455,9 @@ 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)
[node name="SteleA4" parent="." instance=ExtResource("61_v60tm")]
transform = Transform3D(-0.702327, 0, 0.711854, 0, 1, 0, -0.711854, 0, -0.702327, -299.255, 2.5838, 53.1555)
[editable path="Node3D/Actors/Rat"]
[editable path="Node3D/Actors/Clalo"]
[editable path="Node3D/Actors/Caretaker of Saints"]

View File

@@ -1028,20 +1028,20 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.89063, -3.71027, 3.63487)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.96292, -3.71027, 10.8984)
[node name="ItemSpawnPoint3" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0523, -3.71027, 11.6249)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.1095, -3.71027, 10.3313)
[node name="EnemySpawnPoints" type="Node3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0)
[node name="EnemySpawn1" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.67066, -3.71027, 3.35927)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.56256, -3.71027, 7.73557)
[node name="EnemySpawn2" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.6143, -3.71027, 6.01731)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.273, -3.71027, 7.33858)
[node name="EnemySpawn3" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.9752, -3.71027, 11.0699)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.0743, -3.71027, 12.7705)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.749275, 2.10907, 0)

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=131 format=4 uid="uid://crf30tibwsnri"]
[gd_scene load_steps=132 format=4 uid="uid://crf30tibwsnri"]
[ext_resource type="Script" uid="uid://bccyfmj8ikewh" path="res://src/map/dungeon/code/SpecialRoom.cs" id="1_q135t"]
[ext_resource type="Texture2D" uid="uid://dj8dvar756its" path="res://src/map/dungeon/models/Area 1/Seshat/SeshFix_orpheus.png" id="2_kikwc"]
@@ -1496,6 +1496,10 @@ size = Vector3(8.49038, 5.78839, 2.76795)
height = 9.73956
radius = 0.700195
[sub_resource type="CylinderShape3D" id="CylinderShape3D_kikwc"]
height = 9.73956
radius = 2.30566
[sub_resource type="CylinderShape3D" id="CylinderShape3D_xhe56"]
height = 8.4538
radius = 0.700195
@@ -1704,7 +1708,7 @@ shape = SubResource("CylinderShape3D_5aadh")
[node name="CollisionShape3D7" type="CollisionShape3D" parent="Collisions/StaticBody3D2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.78325, -12.495, 0.051156)
shape = SubResource("CylinderShape3D_5aadh")
shape = SubResource("CylinderShape3D_kikwc")
[node name="CollisionShape3D8" type="CollisionShape3D" parent="Collisions/StaticBody3D2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.4272, -11.1036, -3.97162)

View File

@@ -32,7 +32,7 @@ radius = 0.452637
size = Vector3(13.496, 20, 17.3486)
[sub_resource type="BoxShape3D" id="BoxShape3D_wu8s2"]
size = Vector3(15.7098, 10.2039, 7.09571)
size = Vector3(15.7098, 10.2039, 5.39368)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_k6ywg"]
albedo_color = Color(0, 0, 0, 1)
@@ -593,7 +593,7 @@ collision_layer = 256
collision_mask = 256
[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Exit"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00295544, 1.56831, 4.23168)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00295544, 1.56831, 2.06524)
shape = SubResource("BoxShape3D_wu8s2")
[node name="MinimapShadow" type="Node3D" parent="Room"]

View File

@@ -55,7 +55,6 @@ Dialogue = ExtResource("2_4em6t")
[node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."]
offset = Vector2(14, 0)
billboard = 2
shaded = true
sprite_frames = SubResource("SpriteFrames_ht37r")
autoplay = "default"
frame_progress = 0.356716