From 2a3c80a7aff7d212f677c1322c0353cce363895a Mon Sep 17 00:00:00 2001 From: Zenny Date: Fri, 26 Sep 2025 19:45:48 -0700 Subject: [PATCH] Fix map paths --- Zennysoft.Game.Ma/src/map/Map.cs | 8 ++++---- Zennysoft.Game.Ma/src/map/dungeon/floors/Floor00.tscn | 4 +--- .../dungeon/rooms/Special Floors/15. Boss Floor A.tscn | 6 +----- .../Special Floors/35. Goddess of Guidance's Room.tscn | 4 +--- .../map/dungeon/rooms/Special Floors/36. Final Floor.tscn | 6 +----- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Zennysoft.Game.Ma/src/map/Map.cs b/Zennysoft.Game.Ma/src/map/Map.cs index 46118e77..1445db74 100644 --- a/Zennysoft.Game.Ma/src/map/Map.cs +++ b/Zennysoft.Game.Ma/src/map/Map.cs @@ -58,11 +58,11 @@ public partial class Map : Node3D, IMap FloorScenes = ImmutableDictionary.Empty .Add(Floor.Overworld, $"res://src/map/overworld/Overworld.tscn") .Add(Floor.Altar, $"res://src/map/dungeon/floors/Floor00.tscn") - .Add(Floor.BossFloorA, $"res://src/map/dungeon/rooms/Set A/15. Boss Floor A.tscn") - .Add(Floor.BossFloorB, $"res://src/map/dungeon/rooms/Set B/34. Boss Floor B.tscn") - .Add(Floor.GoddessOfGuidanceFloor, $"res://src/map/dungeon/rooms/Set B/35. Goddess of Guidance's Room.tscn") + .Add(Floor.BossFloorA, $"res://src/map/dungeon/rooms/Special Floors/15. Boss Floor A.tscn") + .Add(Floor.BossFloorB, $"res://src/map/dungeon/rooms/Special Floors/34. Boss Floor B.tscn") + .Add(Floor.GoddessOfGuidanceFloor, $"res://src/map/dungeon/rooms/Special Floors/35. Goddess of Guidance's Room.tscn") .Add(Floor.VoidRoom, $"res://src/map/dungeon/rooms/Set B/30. Void Room.tscn") - .Add(Floor.FinalFloor, $"res://src/map/dungeon/rooms/Set B/36. Final Floor.tscn") + .Add(Floor.FinalFloor, $"res://src/map/dungeon/rooms/Special Floors/36. Final Floor.tscn") .Add(Floor.Floor01, $"res://src/map/dungeon/floors/Floor01.tscn") .Add(Floor.Floor02, $"res://src/map/dungeon/floors/Floor02.tscn") .Add(Floor.Floor03, $"res://src/map/dungeon/floors/Floor03.tscn") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor00.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor00.tscn index d77d1ccc..1487b619 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor00.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor00.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=71 format=4 uid="uid://dl6h1djc27ddl"] +[gd_scene load_steps=70 format=4 uid="uid://dl6h1djc27ddl"] [ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Floor0.cs" id="1_db2o3"] [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_xh2ej"] @@ -11,7 +11,6 @@ [ext_resource type="Texture2D" uid="uid://cx8bbg4nf5r0y" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_COLUM2N.png" id="9_mi7rk"] [ext_resource type="Texture2D" uid="uid://cas887pxmge0w" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_Worked-Stone-Outside.png" id="10_he1ou"] [ext_resource type="Texture2D" uid="uid://c4vnrq42usiy3" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_hand-tiile.png" id="11_rufnk"] -[ext_resource type="Texture2D" uid="uid://defbo5k7wewxn" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_effed-TILES-2.png" id="12_t3xa0"] [ext_resource type="Texture2D" uid="uid://buj20s21gq0n7" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_HAND_CYCLE_MOTIF.png" id="13_1i307"] [ext_resource type="Texture2D" uid="uid://4k6vtn4oip5f" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_TILE4.png" id="14_qqc7i"] [ext_resource type="Texture2D" uid="uid://bhttrt4aqu1d7" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_COLUMN.jpg" id="15_ojbcg"] @@ -424,7 +423,6 @@ albedo_texture = ExtResource("11_rufnk") resource_name = "EFFED TILES" cull_mode = 2 shading_mode = 2 -albedo_texture = ExtResource("12_t3xa0") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l5xve"] resource_name = "HAND CYCLE" diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/15. Boss Floor A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/15. Boss Floor A.tscn index a250a128..d390827d 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/15. Boss Floor A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/15. Boss Floor A.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=276 format=4 uid="uid://5ja3qxn8h7iw"] +[gd_scene load_steps=274 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"] @@ -20,9 +20,7 @@ [ext_resource type="Texture2D" uid="uid://bbursm2okpai1" path="res://src/map/dungeon/models/Special Floors & Rooms/Boss Floor A/15_A1_BOSS FLOOR A_VER_STONE_PANEL_2png.png" id="15_0qf8c"] [ext_resource type="Texture2D" uid="uid://dj3dvigyjh7lr" path="res://src/map/dungeon/models/Special Floors & Rooms/Boss Floor A/15_A1_BOSS FLOOR A_VER_tile2.png" id="16_bgmrw"] [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://kdu1ncykry2c" path="res://src/map/dungeon/models/Special Floors & Rooms/Boss Floor A/15_A1_BOSS FLOOR A_VER_CEILING_1.jpg" id="18_ymsfi"] [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://ijhbc6b4kod7" path="res://src/map/dungeon/models/Special Floors & Rooms/Boss Floor A/15_A1_BOSS FLOOR A_VER_CHAIN_TEX.png" id="21_a3et2"] [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"] @@ -655,7 +653,6 @@ texture_filter = 2 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_f5xan"] resource_name = "CEILING 1.007" transparency = 4 -albedo_texture = ExtResource("18_ymsfi") [sub_resource type="ArrayMesh" id="ArrayMesh_ac702"] _surfaces = [{ @@ -1325,7 +1322,6 @@ resource_name = "Material.030" transparency = 2 alpha_scissor_threshold = 0.5 alpha_antialiasing_mode = 0 -albedo_texture = ExtResource("21_a3et2") [sub_resource type="ArrayMesh" id="ArrayMesh_2f7b5"] _surfaces = [{ diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/35. Goddess of Guidance's Room.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/35. Goddess of Guidance's Room.tscn index 2bd182fb..322bd208 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/35. Goddess of Guidance's Room.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/35. Goddess of Guidance's Room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=102 format=4 uid="uid://bo20ffw2ygbks"] +[gd_scene load_steps=101 format=4 uid="uid://bo20ffw2ygbks"] [ext_resource type="Script" uid="uid://xd6tx3lifebl" path="res://src/map/dungeon/code/SpecialFloor.cs" id="1_j4ho3"] [ext_resource type="Texture2D" uid="uid://ddrvsy7psmwig" path="res://src/map/dungeon/models/Special Floors & Rooms/35. Goddess of Guidance's Floor/GoG Room mirrored_DARKER_STONE_AREA_2.png" id="2_jbyuo"] @@ -11,7 +11,6 @@ [ext_resource type="Texture2D" uid="uid://c7yaqdtmf0w4o" path="res://src/map/dungeon/models/Special Floors & Rooms/35. Goddess of Guidance's Floor/GoG Room mirrored_swirled_column _AREA222.png" id="9_fs8fd"] [ext_resource type="Texture2D" uid="uid://d2np2n5rkhhes" path="res://src/map/dungeon/models/Special Floors & Rooms/35. Goddess of Guidance's Floor/GoG Room mirrored_WHITE METAL 2E.png" id="10_rfnlw"] [ext_resource type="Texture2D" uid="uid://dti0ir01a1s87" path="res://src/map/dungeon/models/Special Floors & Rooms/35. Goddess of Guidance's Floor/GoG Room mirrored_WHITE_layer_brick1.png" id="11_6bh8x"] -[ext_resource type="Texture2D" uid="uid://bxf4worc2uvfp" path="res://src/map/dungeon/models/Special Floors & Rooms/35. Goddess of Guidance's Floor/GoG Room mirrored_burned-thing.png" id="12_itdxh"] [ext_resource type="Texture2D" uid="uid://dd1jvmfs1cbbg" path="res://src/map/dungeon/models/Special Floors & Rooms/35. Goddess of Guidance's Floor/GoG Room mirrored_floral_single_tile.jpg" id="13_aytwf"] [ext_resource type="Texture2D" uid="uid://nvg6i8gbgqjv" path="res://src/map/dungeon/models/Special Floors & Rooms/35. Goddess of Guidance's Floor/GoG Room mirrored_angkor_mural.jpg" id="14_tf4w3"] [ext_resource type="Texture2D" uid="uid://3w1ac5fvks5v" path="res://src/map/dungeon/models/Special Floors & Rooms/35. Goddess of Guidance's Floor/GoG Room mirrored_area_2_big_tile.png" id="15_nduur"] @@ -357,7 +356,6 @@ shadow_mesh = SubResource("ArrayMesh_h4e76") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_n8hsa"] resource_name = "Material.006" cull_mode = 2 -albedo_texture = ExtResource("12_itdxh") [sub_resource type="ArrayMesh" id="ArrayMesh_edxa5"] _surfaces = [{ diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/36. Final Floor.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/36. Final Floor.tscn index ff9720fc..c11cc5fb 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/36. Final Floor.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Special Floors/36. Final Floor.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=56 format=4 uid="uid://cyrrhoarhxlhg"] +[gd_scene load_steps=54 format=4 uid="uid://cyrrhoarhxlhg"] [ext_resource type="Texture2D" uid="uid://btt02vinv3ikx" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_Plane Base Color.png" id="1_er87g"] [ext_resource type="Script" uid="uid://xd6tx3lifebl" path="res://src/map/dungeon/code/SpecialFloor.cs" id="1_y4p12"] @@ -8,7 +8,6 @@ [ext_resource type="Texture2D" uid="uid://bb34lt57tackd" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_AREA_2_MAIN_STONE.png" id="5_7nhbk"] [ext_resource type="Texture2D" uid="uid://0ayj0l5ank" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_area_2_tile_3.png" id="6_4cfta"] [ext_resource type="Texture2D" uid="uid://clfwg8p84wck0" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_area_2_tile_stained_2.png" id="7_0bgkr"] -[ext_resource type="Texture2D" uid="uid://b1xecj0q3gvot" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_area_2_big_tile.png" id="8_5hesc"] [ext_resource type="Texture2D" uid="uid://cc4ggld1tp0pv" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_WHITE_floor.png" id="9_kvguv"] [ext_resource type="Texture2D" uid="uid://d0nghuk45gta2" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_STONE_PANEL_AREA2png.png" id="10_005wa"] [ext_resource type="Texture2D" uid="uid://ny7o5r6ivk40" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_WHITE_layer_brick1.png" id="11_urfka"] @@ -16,7 +15,6 @@ [ext_resource type="Texture2D" uid="uid://raabs2xyoe3a" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_asdasd.png" id="13_hknii"] [ext_resource type="Texture2D" uid="uid://cgmua1a5et6ah" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_mother_GREEN.png" id="14_p7goj"] [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="15_l0kqy"] -[ext_resource type="Texture2D" uid="uid://rvq003a2yvdl" path="res://src/map/dungeon/models/Special Floors & Rooms/36. Final Floor/36_A2_FINAL_FLOOR_VER.0_COLUMN-DARKER.png" id="16_knyg2"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7o1e6"] resource_name = "EYE" @@ -207,7 +205,6 @@ albedo_texture = ExtResource("7_0bgkr") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_q6hd6"] resource_name = "BIG TILE 3" cull_mode = 2 -albedo_texture = ExtResource("8_5hesc") [sub_resource type="ArrayMesh" id="ArrayMesh_8r2wk"] _surfaces = [{ @@ -758,7 +755,6 @@ shadow_mesh = SubResource("ArrayMesh_ntpp8") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_b1gf1"] resource_name = "Material.002" -albedo_texture = ExtResource("16_knyg2") [sub_resource type="ArrayMesh" id="ArrayMesh_u8b5k"] _surfaces = [{