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

Add hitboxes to other enemies, move enemy database to floor level, normalize strafing input to avoid extra speed gained by moving and strafing

Browse Source
This commit is contained in:
Zenny
2025-02-07 03:11:32 -08:00
parent b8e5794d48
commit 1f9c05c0a7
26 changed files with 97 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
[gd_scene load_steps=60 format=4 uid="uid://dpec2lbt83dhe"]
[gd_scene load_steps=58 format=4 uid="uid://dpec2lbt83dhe"]
[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"]
@@ -16,8 +16,6 @@
[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"]
@@ -736,11 +734,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.55793, -2.98, 2.77761)
[node name="ItemDatabase" parent="Antechamber" instance=ExtResource("17_25wvm")]
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
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.33663, -1.49877, 0.845012)

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

@@ -1,4 +1,4 @@
[gd_scene load_steps=90 format=4 uid="uid://vdhl32je6hq2"]
[gd_scene load_steps=88 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"]
@@ -23,9 +23,7 @@
[ext_resource type="Texture2D" uid="uid://del2dfj3etokd" path="res://src/map/dungeon/textures/BLOCKED-DOOR_REGULAR.png" id="21_jdoki"]
[ext_resource type="Texture2D" uid="uid://bkvegamuqdsdd" path="res://src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg" id="22_3r6v3"]
[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"]
@@ -1811,11 +1809,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.9514, -2.12568, -13.2894)
[node name="ItemDatabase" parent="Antechamber2" instance=ExtResource("23_rhlsp")]
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
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.74798, -1.55568, 2.8662)

12
src/map/dungeon/scenes/BasinRoom.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=66 format=4 uid="uid://b82dx66mgs2d7"]
[gd_scene load_steps=65 format=4 uid="uid://b82dx66mgs2d7"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_0qew1"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_dthr7"]
[ext_resource type="Script" uid="uid://ce73fuh74l81l" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_0qew1"]
[ext_resource type="Script" uid="uid://daetb3e2nm56p" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_dthr7"]
[ext_resource type="Texture2D" uid="uid://0s6f8h4dyhsx" path="res://src/map/dungeon/models/basin_room/BASIN_ROOM_VER2_concrete_0003_color_1k.png" id="2_td7cv"]
[ext_resource type="Texture2D" uid="uid://ja1f8fjlvn88" path="res://src/map/dungeon/models/basin_room/BASIN_ROOM_VER2_mother.png" id="3_fplhk"]
[ext_resource type="Texture2D" uid="uid://del2dfj3etokd" path="res://src/map/dungeon/textures/BLOCKED-DOOR_REGULAR.png" id="3_xx585"]
@@ -18,8 +18,7 @@
[ext_resource type="Texture2D" uid="uid://chn58u65p126k" path="res://src/map/dungeon/models/basin_room/BASIN_ROOM_VER2_TILE4.png" id="13_oh2ks"]
[ext_resource type="Texture2D" uid="uid://bb5c4q66smcc7" path="res://src/map/dungeon/models/basin_room/BASIN_ROOM_VER2_TILE5.png" id="14_x3qy3"]
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="18_bwap2"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="19_oogxr"]
[ext_resource type="Script" path="res://src/map/dungeon/code/MinimapManager.cs" id="20_q54wm"]
[ext_resource type="Script" uid="uid://c6s8hvdj3u3aq" path="res://src/map/dungeon/code/MinimapManager.cs" id="20_q54wm"]
[ext_resource type="Material" uid="uid://bsafm3t4drpl" path="res://src/map/dungeon/textures/MinimapTexture.tres" id="20_yhlud"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6oscl"]
@@ -813,9 +812,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.55, -2.55692, 0)
[node name="ItemDatabase" parent="BasinRoom/BASIN_ROOM_VER2" instance=ExtResource("18_bwap2")]
unique_name_in_owner = true
[node name="EnemyDatabase" parent="BasinRoom/BASIN_ROOM_VER2" instance=ExtResource("19_oogxr")]
unique_name_in_owner = true
[node name="TeleportSpawn" type="Marker3D" parent="BasinRoom/BASIN_ROOM_VER2"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.28791, 10.2563, 106.274)

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

@@ -1,8 +1,7 @@
[gd_scene load_steps=108 format=4 uid="uid://c1qicmrcg6q6x"]
[gd_scene load_steps=106 format=4 uid="uid://c1qicmrcg6q6x"]
[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"]
@@ -27,7 +26,6 @@
[ext_resource type="Texture2D" uid="uid://jrsx4xa5qm15" path="res://src/map/dungeon/models/column_room/COLUMN_ROOM_VER3_mother.png" id="24_wcs73"]
[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" 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"]
@@ -1536,11 +1534,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.32741, -2, -3.41341)
[node name="ItemDatabase" parent="ColumnRoom" instance=ExtResource("24_i01sv")]
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
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.381, -1.83231, 0.0164348)

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

@@ -1,4 +1,4 @@
[gd_scene load_steps=86 format=4 uid="uid://b7111krf365x0"]
[gd_scene load_steps=84 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"]
@@ -16,9 +16,7 @@
[ext_resource type="Texture2D" uid="uid://del2dfj3etokd" path="res://src/map/dungeon/textures/BLOCKED-DOOR_REGULAR.png" id="13_66rjw"]
[ext_resource type="Texture2D" uid="uid://bkvegamuqdsdd" path="res://src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg" id="14_vh3wx"]
[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"]
@@ -1191,11 +1189,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.346, -0.5, -3.546)
[node name="ItemDatabase" parent="InnerBalcony" instance=ExtResource("15_n8s21")]
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
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8372, -1.46163, -2.84738)

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

@@ -1,4 +1,4 @@
[gd_scene load_steps=88 format=4 uid="uid://cam640h4euewx"]
[gd_scene load_steps=86 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"]
@@ -19,9 +19,7 @@
[ext_resource type="Texture2D" uid="uid://del2dfj3etokd" path="res://src/map/dungeon/textures/BLOCKED-DOOR_REGULAR.png" id="16_5ekaa"]
[ext_resource type="Texture2D" uid="uid://bkvegamuqdsdd" path="res://src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg" id="17_4r724"]
[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"]
@@ -1302,11 +1300,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.2311, -5.81234, 0)
[node name="ItemDatabase" parent="PitRoom" instance=ExtResource("19_yh0qc")]
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)
light_energy = 0.0

6
src/map/dungeon/scenes/TreeRoom.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=85 format=4 uid="uid://i781lbf2wb22"]
[gd_scene load_steps=84 format=4 uid="uid://i781lbf2wb22"]
[ext_resource type="Script" uid="uid://ce73fuh74l81l" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_owolg"]
[ext_resource type="Script" uid="uid://daetb3e2nm56p" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_557rl"]
@@ -19,7 +19,6 @@
[ext_resource type="Texture2D" uid="uid://cagfhd5tagp27" path="res://src/map/dungeon/models/tree_room/TREE_ROOM_VER2_TILE5.png" id="16_linox"]
[ext_resource type="Texture2D" uid="uid://cjjdttsu7sily" path="res://src/map/dungeon/models/tree_room/TREE_ROOM_VER2_starsigns.png" id="17_xt3ee"]
[ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="19_rlr0c"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="20_blcsb"]
[ext_resource type="Script" uid="uid://yl7wyeo5m725" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="21_s12yd"]
[ext_resource type="Material" uid="uid://bsafm3t4drpl" path="res://src/map/dungeon/textures/MinimapTexture.tres" id="22_3xjct"]
[ext_resource type="Texture2D" uid="uid://del2dfj3etokd" path="res://src/map/dungeon/textures/BLOCKED-DOOR_REGULAR.png" id="23_sd6x0"]
@@ -1162,9 +1161,6 @@ shape = SubResource("ConcavePolygonShape3D_b3r1q")
[node name="ItemDatabase" parent="TreeRoom" instance=ExtResource("19_rlr0c")]
unique_name_in_owner = true
[node name="EnemyDatabase" parent="TreeRoom" instance=ExtResource("20_blcsb")]
unique_name_in_owner = true
[node name="TeleportSpawn" type="Marker3D" parent="TreeRoom"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.37813, -1.65528, -4.78663)

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

@@ -1,4 +1,4 @@
[gd_scene load_steps=90 format=4 uid="uid://dfpyfpnya0f4u"]
[gd_scene load_steps=88 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"]
@@ -26,8 +26,6 @@
[ext_resource type="Texture2D" uid="uid://bkvegamuqdsdd" path="res://src/map/dungeon/corridor/CORRIDOR test_FLOOR1.jpg" id="23_83smy"]
[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"]
@@ -1193,11 +1191,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.77329, 2.00295, -18.2136)
[node name="ItemDatabase" parent="Water Room" instance=ExtResource("24_7qo1y")]
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
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.606, -1.41305, -0.292998)