Improvements to save and loading

Improvements to Chinthe animation logic
Fix broken Godot Tool system and just use a more manual approach to setting map nodes
Remove ItemDatabase from individual room scenes
This commit is contained in:
2025-10-24 01:33:18 -07:00
parent f5360adbf1
commit 286c221530
93 changed files with 497 additions and 678 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=3 uid="uid://c5ekisphioovm"]
[gd_scene load_steps=21 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"]
@@ -12,6 +12,7 @@
[ext_resource type="PackedScene" uid="uid://8u5kue6pljh0" path="res://src/map/dungeon/corridors/A - Corridor - T-Block.tscn" id="9_n5246"]
[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"]
[sub_resource type="Environment" id="Environment_yrcgx"]
background_mode = 1
@@ -39,6 +40,21 @@ adjustment_saturation = 0.7
dof_blur_far_enabled = true
dof_blur_far_distance = 20.0
[sub_resource type="CylinderShape3D" id="CylinderShape3D_4sygy"]
[sub_resource type="CylinderMesh" id="CylinderMesh_4sygy"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4sygy"]
transparency = 1
albedo_color = Color(0.371075, 0.471858, 1, 0.74902)
[sub_resource type="NavigationMesh" id="NavigationMesh_hkp1m"]
vertices = PackedVector3Array(-13.9117, 1.52274, -9.5, -13.9117, 1.52274, 9.5, 5.08825, 1.52274, 9.5, 5.08825, 1.52274, -9.5)
polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1)]
[sub_resource type="PlaneMesh" id="PlaneMesh_hkp1m"]
size = Vector2(20, 20)
[node name="Node3D" type="Node3D"]
script = ExtResource("1_cfhj4")
@@ -188,3 +204,26 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20.095, 0, -56.669)
[node name="Node3D" parent="." instance=ExtResource("12_hkp1m")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30.1149, -0.0400015, 11.7445)
[node name="QuestTest" type="Area3D" parent="."]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.50048, 0, -2.16434)
collision_layer = 0
collision_mask = 64
script = ExtResource("13_hkp1m")
[node name="CollisionShape3D" type="CollisionShape3D" parent="QuestTest"]
shape = SubResource("CylinderShape3D_4sygy")
[node name="MeshInstance3D" type="MeshInstance3D" parent="QuestTest"]
mesh = SubResource("CylinderMesh_4sygy")
surface_material_override/0 = SubResource("StandardMaterial3D_4sygy")
[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.339771, 0)
navigation_mesh = SubResource("NavigationMesh_hkp1m")
[node name="MeshInstance3D" type="MeshInstance3D" parent="NavigationRegion3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.41175, 1.02274, 0)
visible = false
mesh = SubResource("PlaneMesh_hkp1m")

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=276 format=4 uid="uid://5ja3qxn8h7iw"]
[gd_scene load_steps=275 format=4 uid="uid://5ja3qxn8h7iw"]
[ext_resource type="Script" uid="uid://tqyybt313web" path="res://src/map/dungeon/code/BossRoomA.cs" id="1_0h3lb"]
[ext_resource type="Texture2D" uid="uid://vjbe1lg810gh" path="res://src/map/dungeon/models/Special Floors & Rooms/Boss Floor A/15_A1_BOSS FLOOR A_VER_swirled_column.png" id="2_06eum"]
@@ -22,7 +22,6 @@
[ext_resource type="Texture2D" uid="uid://ptsisd285o78" path="res://src/map/dungeon/models/Special Floors & Rooms/Boss Floor A/15_A1_BOSS FLOOR A_VER_STONE_PANEL_1png.png" id="17_0tjgo"]
[ext_resource type="Texture2D" uid="uid://nljdi5gnv0wr" path="res://src/map/dungeon/models/Special Floors & Rooms/Boss Floor A/15_A1_BOSS FLOOR A_VER_HAND_CYCLE_MOTIF.png" id="19_btt2p"]
[ext_resource type="Texture2D" uid="uid://bln2sy5wq5pe" path="res://src/map/dungeon/models/Special Floors & Rooms/Boss Floor A/15_A1_BOSS FLOOR A_VER_RAIL_TRANSPARENT_PLANE.png" id="22_4tjx7"]
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="23_gov56"]
[ext_resource type="PackedScene" uid="uid://8yaqqojv4nuv" path="res://src/enemy/enemy_types/14. horse_head/HorseHeadStatue.tscn" id="24_r1rk5"]
[ext_resource type="PackedScene" uid="uid://2wibfnu2jvlv" path="res://src/enemy/enemy_types/14. horse_head/HorseFace.tscn" id="25_a482y"]
[ext_resource type="Texture2D" uid="uid://burw8x227lce2" path="res://src/map/dungeon/models/Special Floors & Rooms/Boss Floor A/Boss Floor 1 Ver_CEILING_1.jpg" id="25_dadmm"]
@@ -4840,13 +4839,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -52.6848, 0, 16.939)
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.72795, -2.29748, 0.329851)
[node name="ItemDatabase" parent="Spawn Points" instance=ExtResource("23_gov56")]
unique_name_in_owner = true
[node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -108.001, -2.05432, 2.0026)
[node name="Room" type="Node3D" parent="."]
[node name="ActivateTrap" type="Area3D" parent="Room"]
@@ -4871,10 +4863,7 @@ transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-0
visible = false
PrimaryAttackElementalType = null
PrimaryAttackElementalDamageBonus = null
AttackValue = null
DefenseValue = null
InitialHP = null
ExpAmount = null
[node name="OxFaceStatue" parent="Room" instance=ExtResource("26_futcf")]
unique_name_in_owner = true
@@ -4886,10 +4875,7 @@ transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-0
visible = false
PrimaryAttackElementalType = null
PrimaryAttackElementalDamageBonus = null
AttackValue = null
DefenseValue = null
InitialHP = null
ExpAmount = null
[node name="Exit" type="Area3D" parent="Room"]
unique_name_in_owner = true

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=134 format=4 uid="uid://ceo7ph483io44"]
[gd_scene load_steps=133 format=4 uid="uid://ceo7ph483io44"]
[ext_resource type="Script" uid="uid://cvj30id0i8ska" path="res://src/map/dungeon/code/BossRoomB.cs" id="1_bxvob"]
[ext_resource type="Texture2D" uid="uid://cp8si6xqd3g51" path="res://src/map/dungeon/models/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_COLUMN_WHITE.png" id="2_58rvo"]
@@ -21,7 +21,6 @@
[ext_resource type="Texture2D" uid="uid://wwuer1rj1w03" path="res://src/map/dungeon/models/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_Painting-for-Tempple-merged.png" id="20_66v2o"]
[ext_resource type="Texture2D" uid="uid://eoa8j2dthdcd" path="res://src/map/dungeon/models/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_RUBBLE_1.png" id="21_44y61"]
[ext_resource type="Texture2D" uid="uid://b4qmkkiglj7pw" path="res://src/map/dungeon/models/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_mother_GREEN.png" id="22_tc5an"]
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="23_br0k2"]
[ext_resource type="PackedScene" uid="uid://6kck5vborfyk" 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"]
@@ -1865,9 +1864,6 @@ visible = false
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.953176, 25.4308, 149.677)
[node name="ItemDatabase" parent="Spawn Points" instance=ExtResource("23_br0k2")]
unique_name_in_owner = true
[node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -115.98, -2.05432, 16.535)
@@ -1889,7 +1885,6 @@ shape = SubResource("BoxShape3D_bxvob")
[node name="DemonWall" parent="." instance=ExtResource("25_k2q0o")]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.491528, 21.2936, 55.334)
_maximumWallMoveAmount = 24.0
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_qev6n")