diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.tscn index 6819cb35..3e93e17b 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=21 format=3 uid="uid://crsy7gygjy317"] +[gd_scene load_steps=22 format=3 uid="uid://crsy7gygjy317"] [ext_resource type="Script" uid="uid://cq6b4ma3sy1en" path="res://src/enemy/enemy_types/01. sproingy/Sproingy.cs" id="1_xsluo"] +[ext_resource type="Script" uid="uid://b6vgwsjlshci" path="res://src/items/InventoryItemStats.cs" id="2_515no"] [ext_resource type="Resource" uid="uid://d0cxrf0nldona" path="res://src/items/consumable/resources/Somalata Electuary.tres" id="3_4i0u2"] [ext_resource type="Resource" uid="uid://75fpkwfp0t0k" path="res://src/items/consumable/resources/Catholicon Draught.tres" id="3_515no"] [ext_resource type="Script" uid="uid://bei3s7yr6xkc0" path="res://src/enemy/EnemyLootTable.cs" id="4_515no"] @@ -16,7 +17,7 @@ [sub_resource type="Resource" id="Resource_fa44e"] script = ExtResource("4_515no") -Items = [ExtResource("3_4i0u2"), ExtResource("3_515no"), ExtResource("4_orghr")] +Items = Array[ExtResource("2_515no")]([ExtResource("3_4i0u2"), ExtResource("3_515no"), ExtResource("4_orghr")]) metadata/_custom_type_script = "uid://bei3s7yr6xkc0" [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_cwfph"] diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/Ballos.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/Ballos.tscn index bb49c607..46831ffe 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/Ballos.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/Ballos.tscn @@ -78,13 +78,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) [node name="PatrolBehavior" parent="Components" instance=ExtResource("4_bjnvx")] unique_name_in_owner = true -_patrolSpeed = 325.0 +PatrolSpeed = 200.0 _thinkTime = 2.0 _patrolTime = 30.0 [node name="FollowBehavior" parent="Components" instance=ExtResource("5_55sdf")] unique_name_in_owner = true -_followSpeed = 400.0 +FollowSpeed = 500.0 [node name="EngagePlayerBehavior" parent="Components" instance=ExtResource("6_2xj0s")] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeaven.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeaven.tscn index 393248e4..1071ecb3 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeaven.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeaven.tscn @@ -82,7 +82,7 @@ unique_name_in_owner = true [node name="FollowBehavior" parent="Components" instance=ExtResource("5_s5x4o")] unique_name_in_owner = true -_followSpeed = 150.0 +FollowSpeed = 300.0 [node name="EngagePlayerBehavior" parent="Components" instance=ExtResource("6_cacc5")] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/map/Map.tscn b/Zennysoft.Game.Ma/src/map/Map.tscn index 3ab1247b..76929a7f 100644 --- a/Zennysoft.Game.Ma/src/map/Map.tscn +++ b/Zennysoft.Game.Ma/src/map/Map.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=36 format=3 uid="uid://by67pn7fdsg1m"] +[gd_scene load_steps=84 format=3 uid="uid://by67pn7fdsg1m"] [ext_resource type="Script" uid="uid://14e8mu48ed4" path="res://src/map/Map.cs" id="1_bw70o"] [ext_resource type="Script" uid="uid://bnxutyeas2ymm" path="res://src/map/dungeon/floors/FloorScene.cs" id="2_0qcd2"] @@ -37,46 +37,202 @@ FloorType = 2 EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_v14r0"), SubResource("Resource_0qcd2")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_31a0u"] +script = ExtResource("2_s7lwc") +EnemyType = 0 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_sbsee"] +script = ExtResource("2_s7lwc") +EnemyType = 1 +SpawnRate = 0.4 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_qamtw"] +script = ExtResource("2_s7lwc") +EnemyType = 2 +SpawnRate = 0.1 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_05fhy"] +script = ExtResource("2_s7lwc") +EnemyType = 15 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_55rmo"] script = ExtResource("2_0qcd2") FloorDisplayName = "02" FloorType = 3 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_31a0u"), SubResource("Resource_sbsee"), SubResource("Resource_qamtw"), SubResource("Resource_05fhy")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_j54h1"] +script = ExtResource("2_s7lwc") +EnemyType = 0 +SpawnRate = 0.1 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_41t83"] +script = ExtResource("2_s7lwc") +EnemyType = 1 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_jddi1"] +script = ExtResource("2_s7lwc") +EnemyType = 3 +SpawnRate = 0.2 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_4dgab"] +script = ExtResource("2_s7lwc") +EnemyType = 2 +SpawnRate = 0.2 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_i5amp"] +script = ExtResource("2_s7lwc") +EnemyType = 15 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_f6kwn"] script = ExtResource("2_0qcd2") FloorDisplayName = "03" FloorType = 4 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_j54h1"), SubResource("Resource_41t83"), SubResource("Resource_jddi1"), SubResource("Resource_4dgab"), SubResource("Resource_i5amp")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_qvir4"] +script = ExtResource("2_s7lwc") +EnemyType = 2 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_agjtk"] +script = ExtResource("2_s7lwc") +EnemyType = 3 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_6ovdx"] +script = ExtResource("2_s7lwc") +EnemyType = 10 +SpawnRate = 0.1 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_xapu4"] +script = ExtResource("2_s7lwc") +EnemyType = 15 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_ne2vg"] script = ExtResource("2_0qcd2") FloorDisplayName = "04" FloorType = 5 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_qvir4"), SubResource("Resource_agjtk"), SubResource("Resource_6ovdx"), SubResource("Resource_xapu4")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_yvycd"] +script = ExtResource("2_s7lwc") +EnemyType = 2 +SpawnRate = 0.1 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_n7hv1"] +script = ExtResource("2_s7lwc") +EnemyType = 3 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_xucf1"] +script = ExtResource("2_s7lwc") +EnemyType = 10 +SpawnRate = 0.3 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_05rbo"] +script = ExtResource("2_s7lwc") +EnemyType = 4 +SpawnRate = 0.1 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_j6je7"] +script = ExtResource("2_s7lwc") +EnemyType = 15 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_abpbr"] script = ExtResource("2_0qcd2") FloorDisplayName = "05" FloorType = 6 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_yvycd"), SubResource("Resource_n7hv1"), SubResource("Resource_xucf1"), SubResource("Resource_05rbo"), SubResource("Resource_j6je7")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_0sv0w"] +script = ExtResource("2_s7lwc") +EnemyType = 3 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_2qx38"] +script = ExtResource("2_s7lwc") +EnemyType = 10 +SpawnRate = 0.3 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_l0dea"] +script = ExtResource("2_s7lwc") +EnemyType = 4 +SpawnRate = 0.3 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_ibpjk"] +script = ExtResource("2_s7lwc") +EnemyType = 15 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_caf7v"] script = ExtResource("2_0qcd2") FloorDisplayName = "06" FloorType = 7 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_0sv0w"), SubResource("Resource_2qx38"), SubResource("Resource_l0dea"), SubResource("Resource_ibpjk")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_q2npb"] +script = ExtResource("2_s7lwc") +EnemyType = 3 +SpawnRate = 0.1 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_2fper"] +script = ExtResource("2_s7lwc") +EnemyType = 10 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_rrr2o"] +script = ExtResource("2_s7lwc") +EnemyType = 4 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_hxcac"] +script = ExtResource("2_s7lwc") +EnemyType = 15 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_y74f3"] script = ExtResource("2_0qcd2") FloorDisplayName = "07" FloorType = 8 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_q2npb"), SubResource("Resource_2fper"), SubResource("Resource_rrr2o"), SubResource("Resource_hxcac")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" [sub_resource type="Resource" id="Resource_dbqu2"] @@ -86,53 +242,185 @@ FloorType = 16 EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_vjitv"] +script = ExtResource("2_s7lwc") +EnemyType = 6 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_57jag"] +script = ExtResource("2_s7lwc") +EnemyType = 7 +SpawnRate = 0.1 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_xcm54"] script = ExtResource("2_0qcd2") FloorDisplayName = "09" FloorType = 9 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_vjitv"), SubResource("Resource_57jag")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_l3psq"] +script = ExtResource("2_s7lwc") +EnemyType = 6 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_7p558"] +script = ExtResource("2_s7lwc") +EnemyType = 14 +SpawnRate = 0.1 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_n8hp7"] +script = ExtResource("2_s7lwc") +EnemyType = 7 +SpawnRate = 0.4 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_pvu0e"] script = ExtResource("2_0qcd2") FloorDisplayName = "10" FloorType = 10 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_l3psq"), SubResource("Resource_7p558"), SubResource("Resource_n8hp7")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_aoo3h"] +script = ExtResource("2_s7lwc") +EnemyType = 6 +SpawnRate = 0.3 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_s44ro"] +script = ExtResource("2_s7lwc") +EnemyType = 7 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_kx0ag"] +script = ExtResource("2_s7lwc") +EnemyType = 14 +SpawnRate = 0.3 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_1de7e"] script = ExtResource("2_0qcd2") FloorDisplayName = "11" FloorType = 11 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_aoo3h"), SubResource("Resource_s44ro"), SubResource("Resource_kx0ag")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_tevrf"] +script = ExtResource("2_s7lwc") +EnemyType = 7 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_dxle1"] +script = ExtResource("2_s7lwc") +EnemyType = 14 +SpawnRate = 0.3 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_kiui0"] +script = ExtResource("2_s7lwc") +EnemyType = 9 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_5suoo"] script = ExtResource("2_0qcd2") FloorDisplayName = "12" FloorType = 12 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_tevrf"), SubResource("Resource_dxle1"), SubResource("Resource_kiui0")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_ob0kx"] +script = ExtResource("2_s7lwc") +EnemyType = 7 +SpawnRate = 0.1 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_ebb74"] +script = ExtResource("2_s7lwc") +EnemyType = 14 +SpawnRate = 0.4 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_pp66l"] +script = ExtResource("2_s7lwc") +EnemyType = 13 +SpawnRate = 0.4 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_00lo0"] +script = ExtResource("2_s7lwc") +EnemyType = 9 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_t2vkt"] script = ExtResource("2_0qcd2") FloorDisplayName = "13" FloorType = 13 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_ob0kx"), SubResource("Resource_ebb74"), SubResource("Resource_pp66l"), SubResource("Resource_00lo0")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_sqxyt"] +script = ExtResource("2_s7lwc") +EnemyType = 14 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_e4rt6"] +script = ExtResource("2_s7lwc") +EnemyType = 13 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_n3ivb"] +script = ExtResource("2_s7lwc") +EnemyType = 15 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_k53q8"] +script = ExtResource("2_s7lwc") +EnemyType = 9 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_hi63v"] script = ExtResource("2_0qcd2") FloorDisplayName = "14" FloorType = 14 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_sqxyt"), SubResource("Resource_e4rt6"), SubResource("Resource_n3ivb"), SubResource("Resource_k53q8")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" +[sub_resource type="Resource" id="Resource_47opl"] +script = ExtResource("2_s7lwc") +EnemyType = 9 +SpawnRate = 0.001 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_tpxyn"] +script = ExtResource("2_s7lwc") +EnemyType = 13 +SpawnRate = 0.3 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + +[sub_resource type="Resource" id="Resource_7croy"] +script = ExtResource("2_s7lwc") +EnemyType = 14 +SpawnRate = 0.5 +metadata/_custom_type_script = "uid://bjal67ir4k11d" + [sub_resource type="Resource" id="Resource_httk4"] script = ExtResource("2_0qcd2") FloorDisplayName = "15" FloorType = 15 -EnemySpawnTable = Array[ExtResource("2_s7lwc")]([]) +EnemySpawnTable = Array[ExtResource("2_s7lwc")]([SubResource("Resource_47opl"), SubResource("Resource_tpxyn"), SubResource("Resource_7croy")]) metadata/_custom_type_script = "uid://bnxutyeas2ymm" [sub_resource type="Resource" id="Resource_ro62w"]