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/floors/Floor01.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=13 format=3 uid="uid://bc1sp6xwe0j65"]
[gd_scene load_steps=16 format=3 uid="uid://bc1sp6xwe0j65"]
[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"]
@@ -11,6 +11,9 @@
[ext_resource type="PackedScene" uid="uid://vdhl32je6hq2" path="res://src/map/dungeon/scenes/Antechamber_2.tscn" id="9_icfo6"]
[ext_resource type="PackedScene" uid="uid://cam640h4euewx" path="res://src/map/dungeon/scenes/PitRoom2.tscn" id="10_4qi15"]
[ext_resource type="PackedScene" uid="uid://i781lbf2wb22" path="res://src/map/dungeon/scenes/TreeRoom.tscn" id="10_kwn4p"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="12_aw26s"]
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="13_kwaga"]
[ext_resource type="PackedScene" uid="uid://b0gwivt7cw7nd" path="res://src/enemy/enemy_types/michael/Michael.tscn" id="14_gkkr3"]
[sub_resource type="NavigationMesh" id="NavigationMesh_4d8mx"]
sample_partition_type = 2
@@ -34,3 +37,7 @@ generate_on_ready = false
heuristic_scale = 3.0
corridor_cost_multiplier = 0.1
hide_debug_visuals_for_all_generated_rooms = false
[node name="EnemyDatabase" parent="." instance=ExtResource("12_aw26s")]
unique_name_in_owner = true
EnemyList = Array[PackedScene]([ExtResource("13_kwaga"), ExtResource("14_gkkr3")])

13
src/map/dungeon/floors/Floor02.tscn
View File

@@ -1,15 +1,18 @@
[gd_scene load_steps=12 format=3 uid="uid://dmiqwmivkjgmq"]
[gd_scene load_steps=15 format=3 uid="uid://dmiqwmivkjgmq"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_afeds"]
[ext_resource type="Script" uid="uid://b1x125h0tya2w" 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://b82dx66mgs2d7" path="res://src/map/dungeon/scenes/BasinRoom.tscn" id="4_r7shj"]
[ext_resource type="PackedScene" uid="uid://b7111krf365x0" path="res://src/map/dungeon/scenes/InnerBalcony.tscn" id="5_geyju"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonFloor.cs" id="5_ld0kt"]
[ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="5_ld0kt"]
[ext_resource type="PackedScene" uid="uid://c1qicmrcg6q6x" path="res://src/map/dungeon/scenes/ColumnRoom.tscn" id="6_jgovx"]
[ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="7_86if8"]
[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"]
[ext_resource type="PackedScene" uid="uid://cam640h4euewx" path="res://src/map/dungeon/scenes/PitRoom2.tscn" id="9_lpelw"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="11_yvj8v"]
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="12_pmbic"]
[ext_resource type="PackedScene" uid="uid://b0gwivt7cw7nd" path="res://src/enemy/enemy_types/michael/Michael.tscn" id="13_eyrkc"]
[sub_resource type="NavigationMesh" id="NavigationMesh_gqi8w"]
border_size = 1.0
@@ -31,3 +34,7 @@ corridor_room_scene = ExtResource("7_86if8")
dungeon_size = Vector3i(30, 1, 30)
voxel_scale = Vector3(4, 4, 4)
generate_on_ready = false
[node name="EnemyDatabase" parent="." instance=ExtResource("11_yvj8v")]
unique_name_in_owner = true
EnemyList = Array[PackedScene]([ExtResource("12_pmbic"), ExtResource("13_eyrkc")])

15
src/map/dungeon/floors/Floor03.tscn
View File

@@ -1,15 +1,19 @@
[gd_scene load_steps=12 format=3 uid="uid://dl1scvkp8r5sw"]
[gd_scene load_steps=16 format=3 uid="uid://dl1scvkp8r5sw"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_ou8lo"]
[ext_resource type="Script" uid="uid://b1x125h0tya2w" 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://b82dx66mgs2d7" path="res://src/map/dungeon/scenes/BasinRoom.tscn" id="4_2o7kq"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonFloor.cs" id="5_mo2td"]
[ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="5_mo2td"]
[ext_resource type="PackedScene" uid="uid://b7111krf365x0" path="res://src/map/dungeon/scenes/InnerBalcony.tscn" id="5_wo0bu"]
[ext_resource type="PackedScene" uid="uid://c1qicmrcg6q6x" path="res://src/map/dungeon/scenes/ColumnRoom.tscn" id="6_o010k"]
[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://cam640h4euewx" path="res://src/map/dungeon/scenes/PitRoom2.tscn" id="9_imrv0"]
[ext_resource type="PackedScene" uid="uid://vdhl32je6hq2" path="res://src/map/dungeon/scenes/Antechamber_2.tscn" id="9_ym1ny"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="11_kyvxc"]
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/sproingy/Sproingy.tscn" id="12_1j6d5"]
[ext_resource type="PackedScene" uid="uid://b0gwivt7cw7nd" path="res://src/enemy/enemy_types/michael/Michael.tscn" id="13_q8fb5"]
[ext_resource type="PackedScene" uid="uid://cvk007twac22c" path="res://src/enemy/enemy_types/filth_eater/FilthEater.tscn" id="14_g81xt"]
[sub_resource type="NavigationMesh" id="NavigationMesh_gqi8w"]
border_size = 1.0
@@ -31,3 +35,8 @@ corridor_room_scene = ExtResource("7_qjouh")
dungeon_size = Vector3i(60, 1, 60)
voxel_scale = Vector3(4, 4, 4)
generate_on_ready = false
[node name="EnemyDatabase" parent="." instance=ExtResource("11_kyvxc")]
unique_name_in_owner = true
EnemyList = Array[PackedScene]([ExtResource("12_1j6d5"), ExtResource("13_q8fb5"), ExtResource("14_g81xt")])
SpawnRate = PackedFloat32Array(0.5, 1, 1)

6
src/map/dungeon/floors/Floor10.tscn Normal file
View File

@@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://g28xmp6cn16h"]
[ext_resource type="Script" uid="uid://b74nta2e20elm" path="res://src/map/dungeon/code/BossFloor.cs" id="1_0xjxw"]
[node name="Floor10" type="Node3D"]
script = ExtResource("1_0xjxw")

6
src/map/dungeon/floors/Floor11.tscn
View File

@@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://g28xmp6cn16h"]
[ext_resource type="Script" path="res://src/map/dungeon/code/BossFloor.cs" id="1_gsbuk"]
[node name="Floor11" type="Node3D"]
script = ExtResource("1_gsbuk")