zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix attacks by player and enemy

Browse Source
This commit is contained in:
Zenny
2025-02-06 03:33:25 -08:00
parent 4e6c545e81
commit 0cdae88952
31 changed files with 231 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/dungeon/floors/Floor01.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=13 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://addons/SimpleDungeons/DungeonGenerator3D.gd" id="2_cxmwa"]
[ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_0ecnn"]
[ext_resource type="Script" uid="uid://b1x125h0tya2w" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="2_cxmwa"]
[ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/scenes/Antechamber.tscn" id="3_tsw3y"]
[ext_resource type="PackedScene" uid="uid://b82dx66mgs2d7" path="res://src/map/dungeon/scenes/BasinRoom.tscn" id="4_b2rkl"]
[ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="4_gni6i"]

13
src/map/dungeon/scenes/Antechamber.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=59 format=4 uid="uid://dpec2lbt83dhe"]
[gd_scene load_steps=60 format=4 uid="uid://dpec2lbt83dhe"]
[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" uid="uid://ce73fuh74l81l" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_ho6e8"]
[ext_resource type="Script" uid="uid://daetb3e2nm56p" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_iwuh7"]
[ext_resource type="Texture2D" uid="uid://ba5yl0syukqtx" path="res://src/map/dungeon/models/antechamber_1/ANTECHAMBER_TYPE1_VER2_WALL TILE 1.jpg" id="3_isaec"]
[ext_resource type="Texture2D" uid="uid://vtnruibl68fq" path="res://src/map/dungeon/models/antechamber_1/ANTECHAMBER_TYPE1_VER2_FLOOR1.jpg" id="4_5vwwt"]
[ext_resource type="Texture2D" uid="uid://b21vqw03xewaq" path="res://src/map/dungeon/models/antechamber_1/ANTECHAMBER_TYPE1_VER2_TILE4.png" id="5_4tpx2"]
@@ -16,12 +16,13 @@
[ext_resource type="Texture2D" uid="uid://cpln18w0wvan" path="res://src/map/dungeon/models/antechamber_1/ANTECHAMBER_TYPE1_VER2_mother.png" id="14_1wlp7"]
[ext_resource type="Texture2D" uid="uid://b8dow4tvs1ktr" path="res://src/map/dungeon/models/antechamber_1/ANTECHAMBER_TYPE1_VER2_brick3.png" id="15_rowg2"]
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="17_25wvm"]
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="18_6qc76"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="18_v6hub"]
[ext_resource type="Texture2D" uid="uid://bkvegamuqdsdd" path="res://src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg" id="19_06gih"]
[ext_resource type="Texture2D" uid="uid://del2dfj3etokd" path="res://src/map/dungeon/textures/BLOCKED-DOOR_REGULAR.png" id="20_le1vp"]
[ext_resource type="Material" uid="uid://bsafm3t4drpl" path="res://src/map/dungeon/textures/MinimapTexture.tres" id="21_8vpi3"]
[ext_resource type="Script" path="res://src/map/dungeon/code/MinimapManager.cs" id="21_h0ti6"]
[ext_resource type="Script" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="21_m6pqv"]
[ext_resource type="Script" uid="uid://c6s8hvdj3u3aq" path="res://src/map/dungeon/code/MinimapManager.cs" id="21_h0ti6"]
[ext_resource type="Script" uid="uid://yl7wyeo5m725" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="21_m6pqv"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3hnk1"]
resource_name = "Material.041"
@@ -737,6 +738,8 @@ unique_name_in_owner = true
[node name="EnemyDatabase" parent="Antechamber" instance=ExtResource("18_v6hub")]
unique_name_in_owner = true
EnemyList = Array[PackedScene]([ExtResource("18_6qc76")])
SpawnRate = PackedFloat32Array(0.5)
[node name="TeleportSpawn" type="Marker3D" parent="Antechamber"]
unique_name_in_owner = true

5
src/map/dungeon/scenes/Antechamber_2.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=89 format=4 uid="uid://vdhl32je6hq2"]
[gd_scene load_steps=90 format=4 uid="uid://vdhl32je6hq2"]
[ext_resource type="Script" uid="uid://ce73fuh74l81l" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_j1kxr"]
[ext_resource type="Script" uid="uid://daetb3e2nm56p" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_6qgti"]
@@ -25,6 +25,7 @@
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="23_rhlsp"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="24_168rc"]
[ext_resource type="Script" uid="uid://yl7wyeo5m725" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="25_8521a"]
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="25_qsemm"]
[ext_resource type="Script" uid="uid://c6s8hvdj3u3aq" path="res://src/map/dungeon/code/MinimapManager.cs" id="26_tvm82"]
[ext_resource type="Material" uid="uid://bsafm3t4drpl" path="res://src/map/dungeon/textures/MinimapTexture.tres" id="27_mgor6"]
@@ -1812,6 +1813,8 @@ unique_name_in_owner = true
[node name="EnemyDatabase" parent="Antechamber2" instance=ExtResource("24_168rc")]
unique_name_in_owner = true
EnemyList = Array[PackedScene]([ExtResource("25_qsemm")])
SpawnRate = PackedFloat32Array(0.5)
[node name="TeleportSpawn" type="Marker3D" parent="Antechamber2"]
unique_name_in_owner = true

15
src/map/dungeon/scenes/ColumnRoom.tscn
View File

@@ -1,7 +1,8 @@
[gd_scene load_steps=107 format=4 uid="uid://c1qicmrcg6q6x"]
[gd_scene load_steps=108 format=4 uid="uid://c1qicmrcg6q6x"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_x1cte"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_g5xc4"]
[ext_resource type="Script" uid="uid://ce73fuh74l81l" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_x1cte"]
[ext_resource type="Script" uid="uid://daetb3e2nm56p" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_g5xc4"]
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="5_nsoky"]
[ext_resource type="Texture2D" uid="uid://b2h2devo04do7" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN-DARKER.png" id="7_uspsn"]
[ext_resource type="Texture2D" uid="uid://dafrf8sqqrhlr" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_effed-TILES-2.png" id="8_hk2oq"]
[ext_resource type="Texture2D" uid="uid://cg2mvnq7f8uhj" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_WALL TILE 1.jpg" id="9_r0ib2"]
@@ -13,7 +14,7 @@
[ext_resource type="Texture2D" uid="uid://bont0nuph50qn" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_5r4b2vhc34xa1.png" id="15_k21dx"]
[ext_resource type="Texture2D" uid="uid://ne8b5ixuw7wy" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_hand-tiile.png" id="16_84ul5"]
[ext_resource type="Texture2D" uid="uid://dfidrnk2qw3pf" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_CEILING_1.jpg" id="17_8kv76"]
[ext_resource type="Shader" path="res://src/map/overworld/water.gdshader" id="18_8816c"]
[ext_resource type="Shader" uid="uid://blrcjqdo7emhs" path="res://src/map/overworld/water.gdshader" id="18_8816c"]
[ext_resource type="Texture2D" uid="uid://1knt4qif78c1" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN.jpg" id="18_v5tkv"]
[ext_resource type="Texture2D" uid="uid://bn5lx2dal2x23" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_others_0020_color_1k.jpg" id="19_3akwg"]
[ext_resource type="Texture2D" uid="uid://c5c3i2b10oslb" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_COLUMN_13.jpg" id="20_ae12c"]
@@ -27,8 +28,8 @@
[ext_resource type="Material" uid="uid://bsafm3t4drpl" path="res://src/map/dungeon/textures/MinimapTexture.tres" id="25_3jgi2"]
[ext_resource type="Texture2D" uid="uid://ca36l3t6htau7" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_brick3.png" id="25_hncep"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="25_jy2bd"]
[ext_resource type="Script" path="res://src/map/dungeon/code/MinimapManager.cs" id="26_l3250"]
[ext_resource type="Script" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="26_uyqow"]
[ext_resource type="Script" uid="uid://c6s8hvdj3u3aq" path="res://src/map/dungeon/code/MinimapManager.cs" id="26_l3250"]
[ext_resource type="Script" uid="uid://yl7wyeo5m725" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="26_uyqow"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_rone1"]
resource_name = "Material.263"
@@ -1537,6 +1538,8 @@ unique_name_in_owner = true
[node name="EnemyDatabase" parent="ColumnRoom" instance=ExtResource("25_jy2bd")]
unique_name_in_owner = true
EnemyList = Array[PackedScene]([ExtResource("5_nsoky")])
SpawnRate = PackedFloat32Array(0.5)
[node name="TeleportSpawn" type="Marker3D" parent="ColumnRoom"]
unique_name_in_owner = true

5
src/map/dungeon/scenes/InnerBalcony.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=85 format=4 uid="uid://b7111krf365x0"]
[gd_scene load_steps=86 format=4 uid="uid://b7111krf365x0"]
[ext_resource type="Script" uid="uid://ce73fuh74l81l" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_jccmw"]
[ext_resource type="Script" uid="uid://daetb3e2nm56p" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_5p5p8"]
@@ -18,6 +18,7 @@
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="15_n8s21"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="16_mk0iw"]
[ext_resource type="Script" uid="uid://yl7wyeo5m725" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="17_atu1n"]
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="18_j7bvl"]
[ext_resource type="Material" uid="uid://bsafm3t4drpl" path="res://src/map/dungeon/textures/MinimapTexture.tres" id="19_dmkqn"]
[ext_resource type="Script" uid="uid://c6s8hvdj3u3aq" path="res://src/map/dungeon/code/MinimapManager.cs" id="19_gi8bh"]
@@ -1192,6 +1193,8 @@ unique_name_in_owner = true
[node name="EnemyDatabase" parent="InnerBalcony" instance=ExtResource("16_mk0iw")]
unique_name_in_owner = true
EnemyList = Array[PackedScene]([ExtResource("18_j7bvl")])
SpawnRate = PackedFloat32Array(0.5)
[node name="TeleportSpawn" type="Marker3D" parent="InnerBalcony"]
unique_name_in_owner = true

5
src/map/dungeon/scenes/PitRoom2.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=87 format=4 uid="uid://cam640h4euewx"]
[gd_scene load_steps=88 format=4 uid="uid://cam640h4euewx"]
[ext_resource type="Script" uid="uid://ce73fuh74l81l" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_hww7y"]
[ext_resource type="Script" uid="uid://daetb3e2nm56p" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_abm0b"]
@@ -21,6 +21,7 @@
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="19_yh0qc"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="20_5xp0x"]
[ext_resource type="Script" uid="uid://yl7wyeo5m725" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="21_5mo1p"]
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="21_ex11s"]
[ext_resource type="Script" uid="uid://c6s8hvdj3u3aq" path="res://src/map/dungeon/code/MinimapManager.cs" id="22_h4dhe"]
[ext_resource type="Material" uid="uid://bsafm3t4drpl" path="res://src/map/dungeon/textures/MinimapTexture.tres" id="23_2yaqs"]
@@ -1303,6 +1304,8 @@ unique_name_in_owner = true
[node name="EnemyDatabase" parent="PitRoom" instance=ExtResource("20_5xp0x")]
unique_name_in_owner = true
EnemyList = Array[PackedScene]([ExtResource("21_ex11s")])
SpawnRate = PackedFloat32Array(0.5)
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="PitRoom"]
transform = Transform3D(-0.866024, -0.433016, 0.250001, 0, 0.499998, 0.866026, -0.500003, 0.749999, -0.43301, 0.764877, 4.39249, -0.482112)

5
src/map/dungeon/scenes/WaterRoom.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=89 format=4 uid="uid://dfpyfpnya0f4u"]
[gd_scene load_steps=90 format=4 uid="uid://dfpyfpnya0f4u"]
[ext_resource type="Script" uid="uid://ce73fuh74l81l" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_ulct7"]
[ext_resource type="Script" uid="uid://daetb3e2nm56p" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_7yem4"]
@@ -27,6 +27,7 @@
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="24_7qo1y"]
[ext_resource type="Material" uid="uid://bsafm3t4drpl" path="res://src/map/dungeon/textures/MinimapTexture.tres" id="24_w0ing"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="25_bfjom"]
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="25_hc66w"]
[ext_resource type="Script" uid="uid://yl7wyeo5m725" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="26_c86xl"]
[ext_resource type="Script" uid="uid://c6s8hvdj3u3aq" path="res://src/map/dungeon/code/MinimapManager.cs" id="28_txiha"]
@@ -1194,6 +1195,8 @@ unique_name_in_owner = true
[node name="EnemyDatabase" parent="Water Room" instance=ExtResource("25_bfjom")]
unique_name_in_owner = true
EnemyList = Array[PackedScene]([ExtResource("25_hc66w")])
SpawnRate = PackedFloat32Array(0.5)
[node name="TeleportSpawn" type="Marker3D" parent="Water Room"]
unique_name_in_owner = true