Use Special Room script type to mark rooms that don't have monster/item/player spawns
Fix some minimap display issues Fix michael animation state
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
[gd_scene load_steps=80 format=4 uid="uid://dn5546yqyntfr"]
|
||||
[gd_scene load_steps=79 format=4 uid="uid://dn5546yqyntfr"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://bccyfmj8ikewh" path="res://src/map/dungeon/code/SpecialRoom.cs" id="1_7rwa4"]
|
||||
[ext_resource type="Shader" uid="uid://cntrajooialrn" path="res://src/map/map shaders/DemonWall Wave.gdshader" id="2_7rwa4"]
|
||||
[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="2_xx257"]
|
||||
[ext_resource type="Texture2D" uid="uid://b1srfcp1sq3ac" path="res://src/enemy/enemy_types/16. demon wall/PIPE_PIPE2.jpg" id="3_aeopg"]
|
||||
[ext_resource type="Texture2D" uid="uid://dhgoha7sn4nrh" path="res://src/map/dungeon/models/Area 1/Hand/handroomfixes_SNEK TILE.png" id="4_7kuia"]
|
||||
[ext_resource type="Texture2D" uid="uid://djqwqxcwx7r1" path="res://src/map/dungeon/models/Area 1/Hand/handroomfixes_SA115.png" id="5_q5u28"]
|
||||
@@ -17,7 +17,6 @@
|
||||
[ext_resource type="Texture2D" uid="uid://be454vb0rtay5" path="res://src/map/dungeon/models/Area 1/Hand/A1-Hand_TILE4.png" id="14_vpja1"]
|
||||
[ext_resource type="Texture2D" uid="uid://b677606l5mwuk" path="res://src/map/dungeon/models/Area 1/Hand/A1-Hand_CEILING_1.jpg" id="15_f0ykb"]
|
||||
[ext_resource type="Texture2D" uid="uid://b5ve25tvk4hr1" path="res://src/map/dungeon/models/Area 1/Hand/A1-Hand_OW_METALISH_1.jpg" id="16_7prcm"]
|
||||
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="16_rmjiw"]
|
||||
[ext_resource type="Texture2D" uid="uid://clbrxw77p4ptx" path="res://src/map/dungeon/models/Area 1/Hand/A1-Hand_darkbrick.png" id="17_8tnfw"]
|
||||
[ext_resource type="Texture2D" uid="uid://bgueiddjnkpbd" path="res://src/map/dungeon/models/Area 1/Hand/A1-Hand_wood_0003_color_1k.jpg" id="18_8umh4"]
|
||||
[ext_resource type="Texture2D" uid="uid://c5kmadqynfnv" path="res://src/map/dungeon/models/Area 1/Hand/A1-Hand_PIPE.jpg" id="19_sks5y"]
|
||||
@@ -875,6 +874,7 @@ size = Vector2(12, 14)
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gvy7k"]
|
||||
transparency = 1
|
||||
shading_mode = 0
|
||||
albedo_texture = ExtResource("7_vjfy5")
|
||||
texture_filter = 0
|
||||
|
||||
@@ -915,7 +915,7 @@ subdivide_depth = 1
|
||||
|
||||
[node name="Item Transfer Room" type="Node3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.0592, 0, 7.01805)
|
||||
script = ExtResource("2_xx257")
|
||||
script = ExtResource("1_7rwa4")
|
||||
|
||||
[node name="Model" type="Node3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.04081, 0, -1.07468)
|
||||
@@ -983,25 +983,6 @@ transform = Transform3D(5.57054, 0, 0, 0, 0.25, 0, 0, 0, 0.239837, -0.1406, -2.6
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.1695)
|
||||
shape = SubResource("ConcavePolygonShape3D_6p8o4")
|
||||
|
||||
[node name="Spawn Points" type="Node3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.04081, 0, -1.07468)
|
||||
visible = false
|
||||
|
||||
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.593048, -1.89174, -3.5752)
|
||||
|
||||
[node name="ItemSpawnPoints" 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="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="ItemDatabase" parent="Spawn Points" instance=ExtResource("16_rmjiw")]
|
||||
unique_name_in_owner = true
|
||||
|
||||
[node name="Room" type="Node3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.04081, 2.02774, -1.07468)
|
||||
visible = false
|
||||
@@ -1023,6 +1004,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.215604, 1)
|
||||
[node name="Minimap" type="MeshInstance3D" parent="Minimap"]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -3.95701, 0, 0)
|
||||
visible = false
|
||||
layers = 2
|
||||
mesh = SubResource("PlaneMesh_j35qd")
|
||||
surface_material_override/0 = SubResource("StandardMaterial3D_gvy7k")
|
||||
|
||||
Reference in New Issue
Block a user