diff --git a/Resources/Enemies/Base_Fairy_3D.tres b/Resources/Enemies/Base_Fairy_3D.tres index 2c9180c9..2f40d33d 100644 --- a/Resources/Enemies/Base_Fairy_3D.tres +++ b/Resources/Enemies/Base_Fairy_3D.tres @@ -13,8 +13,8 @@ [ext_resource type="Resource" uid="uid://bhbufxodybsw4" path="res://Resources/Items/Shield_Pickup.tres" id="5_kno8n"] [ext_resource type="Resource" uid="uid://dodwpect0ldjf" path="res://Resources/Items/Heart_Pickup.tres" id="6_jnpnu"] [ext_resource type="Resource" uid="uid://clr1gln7nxa1o" path="res://Resources/Items/Power_Pickup.tres" id="7_rx5mb"] -[ext_resource type="Resource" uid="uid://co6x2jq0fslql" path="res://Resources/Weapons/EnemyWeapon_Small_3D.tres" id="8_ihub2"] [ext_resource type="Script" uid="uid://cd5o0ceb50jki" path="res://Scripts/Resources/EnemyResource.cs" id="9_fmns5"] +[ext_resource type="Resource" uid="uid://chwguoy5op5y3" path="res://Resources/Weapons/EnemyWeapon_Laser_Dual_3D.tres" id="14_rx5mb"] [sub_resource type="AtlasTexture" id="AtlasTexture_ppsgt"] atlas = ExtResource("1_ihub2") @@ -57,15 +57,15 @@ EnemyKey = &"FAIRY_BASE" PrefabPath = &"uid://bh3vxmqflijgj" MaxHealth = 6.0 MovementSpeed = 1.5 -Weapon = ExtResource("8_ihub2") +Weapon = ExtResource("14_rx5mb") LootDrops = Array[ExtResource("2_gbbb4")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")]) PlayerDetectionRange = 12.0 ViewRange = 8.0 AlarmReactRange = 20.0 PlayerDisengageRange = 15.0 -StrafeSpeed = 1.5 -MaxStrafeDistance = 1.0 -MinStrafeDistance = 0.2 +StrafeSpeed = 0.0 +MaxStrafeDistance = 0.0 +MinStrafeDistance = 0.0 IconSprite = SubResource("AtlasTexture_ppsgt") AnimationFrames = ExtResource("1_gbbb4") DebrisScene = ExtResource("3_kno8n") diff --git a/Resources/Weapons/EnemyWeapon_Laser_Dual_3D.tres b/Resources/Weapons/EnemyWeapon_Laser_Dual_3D.tres new file mode 100644 index 00000000..877c11ae --- /dev/null +++ b/Resources/Weapons/EnemyWeapon_Laser_Dual_3D.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="WeaponResource" load_steps=4 format=3 uid="uid://chwguoy5op5y3"] + +[ext_resource type="Resource" uid="uid://qrqsywgiij7i" path="res://Resources/Bullets/3D/simple_enemy_bullet_small_3D.tres" id="1_sn07r"] +[ext_resource type="AudioStream" uid="uid://bosubfbro8gyk" path="res://SFX/enemy_shoot.wav" id="2_upgf6"] +[ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="3_ojs34"] + +[resource] +script = ExtResource("3_ojs34") +Name = &"Enemy Laser Weapon" +BulletData = ExtResource("1_sn07r") +RateOfFire = 0.01 +BulletCapacity = 500 +ReloadTime = 10.0 +ItemKey = &"" +AmmoKey = &"" +StopToShoot = true +BulletsPerShot = 2 +SpreadAngle = 70.0 +ShootSound = ExtResource("2_upgf6") diff --git a/Scripts/Resources/WeaponResource.cs b/Scripts/Resources/WeaponResource.cs index 43a34ed0..be40e15c 100644 --- a/Scripts/Resources/WeaponResource.cs +++ b/Scripts/Resources/WeaponResource.cs @@ -38,6 +38,7 @@ public partial class WeaponResource : Resource [ExportCategory("Battery Recharge")] [Export] public double RechargeTime = 0.5d; [Export]public int RechargeAmount = 1; + [Export] public bool StopToShoot = false; #region Bullet spawn data [ExportCategory("Bullet Spawn Data")] diff --git a/Scripts/Weapons/LaserBullet3D.cs b/Scripts/Weapons/LaserBullet3D.cs new file mode 100644 index 00000000..6aee5d2e --- /dev/null +++ b/Scripts/Weapons/LaserBullet3D.cs @@ -0,0 +1,6 @@ +namespace Cirno.Scripts.Weapons; + +public partial class LaserBullet3D : Bullet3D +{ + //private line3d +} \ No newline at end of file diff --git a/Scripts/Weapons/LaserBullet3D.cs.uid b/Scripts/Weapons/LaserBullet3D.cs.uid new file mode 100644 index 00000000..f6fdb151 --- /dev/null +++ b/Scripts/Weapons/LaserBullet3D.cs.uid @@ -0,0 +1 @@ +uid://cy5fao65s8d57