Tweaked enemies

3D/MapScenes/TestLevel.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=403 format=4 uid="uid://c8gtrjf2xeue7"]
+[gd_scene load_steps=405 format=4 uid="uid://c8gtrjf2xeue7"]
 
 [ext_resource type="Script" uid="uid://kno58homctew" path="res://addons/func_godot/src/map/func_godot_map.gd" id="1_n6h0p"]
 [ext_resource type="Script" uid="uid://crpgy1o73rtlx" path="res://Scripts/Utils/MapProxy3D.cs" id="1_pvlbf"]
@@ -37,7 +37,7 @@
 [ext_resource type="Material" uid="uid://br4foqdn2f8ge" path="res://textures/Manual/Wall_Corner.tres" id="27_c4mw0"]
 [ext_resource type="Material" uid="uid://bijkqqi8bqi3c" path="res://textures/Floors/Floor26.tres" id="28_btjo4"]
 [ext_resource type="Material" uid="uid://fc0n5jo05seu" path="res://textures/Manual/Wall_Light_Test.tres" id="30_pvlbf"]
-[ext_resource type="Material" path="res://textures/Manual/Chevron.tres" id="30_um16p"]
+[ext_resource type="Material" uid="uid://dfs1tc2ry78pb" path="res://textures/Manual/Chevron.tres" id="30_um16p"]
 [ext_resource type="Material" uid="uid://0x6sr7ehv4t1" path="res://textures/Floors/Floor167.tres" id="31_bbydx"]
 [ext_resource type="Script" uid="uid://crjplbs250g75" path="res://3D/TrenchBroom/EntityScripts/Lights/light_spot.gd" id="31_c2mph"]
 [ext_resource type="Material" uid="uid://l3g1l0y47c7r" path="res://textures/Manual/Electric_Panel_Wall.tres" id="32_k4tgc"]
@@ -90,7 +90,9 @@
 [ext_resource type="PackedScene" uid="uid://5oos364p3wex" path="res://3D/Scenes/Props/Furniture/Computer_Tower_3D.tscn" id="75_k08ee"]
 [ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="76_dt4t5"]
 [ext_resource type="Resource" uid="uid://bdpbekqhuuq4l" path="res://Resources/Items/Shield_Extend_Pickup.tres" id="77_mf5at"]
+[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="82_rri8m"]
 [ext_resource type="PackedScene" uid="uid://dioiq4nb7kiet" path="res://3D/Scenes/Props/ForceField_3D.tscn" id="83_51d8c"]
+[ext_resource type="Resource" uid="uid://c48vva6qw2h12" path="res://Resources/Enemies/Base_Fairy_Special_3D.tres" id="88_6uhge"]
 [ext_resource type="Resource" uid="uid://dau0s8ob7qnpc" path="res://Resources/Items/IceShotgun.tres" id="88_kob5s"]
 [ext_resource type="Resource" uid="uid://bgcgeg187vg1h" path="res://Resources/Items/IcicleRepeater.tres" id="89_awrmj"]
 [ext_resource type="Resource" uid="uid://cj5aa7btaw6q0" path="res://Resources/Items/Blue_Keycard.tres" id="89_dt4t5"]
@@ -3251,7 +3253,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.0085, 1.70611, -2.51795)
 collision_layer = 32
 collision_mask = 0
 script = ExtResource("73_51d8c")
-Events = [SubResource("Resource_umvl4")]
+Events = Array[ExtResource("82_rri8m")]([SubResource("Resource_umvl4")])
 metadata/_edit_group_ = true
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Props/Node3D"]
@@ -3269,13 +3271,21 @@ Script = ExtResource("64_fi82p")
 EmitOnStart = false
 
 [node name="Enemy_Fairy_Test_1" type="Marker3D" parent="Enemies"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.8201, 1.3846, 25.0522)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.8551, 1.3846, 22.7775)
 script = ExtResource("65_65jyg")
 Enemy = ExtResource("66_despu")
 AutoSpawn = true
 Billboard = true
 PixelSize = 0.05
 
+[node name="Enemy_Fairy_Test_10" type="Marker3D" parent="Enemies"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 31.8886, 1.3846, 17.05)
+script = ExtResource("65_65jyg")
+Enemy = ExtResource("88_6uhge")
+AutoSpawn = true
+Billboard = true
+PixelSize = 0.05
+
 [node name="Enemy_Fairy_Test_4" type="Marker3D" parent="Enemies"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.1095, 1.7252, 18.6435)
 script = ExtResource("65_65jyg")
@@ -3301,7 +3311,7 @@ Billboard = true
 PixelSize = 0.05
 
 [node name="Enemy_Fairy_Test_2" type="Marker3D" parent="Enemies"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.4579, 1.42644, 23.1035)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.0126, 1.42644, 18.9018)
 script = ExtResource("65_65jyg")
 Enemy = ExtResource("67_despu")
 AutoSpawn = true

Resources/Bullets/icicle_gun_bullets_3D.tres

@@ -8,7 +8,7 @@ script = ExtResource("3_xep6w")
 BulletScene = ExtResource("1_qojek")
 BulletSpeed = 10.0
 Direction = Vector2(1, 0)
-BulletDamage = 0.8
+BulletDamage = 0.5
 MaxDamage = 1.2
 Knockback = 100.0
 LifeTime = 10.0

Resources/Bullets/simple_enemy_bullet_3D.tres

@@ -6,9 +6,9 @@
 [resource]
 script = ExtResource("2_5nrie")
 BulletScene = ExtResource("1_l7ter")
-BulletSpeed = 1.8
+BulletSpeed = 3.0
 Direction = Vector2(1, 0)
-BulletDamage = 8.0
+BulletDamage = 12.0
 MaxDamage = 1.0
 Knockback = 1.0
 LifeTime = 10.0

Resources/Bullets/simple_enemy_bullet_small_3D.tres

@@ -6,9 +6,9 @@
 [resource]
 script = ExtResource("2_4bl80")
 BulletScene = ExtResource("1_pm333")
-BulletSpeed = 2.0
+BulletSpeed = 2.5
 Direction = Vector2(1, 0)
-BulletDamage = 12.0
+BulletDamage = 8.0
 MaxDamage = 1.0
 Knockback = 1.0
 LifeTime = 10.0

Resources/Enemies/Base_Fairy_3D.tres

@@ -50,7 +50,7 @@ script = ExtResource("9_fmns5")
 EnemyName = &"Fairy"
 EnemyKey = &"FAIRY_BASE"
 PrefabPath = &"uid://bh3vxmqflijgj"
-MaxHealth = 4.0
+MaxHealth = 6.0
 MovementSpeed = 1.5
 Weapon = ExtResource("8_ihub2")
 LootDrops = Array[ExtResource("2_gbbb4")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")])

Resources/Enemies/Base_Fairy_Special_3D.tres

@@ -0,0 +1,69 @@
+[gd_resource type="Resource" script_class="EnemyResource" load_steps=17 format=3 uid="uid://c48vva6qw2h12"]
+
+[ext_resource type="Texture2D" uid="uid://callpd48wwnlw" path="res://Sprites/Actors/Fairy_Special.png" id="1_0afqr"]
+[ext_resource type="SpriteFrames" uid="uid://cnl6ju3qlr2bj" path="res://Resources/Sprites/base_fairy_special.tres" id="1_6r34r"]
+[ext_resource type="Script" uid="uid://cq65aed620ijo" path="res://Scripts/Resources/Loot/LootDrop.cs" id="2_6r34r"]
+[ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="3_dkgyx"]
+[ext_resource type="Resource" uid="uid://dy53gia1tmkah" path="res://Resources/Items/Points_Pickup.tres" id="4_1l422"]
+[ext_resource type="Resource" uid="uid://bhbufxodybsw4" path="res://Resources/Items/Shield_Pickup.tres" id="5_fanfp"]
+[ext_resource type="Resource" uid="uid://dodwpect0ldjf" path="res://Resources/Items/Heart_Pickup.tres" id="6_y2gca"]
+[ext_resource type="Resource" uid="uid://clr1gln7nxa1o" path="res://Resources/Items/Power_Pickup.tres" id="7_6ilmv"]
+[ext_resource type="Resource" uid="uid://dtrmtjd7j03k8" path="res://Resources/Weapons/EnemyShotgun_3D.tres" id="9_dkgyx"]
+[ext_resource type="Script" uid="uid://cd5o0ceb50jki" path="res://Scripts/Resources/EnemyResource.cs" id="9_gohsi"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_c0hok"]
+atlas = ExtResource("1_0afqr")
+region = Rect2(0, 0, 16, 16)
+
+[sub_resource type="Resource" id="Resource_c8nix"]
+script = ExtResource("2_6r34r")
+Item = ExtResource("3_dkgyx")
+Chance = 40.0
+metadata/_custom_type_script = "uid://cq65aed620ijo"
+
+[sub_resource type="Resource" id="Resource_gs2l3"]
+script = ExtResource("2_6r34r")
+Item = ExtResource("4_1l422")
+Chance = 10.0
+metadata/_custom_type_script = "uid://cq65aed620ijo"
+
+[sub_resource type="Resource" id="Resource_sqnvg"]
+script = ExtResource("2_6r34r")
+Item = ExtResource("5_fanfp")
+Chance = 5.0
+metadata/_custom_type_script = "uid://cq65aed620ijo"
+
+[sub_resource type="Resource" id="Resource_5tyar"]
+script = ExtResource("2_6r34r")
+Item = ExtResource("6_y2gca")
+Chance = 5.0
+metadata/_custom_type_script = "uid://cq65aed620ijo"
+
+[sub_resource type="Resource" id="Resource_48xq6"]
+script = ExtResource("2_6r34r")
+Item = ExtResource("7_6ilmv")
+Chance = 6.0
+metadata/_custom_type_script = "uid://cq65aed620ijo"
+
+[resource]
+script = ExtResource("9_gohsi")
+EnemyName = &"Special Fairy"
+EnemyKey = &"FAIRY_BASE_SPECIAL"
+PrefabPath = &"uid://bh3vxmqflijgj"
+MaxHealth = 12.0
+MovementSpeed = 1.6
+Weapon = ExtResource("9_dkgyx")
+LootDrops = Array[ExtResource("2_6r34r")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")])
+MotivationReward = 4.0
+PredictPlayer = false
+PlayerDetectionRange = 4.0
+ViewRange = 5.0
+AlarmReactRange = 8.0
+PlayerDisengageRange = 10.0
+StrafeSpeed = 1.5
+MaxStrafeDistance = 1.0
+MinStrafeDistance = 0.2
+ResponseTime = 0.5
+IconSprite = SubResource("AtlasTexture_c0hok")
+AnimationFrames = ExtResource("1_6r34r")
+metadata/_custom_type_script = "uid://cd5o0ceb50jki"

Resources/Weapons/EnemyShotgun_3D.tres

@@ -0,0 +1,22 @@
+[gd_resource type="Resource" script_class="WeaponResource" load_steps=3 format=3 uid="uid://dtrmtjd7j03k8"]
+
+[ext_resource type="Resource" uid="uid://qrqsywgiij7i" path="res://Resources/Bullets/simple_enemy_bullet_small_3D.tres" id="1_l2h7p"]
+[ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="2_0kc7l"]
+
+[resource]
+script = ExtResource("2_0kc7l")
+Name = &"Enemy Shotgun"
+BulletData = ExtResource("1_l2h7p")
+Priority = 0
+AmmoPerShot = 1
+RateOfFire = 1.2
+BulletCapacity = 4
+ReloadTime = 2.0
+AutoReload = true
+InfiniteAmmo = true
+ItemKey = &""
+AmmoKey = &""
+BulletsPerShot = 5
+SpreadAngle = 30.0
+RandomSpread = 0.0
+_rotationOffset = 0.0

Sprites/Actors/Fairy_Special.png.import

@@ -3,25 +3,26 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://callpd48wwnlw"
-path="res://.godot/imported/Fairy_Special.png-ca9d9981d9f4a3f7175ca0e78f8bafb4.ctex"
+path.s3tc="res://.godot/imported/Fairy_Special.png-ca9d9981d9f4a3f7175ca0e78f8bafb4.s3tc.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://Sprites/Actors/Fairy_Special.png"
-dest_files=["res://.godot/imported/Fairy_Special.png-ca9d9981d9f4a3f7175ca0e78f8bafb4.ctex"]
+dest_files=["res://.godot/imported/Fairy_Special.png-ca9d9981d9f4a3f7175ca0e78f8bafb4.s3tc.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,4 +32,4 @@ process/normal_map_invert_y=false
 process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=0