Add back antechamber 2, fix collisions in inner balcony room

This commit is contained in:
2024-09-19 01:56:37 -07:00
parent 28136545b4
commit 01477b9a0e
49 changed files with 3072 additions and 626 deletions

View File

@@ -1,9 +1,9 @@
@startuml AppLogic @startuml AppLogic
state "AppLogic State" as GameJamDungeon_AppLogic_State { state "AppLogic State" as GameJamDungeon_AppLogic_State {
state "SetupGameScene" as GameJamDungeon_AppLogic_State_SetupGameScene
state "InGame" as GameJamDungeon_AppLogic_State_InGame
state "LoadingScreen" as GameJamDungeon_AppLogic_State_LoadingScreen state "LoadingScreen" as GameJamDungeon_AppLogic_State_LoadingScreen
state "MainMenu" as GameJamDungeon_AppLogic_State_MainMenu state "MainMenu" as GameJamDungeon_AppLogic_State_MainMenu
state "InGame" as GameJamDungeon_AppLogic_State_InGame
state "SetupGameScene" as GameJamDungeon_AppLogic_State_SetupGameScene
} }
GameJamDungeon_AppLogic_State_InGame --> GameJamDungeon_AppLogic_State_MainMenu : GameOver GameJamDungeon_AppLogic_State_InGame --> GameJamDungeon_AppLogic_State_MainMenu : GameOver

View File

@@ -1,10 +1,10 @@
@startuml EnemyLogic @startuml EnemyLogic
state "EnemyLogic State" as GameJamDungeon_EnemyLogic_State { state "EnemyLogic State" as GameJamDungeon_EnemyLogic_State {
state "Alive" as GameJamDungeon_EnemyLogic_State_Alive {
state "FollowPlayer" as GameJamDungeon_EnemyLogic_State_FollowPlayer
state "Idle" as GameJamDungeon_EnemyLogic_State_Idle
}
state "Defeated" as GameJamDungeon_EnemyLogic_State_Defeated state "Defeated" as GameJamDungeon_EnemyLogic_State_Defeated
state "Alive" as GameJamDungeon_EnemyLogic_State_Alive {
state "Idle" as GameJamDungeon_EnemyLogic_State_Idle
state "FollowPlayer" as GameJamDungeon_EnemyLogic_State_FollowPlayer
}
} }
GameJamDungeon_EnemyLogic_State_Alive --> GameJamDungeon_EnemyLogic_State_Alive : AttackTimer GameJamDungeon_EnemyLogic_State_Alive --> GameJamDungeon_EnemyLogic_State_Alive : AttackTimer

View File

@@ -1,15 +1,15 @@
@startuml GameLogic @startuml GameLogic
state "GameLogic State" as GameJamDungeon_GameLogic_State { state "GameLogic State" as GameJamDungeon_GameLogic_State {
state "GameStarted" as GameJamDungeon_GameLogic_State_GameStarted state "Quit" as GameJamDungeon_GameLogic_State_Quit
state "Playing" as GameJamDungeon_GameLogic_State_Playing { state "Playing" as GameJamDungeon_GameLogic_State_Playing {
state "MinimapOpen" as GameJamDungeon_GameLogic_State_MinimapOpen
state "Resuming" as GameJamDungeon_GameLogic_State_Resuming
state "AskForTeleport" as GameJamDungeon_GameLogic_State_AskForTeleport state "AskForTeleport" as GameJamDungeon_GameLogic_State_AskForTeleport
state "Paused" as GameJamDungeon_GameLogic_State_Paused
state "FloorClearedDecisionState" as GameJamDungeon_GameLogic_State_FloorClearedDecisionState state "FloorClearedDecisionState" as GameJamDungeon_GameLogic_State_FloorClearedDecisionState
state "InventoryOpened" as GameJamDungeon_GameLogic_State_InventoryOpened state "InventoryOpened" as GameJamDungeon_GameLogic_State_InventoryOpened
state "MinimapOpen" as GameJamDungeon_GameLogic_State_MinimapOpen
state "Paused" as GameJamDungeon_GameLogic_State_Paused
state "Resuming" as GameJamDungeon_GameLogic_State_Resuming
} }
state "Quit" as GameJamDungeon_GameLogic_State_Quit state "GameStarted" as GameJamDungeon_GameLogic_State_GameStarted
} }
GameJamDungeon_GameLogic_State_AskForTeleport --> GameJamDungeon_GameLogic_State_FloorClearedDecisionState : FloorExitReached GameJamDungeon_GameLogic_State_AskForTeleport --> GameJamDungeon_GameLogic_State_FloorClearedDecisionState : FloorExitReached

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://bc1sp6xwe0j65"] [gd_scene load_steps=12 format=3 uid="uid://bc1sp6xwe0j65"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_0ecnn"] [ext_resource type="Script" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_0ecnn"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="2_cxmwa"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="2_cxmwa"]
@@ -9,6 +9,7 @@
[ext_resource type="PackedScene" uid="uid://c1qicmrcg6q6x" path="res://src/map/dungeon/scenes/ColumnRoom.tscn" id="6_gy758"] [ext_resource type="PackedScene" uid="uid://c1qicmrcg6q6x" path="res://src/map/dungeon/scenes/ColumnRoom.tscn" id="6_gy758"]
[ext_resource type="PackedScene" uid="uid://wkwqods1sfep" path="res://src/map/dungeon/scenes/PitRoom.tscn" id="7_p7uga"] [ext_resource type="PackedScene" uid="uid://wkwqods1sfep" path="res://src/map/dungeon/scenes/PitRoom.tscn" id="7_p7uga"]
[ext_resource type="PackedScene" uid="uid://dfpyfpnya0f4u" path="res://src/map/dungeon/scenes/WaterRoom.tscn" id="8_8qebi"] [ext_resource type="PackedScene" uid="uid://dfpyfpnya0f4u" path="res://src/map/dungeon/scenes/WaterRoom.tscn" id="8_8qebi"]
[ext_resource type="PackedScene" uid="uid://vdhl32je6hq2" path="res://src/map/dungeon/scenes/Antechamber_2.tscn" id="9_icfo6"]
[sub_resource type="NavigationMesh" id="NavigationMesh_gqi8w"] [sub_resource type="NavigationMesh" id="NavigationMesh_gqi8w"]
border_size = 1.0 border_size = 1.0
@@ -25,9 +26,10 @@ navigation_mesh = SubResource("NavigationMesh_gqi8w")
[node name="DungeonGenerator" type="Node3D" parent="NavigationRegion3D"] [node name="DungeonGenerator" type="Node3D" parent="NavigationRegion3D"]
unique_name_in_owner = true unique_name_in_owner = true
script = ExtResource("2_cxmwa") script = ExtResource("2_cxmwa")
room_scenes = Array[PackedScene]([ExtResource("3_tsw3y"), ExtResource("4_b2rkl"), ExtResource("5_v15cv"), ExtResource("6_gy758"), ExtResource("7_p7uga"), ExtResource("8_8qebi")]) room_scenes = Array[PackedScene]([ExtResource("3_tsw3y"), ExtResource("4_b2rkl"), ExtResource("5_v15cv"), ExtResource("6_gy758"), ExtResource("7_p7uga"), ExtResource("8_8qebi"), ExtResource("9_icfo6")])
corridor_room_scene = ExtResource("4_gni6i") corridor_room_scene = ExtResource("4_gni6i")
dungeon_size = Vector3i(50, 1, 50) dungeon_size = Vector3i(50, 1, 50)
voxel_scale = Vector3(4, 4, 4) voxel_scale = Vector3(4, 4, 4)
generate_on_ready = false generate_on_ready = false
corridor_cost_multiplier = 10.0
place_even_if_fail = true place_even_if_fail = true

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://dmiqwmivkjgmq"] [gd_scene load_steps=12 format=3 uid="uid://dmiqwmivkjgmq"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_afeds"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_afeds"]
[ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/scenes/Antechamber.tscn" id="3_7txs6"] [ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/scenes/Antechamber.tscn" id="3_7txs6"]
@@ -9,6 +9,7 @@
[ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="7_86if8"] [ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="7_86if8"]
[ext_resource type="PackedScene" uid="uid://wkwqods1sfep" path="res://src/map/dungeon/scenes/PitRoom.tscn" id="7_tlwet"] [ext_resource type="PackedScene" uid="uid://wkwqods1sfep" path="res://src/map/dungeon/scenes/PitRoom.tscn" id="7_tlwet"]
[ext_resource type="PackedScene" uid="uid://dfpyfpnya0f4u" path="res://src/map/dungeon/scenes/WaterRoom.tscn" id="8_lpc1g"] [ext_resource type="PackedScene" uid="uid://dfpyfpnya0f4u" path="res://src/map/dungeon/scenes/WaterRoom.tscn" id="8_lpc1g"]
[ext_resource type="PackedScene" uid="uid://vdhl32je6hq2" path="res://src/map/dungeon/scenes/Antechamber_2.tscn" id="9_4i2f8"]
[sub_resource type="NavigationMesh" id="NavigationMesh_gqi8w"] [sub_resource type="NavigationMesh" id="NavigationMesh_gqi8w"]
border_size = 1.0 border_size = 1.0
@@ -25,7 +26,7 @@ navigation_mesh = SubResource("NavigationMesh_gqi8w")
[node name="DungeonGenerator" type="Node3D" parent="NavigationRegion3D"] [node name="DungeonGenerator" type="Node3D" parent="NavigationRegion3D"]
unique_name_in_owner = true unique_name_in_owner = true
script = ExtResource("1_afeds") script = ExtResource("1_afeds")
room_scenes = Array[PackedScene]([ExtResource("3_7txs6"), ExtResource("4_r7shj"), ExtResource("5_geyju"), ExtResource("6_jgovx"), ExtResource("7_tlwet"), ExtResource("8_lpc1g")]) room_scenes = Array[PackedScene]([ExtResource("3_7txs6"), ExtResource("4_r7shj"), ExtResource("5_geyju"), ExtResource("6_jgovx"), ExtResource("7_tlwet"), ExtResource("8_lpc1g"), ExtResource("9_4i2f8")])
corridor_room_scene = ExtResource("7_86if8") corridor_room_scene = ExtResource("7_86if8")
dungeon_size = Vector3i(30, 1, 30) dungeon_size = Vector3i(30, 1, 30)
voxel_scale = Vector3(4, 4, 4) voxel_scale = Vector3(4, 4, 4)

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://dl1scvkp8r5sw"] [gd_scene load_steps=12 format=3 uid="uid://dl1scvkp8r5sw"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_ou8lo"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_ou8lo"]
[ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/scenes/Antechamber.tscn" id="3_yeqmp"] [ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/scenes/Antechamber.tscn" id="3_yeqmp"]
@@ -9,6 +9,7 @@
[ext_resource type="PackedScene" uid="uid://wkwqods1sfep" path="res://src/map/dungeon/scenes/PitRoom.tscn" id="7_f70ga"] [ext_resource type="PackedScene" uid="uid://wkwqods1sfep" path="res://src/map/dungeon/scenes/PitRoom.tscn" id="7_f70ga"]
[ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="7_qjouh"] [ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="7_qjouh"]
[ext_resource type="PackedScene" uid="uid://dfpyfpnya0f4u" path="res://src/map/dungeon/scenes/WaterRoom.tscn" id="8_06hbf"] [ext_resource type="PackedScene" uid="uid://dfpyfpnya0f4u" path="res://src/map/dungeon/scenes/WaterRoom.tscn" id="8_06hbf"]
[ext_resource type="PackedScene" uid="uid://vdhl32je6hq2" path="res://src/map/dungeon/scenes/Antechamber_2.tscn" id="9_ym1ny"]
[sub_resource type="NavigationMesh" id="NavigationMesh_gqi8w"] [sub_resource type="NavigationMesh" id="NavigationMesh_gqi8w"]
border_size = 1.0 border_size = 1.0
@@ -25,8 +26,8 @@ navigation_mesh = SubResource("NavigationMesh_gqi8w")
[node name="DungeonGenerator" type="Node3D" parent="NavigationRegion3D"] [node name="DungeonGenerator" type="Node3D" parent="NavigationRegion3D"]
unique_name_in_owner = true unique_name_in_owner = true
script = ExtResource("1_ou8lo") script = ExtResource("1_ou8lo")
room_scenes = Array[PackedScene]([ExtResource("3_yeqmp"), ExtResource("4_2o7kq"), ExtResource("5_wo0bu"), ExtResource("6_o010k"), ExtResource("7_f70ga"), ExtResource("8_06hbf")]) room_scenes = Array[PackedScene]([ExtResource("3_yeqmp"), ExtResource("4_2o7kq"), ExtResource("5_wo0bu"), ExtResource("6_o010k"), ExtResource("7_f70ga"), ExtResource("8_06hbf"), ExtResource("9_ym1ny")])
corridor_room_scene = ExtResource("7_qjouh") corridor_room_scene = ExtResource("7_qjouh")
dungeon_size = Vector3i(40, 1, 40) dungeon_size = Vector3i(60, 1, 60)
voxel_scale = Vector3(4, 4, 4) voxel_scale = Vector3(4, 4, 4)
generate_on_ready = false generate_on_ready = false

View File

@@ -3,13 +3,13 @@
importer="scene" importer="scene"
importer_version=1 importer_version=1
type="PackedScene" type="PackedScene"
uid="uid://d1mw1pgs87aj2" uid="uid://wxwanllm4r3b"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2.glb-bbfbb0f53506ff8298fab7282834f31b.scn" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3.glb-068129b4551a14865af06d94b256e7d4.scn"
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2.glb" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3.glb"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2.glb-bbfbb0f53506ff8298fab7282834f31b.scn"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3.glb-068129b4551a14865af06d94b256e7d4.scn"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://cr0x85qyagbxk" uid="uid://cn8uaj0m5b3h1"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_CEILING_1.jpg-a7a9d9e59377ab009a817dc4f325e69e.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_CEILING_1.jpg-97e87a73564e74ddeb83ca2ca4330a65.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_CEILING_1.jpg" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_CEILING_1.jpg"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_CEILING_1.jpg-a7a9d9e59377ab009a817dc4f325e69e.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_CEILING_1.jpg-97e87a73564e74ddeb83ca2ca4330a65.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://d2avj54f0c875" uid="uid://dsla6bg5mmm72"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_COLUM2N.png-79a252026522cfc73a1c2995d7385dc9.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_COLUM2N.png-e8210a9189f89fb36849f3a4fe85baf4.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_COLUM2N.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_COLUM2N.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_COLUM2N.png-79a252026522cfc73a1c2995d7385dc9.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_COLUM2N.png-e8210a9189f89fb36849f3a4fe85baf4.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://bg3gopdies7rs" uid="uid://dd7e65w0pd0ci"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_COLUMN.jpg-29422606382e26ef362a4840e2cd8bba.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_COLUMN.jpg-dbaa11030c291511e7aa84cbd7aa6223.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_COLUMN.jpg" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_COLUMN.jpg"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_COLUMN.jpg-29422606382e26ef362a4840e2cd8bba.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_COLUMN.jpg-dbaa11030c291511e7aa84cbd7aa6223.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://bswq5wejqnkra" uid="uid://cht55vtpuowx5"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_FLOOR1.jpg-210243b4b01c520af924722e37ab81af.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_FLOOR1.jpg-330aa90b956677fed12e0c96c15defb7.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_FLOOR1.jpg" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_FLOOR1.jpg"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_FLOOR1.jpg-210243b4b01c520af924722e37ab81af.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_FLOOR1.jpg-330aa90b956677fed12e0c96c15defb7.ctex"]
[params] [params]

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://dx2n64djqwq4w" uid="uid://dq85on808gpsv"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_PIPE.jpg-7690528fb5e985b6e07fba1a80d0a2e8.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_PIPE.jpg-b1344de56f24f4c3a084579ef7d38270.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_PIPE.jpg" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_PIPE.jpg"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_PIPE.jpg-7690528fb5e985b6e07fba1a80d0a2e8.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_PIPE.jpg-b1344de56f24f4c3a084579ef7d38270.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c5h8n2fos74xu" uid="uid://donkyolj48lnx"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_SA003.jpg-108241290d80b2aa30039733fa98eb72.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_SA003.jpg-14b1e03648e90d51fba6bc00f3987144.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_SA003.jpg" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_SA003.jpg"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_SA003.jpg-108241290d80b2aa30039733fa98eb72.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_SA003.jpg-14b1e03648e90d51fba6bc00f3987144.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://ct111uttkfli2" uid="uid://bhsx8godgbvo"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_STONE_PANEL_1png.png-e45d1af32d81920b28cf95967e35c725.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_STONE_PANEL_1png.png-1b4b836e93e11de1256ac9a39d275400.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_STONE_PANEL_1png.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_STONE_PANEL_1png.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_STONE_PANEL_1png.png-e45d1af32d81920b28cf95967e35c725.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_STONE_PANEL_1png.png-1b4b836e93e11de1256ac9a39d275400.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://dbmr0k8hupspu" uid="uid://dytao2mlwn70b"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_STONE_PANEL_2png.png-6f95805e3848ed8d5ff538cb9e84305d.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_STONE_PANEL_2png.png-dae434c56748ceee9e01244a65f36c80.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_STONE_PANEL_2png.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_STONE_PANEL_2png.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_STONE_PANEL_2png.png-6f95805e3848ed8d5ff538cb9e84305d.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_STONE_PANEL_2png.png-dae434c56748ceee9e01244a65f36c80.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://j6ekkelyry0g" uid="uid://lk7jcf7k0yc6"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_TILE4.png-d81b3ae64ece7bfd753467d137cdff5e.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_TILE4.png-341f396af0b112deca9c29bf72f064c8.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_TILE4.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_TILE4.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_TILE4.png-d81b3ae64ece7bfd753467d137cdff5e.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_TILE4.png-341f396af0b112deca9c29bf72f064c8.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c2kewrpaio7bd" uid="uid://bw448q8waw8pg"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_TILE5.png-92abfd60ddb5ec94b7aadfa99c00449f.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_TILE5.png-473c4c67f328e124558103b8833a0f46.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_TILE5.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_TILE5.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_TILE5.png-92abfd60ddb5ec94b7aadfa99c00449f.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_TILE5.png-473c4c67f328e124558103b8833a0f46.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://br82gqb6udk20" uid="uid://qktxynvfn2dv"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_WALL TILE 1.jpg-1fe737ce41b2b1349cd4a1c971ef5aa3.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_WALL TILE 1.jpg-10ee2507ca7ea478239559ac2dc9d8f8.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_WALL TILE 1.jpg" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_WALL TILE 1.jpg"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_WALL TILE 1.jpg-1fe737ce41b2b1349cd4a1c971ef5aa3.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_WALL TILE 1.jpg-10ee2507ca7ea478239559ac2dc9d8f8.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://b48wh0pv7ce6k" uid="uid://buxlolvdn4alx"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_brick3.png-fe356cf1e19dff646b1a539e38946364.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_brick3.png-e0867cbfac9fdbc29bb279a8f7bc235e.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_brick3.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_brick3.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_brick3.png-fe356cf1e19dff646b1a539e38946364.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_brick3.png-e0867cbfac9fdbc29bb279a8f7bc235e.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c15ipxbimc8i" uid="uid://60n4xbma260x"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_hand-tiile.png-da0f90aa9f8394e1bf17c3afff895fb6.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_hand-tiile.png-0bac5c804d75697d99aff01ddcd0195e.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_hand-tiile.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_hand-tiile.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_hand-tiile.png-da0f90aa9f8394e1bf17c3afff895fb6.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_hand-tiile.png-0bac5c804d75697d99aff01ddcd0195e.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://xeuwt5oxh43f" uid="uid://drhdnxjtr5nfu"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_mother.png-131efad69b00a2d0a3d5005d149499b2.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_mother.png-95510ff122a2cd3e0dfa8b4ab9ec6fe5.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_mother.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_mother.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_mother.png-131efad69b00a2d0a3d5005d149499b2.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_mother.png-95510ff122a2cd3e0dfa8b4ab9ec6fe5.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://d0xoavoyvfl52" uid="uid://c05aw8lt37duo"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_starsigns.png-d3363bfae8f3691997492b925c24127d.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_starsigns.png-18aad418964ca5cef48520cd41e424b1.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_starsigns.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_starsigns.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_starsigns.png-d3363bfae8f3691997492b925c24127d.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_starsigns.png-18aad418964ca5cef48520cd41e424b1.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://dkb7v5e6j5f8f" uid="uid://bx6qpiilt603p"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_swirled_column.png-613c24f32081f2786f8b0022c2fe1146.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_swirled_column.png-af55290038ddb853f34127288f62c81b.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_swirled_column.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_swirled_column.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_swirled_column.png-613c24f32081f2786f8b0022c2fe1146.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_swirled_column.png-af55290038ddb853f34127288f62c81b.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://b83mwlfp4if76" uid="uid://dc8x3dt0yw1sk"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_tile2.png-26a24acb4a3c13ebb5802b302d182567.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_tile2.png-63ab53588fe43851055c2005ce5ff11b.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_tile2.png" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_tile2.png"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_tile2.png-26a24acb4a3c13ebb5802b302d182567.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_tile2.png-63ab53588fe43851055c2005ce5ff11b.ctex"]
[params] [params]

View File

@@ -2,8 +2,8 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://dl3wcg1qj4hgy" uid="uid://bf5mumq8r1157"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER2_wood_0025_color_1k.jpg-19004a09093b3480c8553c8ed4f7d264.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_wood_0025_color_1k.jpg-570ff86ae0723f950333c605c5d46fb9.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
@@ -13,8 +13,8 @@ generator_parameters={
[deps] [deps]
source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER2_wood_0025_color_1k.jpg" source_file="res://src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_wood_0025_color_1k.jpg"
dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER2_wood_0025_color_1k.jpg-19004a09093b3480c8553c8ed4f7d264.ctex"] dest_files=["res://.godot/imported/ANTECHAMBER_TYPE2_VER3_wood_0025_color_1k.jpg-570ff86ae0723f950333c605c5d46fb9.ctex"]
[params] [params]

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=60 format=4 uid="uid://dpec2lbt83dhe"] [gd_scene load_steps=59 format=4 uid="uid://dpec2lbt83dhe"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_ho6e8"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_ho6e8"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_iwuh7"] [ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_iwuh7"]
@@ -628,9 +628,6 @@ _surfaces = [{
blend_shape_mode = 0 blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_i3ffh") shadow_mesh = SubResource("ArrayMesh_i3ffh")
[sub_resource type="PlaneMesh" id="PlaneMesh_bbi7v"]
size = Vector2(35, 30)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_51rrf"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_51rrf"]
albedo_texture = ExtResource("20_le1vp") albedo_texture = ExtResource("20_le1vp")
texture_filter = 0 texture_filter = 0
@@ -708,13 +705,6 @@ skeleton = NodePath("")
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.9078, -4.05106, -13.6796) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.9078, -4.05106, -13.6796)
[node name="Minimap Texture" type="MeshInstance3D" parent="Room"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00325966, -7.7801, 0)
visible = false
layers = 2
mesh = SubResource("PlaneMesh_bbi7v")
skeleton = NodePath("../..")
[node name="ItemSpawnPoints" type="Node3D" parent="Room"] [node name="ItemSpawnPoints" type="Node3D" parent="Room"]
unique_name_in_owner = true unique_name_in_owner = true

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -4,8 +4,8 @@ state "PlayerLogic State" as GameJamDungeon_PlayerLogic_State {
state "Attacking" as GameJamDungeon_PlayerLogic_State_Attacking state "Attacking" as GameJamDungeon_PlayerLogic_State_Attacking
state "Idle" as GameJamDungeon_PlayerLogic_State_Idle state "Idle" as GameJamDungeon_PlayerLogic_State_Idle
} }
state "Dead" as GameJamDungeon_PlayerLogic_State_Dead
state "Disabled" as GameJamDungeon_PlayerLogic_State_Disabled state "Disabled" as GameJamDungeon_PlayerLogic_State_Disabled
state "Dead" as GameJamDungeon_PlayerLogic_State_Dead
} }
GameJamDungeon_PlayerLogic_State_Alive --> GameJamDungeon_PlayerLogic_State_Alive : Moved GameJamDungeon_PlayerLogic_State_Alive --> GameJamDungeon_PlayerLogic_State_Alive : Moved