diff --git a/prefab/entitys/Character.tscn b/prefab/entitys/Character.tscn index 6635dbe..f18d714 100644 --- a/prefab/entitys/Character.tscn +++ b/prefab/entitys/Character.tscn @@ -30,13 +30,8 @@ platform_floor_layers = 4294967042 platform_wall_layers = 128 script = ExtResource("1_1dlls") _platformDetectionRayCast2DList = [NodePath("PlatformDetectionRayCast1"), NodePath("PlatformDetectionRayCast2"), NodePath("PlatformDetectionRayCast3")] -CharacterName = null -CanMutateAfterDeath = null -_initialHp = null MaxHp = 32 CampId = "Default" -_indestructible = true -LootListId = null [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("CapsuleShape2D_bb8wt") diff --git a/prefab/roomTemplates/dungeon/readingRoom.tscn b/prefab/roomTemplates/dungeon/readingRoom.tscn index 3b0613e..9f50a11 100644 --- a/prefab/roomTemplates/dungeon/readingRoom.tscn +++ b/prefab/roomTemplates/dungeon/readingRoom.tscn @@ -50,6 +50,7 @@ navigation_enabled = false [node name="BackgroundDecoration" type="TileMapLayer" parent="TileMap"] use_parent_material = true +tile_map_data = PackedByteArray("AAADAAQAAQAEAAYAAAAEAAQAAQAEAAYAAAAEAAUAAQAEAAYAAAADAAUAAQAEAAYAAAADAAMAAQAEAAYAAAAEAAMAAQAEAAYAAAAGAAMAAQAEAAYAAAAGAAQAAQAEAAYAAAAGAAUAAQAEAAYAAAAHAAUAAQAEAAYAAAAHAAQAAQAEAAYAAAAHAAMAAQAEAAYAAAAJAAMAAQAEAAYAAAAJAAQAAQAEAAYAAAAJAAUAAQAEAAYAAAAKAAUAAQAEAAYAAAAKAAQAAQAEAAYAAAAKAAMAAQAEAAYAAAAOAAUAAQABAAYAAAANAAUAAQAAAAYAAAA=") tile_set = ExtResource("1_60tbt") [node name="Ground" type="TileMapLayer" parent="TileMap"] diff --git a/scripts/map/room/Room.cs b/scripts/map/room/Room.cs index c6c2032..8b127a8 100644 --- a/scripts/map/room/Room.cs +++ b/scripts/map/room/Room.cs @@ -340,7 +340,7 @@ public class Room _pointLight2D.Texture = AssetHolder.White25; } HideAllCharacterTemplate(); - if (PlayerRoomVisitCount == 1 && _autoSpawn != null) + if (_hasSpawnedEntity && _autoSpawn != null) { NodeUtils.ForEachNode(_autoSpawn, marker => { diff --git a/sprites/tiles/CastleTiles.png b/sprites/tiles/CastleTiles.png index cb0a4c8..7f79564 100644 Binary files a/sprites/tiles/CastleTiles.png and b/sprites/tiles/CastleTiles.png differ diff --git a/tileSets/dungeon.tres b/tileSets/dungeon.tres index 58911a3..5eb0120 100644 --- a/tileSets/dungeon.tres +++ b/tileSets/dungeon.tres @@ -81,6 +81,7 @@ texture_region_size = Vector2i(32, 32) 7:5/0 = 0 3:3/0 = 0 1:4/0 = 0 +4:6/0 = 0 [resource] tile_size = Vector2i(32, 32)