diff --git a/Resources/Bullets/icicle_gun_bullets.tres b/Resources/Bullets/icicle_gun_bullets.tres new file mode 100644 index 00000000..81e46f5e --- /dev/null +++ b/Resources/Bullets/icicle_gun_bullets.tres @@ -0,0 +1,23 @@ +[gd_resource type="Resource" script_class="BulletResource" load_steps=4 format=3 uid="uid://jh2wkjcvm3yc"] + +[ext_resource type="PackedScene" uid="uid://b1qnfiuokpvsr" path="res://Scenes/Weapons/bullet.tscn" id="1_no224"] +[ext_resource type="PackedScene" uid="uid://dfbmny3s4rili" path="res://Scenes/Particles/IceBulletParticle.tscn" id="2_04tom"] +[ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="3_inavv"] + +[resource] +script = ExtResource("3_inavv") +BulletScene = ExtResource("1_no224") +DestructionParticlesScene = ExtResource("2_04tom") +BulletSpeed = 300.0 +Direction = Vector2(1, 0) +BulletDamage = 0.4 +LifeTime = 10.0 +DestroyOnCollision = true +Owner = 1 +DamageType = 3 +RotateSprite = false +Controllable = false +Freezable = true +Grazeable = false +GrazeValue = 0.2 +TimeModifiers = [] diff --git a/Resources/Bullets/simple_ice_bullet.tres b/Resources/Bullets/simple_ice_bullet.tres index 05f62895..21f2fad0 100644 --- a/Resources/Bullets/simple_ice_bullet.tres +++ b/Resources/Bullets/simple_ice_bullet.tres @@ -10,7 +10,7 @@ BulletScene = ExtResource("1_qjgqc") DestructionParticlesScene = ExtResource("2_fkpjr") BulletSpeed = 300.0 Direction = Vector2(1, 0) -BulletDamage = 1.0 +BulletDamage = 0.4 LifeTime = 10.0 DestroyOnCollision = true Owner = 1 @@ -20,4 +20,4 @@ Controllable = false Freezable = true Grazeable = false GrazeValue = 0.2 -TimeModifiers = null +TimeModifiers = [] diff --git a/Resources/Weapons/IcicleGun.tres b/Resources/Weapons/IcicleGun.tres index 95aeb431..6f5766b2 100644 --- a/Resources/Weapons/IcicleGun.tres +++ b/Resources/Weapons/IcicleGun.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="WeaponResource" load_steps=5 format=3 uid="uid://b8apu0l5fm4k"] -[ext_resource type="Resource" uid="uid://eu6n6c5175y8" path="res://Resources/Bullets/simple_ice_bullet.tres" id="1_85ef1"] +[ext_resource type="Resource" uid="uid://jh2wkjcvm3yc" path="res://Resources/Bullets/icicle_gun_bullets.tres" id="1_sd6j2"] [ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="2_m8dps"] [ext_resource type="AudioStream" uid="uid://cjg8r7bthkfsy" path="res://SFX/Laser_shoot 11.wav" id="2_r2tre"] [ext_resource type="AudioStream" uid="uid://jsv3yjluv1au" path="res://SFX/Weapons/Reload_01.wav" id="2_sd6j2"] @@ -8,12 +8,12 @@ [resource] script = ExtResource("2_m8dps") Name = &"Icicle Gun" -BulletData = ExtResource("1_85ef1") +BulletData = ExtResource("1_sd6j2") Priority = 1 AmmoPerShot = 1 -RateOfFire = 0.3 -BulletCapacity = 5 -ReloadTime = 0.6 +RateOfFire = 0.1 +BulletCapacity = 100 +ReloadTime = 0.1 AutoReload = true InfiniteAmmo = true ItemKey = &"ICICLE_GUN" diff --git a/Scripts/Resources/WeaponResource.cs b/Scripts/Resources/WeaponResource.cs index 3e3f13ef..571ffdf5 100644 --- a/Scripts/Resources/WeaponResource.cs +++ b/Scripts/Resources/WeaponResource.cs @@ -32,7 +32,6 @@ public partial class WeaponResource : Resource [Export] public bool InfiniteAmmo = true; - [Export] public StringName ItemKey; [Export] public StringName AmmoKey; #region Bullet spawn data