diff --git a/Resources/BossPhases/Rumia/Rumia_NS_1_Chase.tres b/Resources/BossPhases/Rumia/Rumia_NS_1_Chase.tres index cddbe1e6..0deaaa24 100644 --- a/Resources/BossPhases/Rumia/Rumia_NS_1_Chase.tres +++ b/Resources/BossPhases/Rumia/Rumia_NS_1_Chase.tres @@ -7,24 +7,9 @@ [resource] script = ExtResource("3_3bs8m") BulletResource = ExtResource("1_5q7h7") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 10 -rotationSpeed = 0.0 -_rotationOffset = 0.0 duration = 2.0 spread = 0.0 burstInterval = 0.2 -ShotsPerBurst = 100 -BurstRate = 0.0 _targetPlayer = true -_predictPlayer = false -OverrideOwner = false -Owner = 0 -OverrideDamageType = false -DamageType = 0 -OverrideControllable = false -Controllable = false -OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("2_x15n1")]([]) -WaitForCompletion = true metadata/_custom_type_script = "uid://bxiprx5nwmpnu" diff --git a/Scripts/AttackPatterns/ShootingPattern3D.cs b/Scripts/AttackPatterns/ShootingPattern3D.cs index f1e6ba45..1b870967 100644 --- a/Scripts/AttackPatterns/ShootingPattern3D.cs +++ b/Scripts/AttackPatterns/ShootingPattern3D.cs @@ -30,18 +30,23 @@ public partial class ShootingPattern3D : AttackPattern [ExportCategory("Other")] [Export] public bool _predictPlayer = false; [ExportCategory("Overrides")] - [Export] public bool OverrideOwner { get; private set; } = false; + [ExportGroup("Override Owner")] + [Export(PropertyHint.GroupEnable)] public bool OverrideOwner { get; private set; } = false; [Export] public BulletOwner Owner { get; private set; } = BulletOwner.None; - [Export] public bool OverrideDamageType { get; private set; } = false; + [ExportGroup("Override Damage Type")] + [Export(PropertyHint.GroupEnable)] public bool OverrideDamageType { get; private set; } = false; [Export] public DamageType DamageType { get; private set; } = DamageType.Neutral; - [Export] public bool OverrideControllable { get; private set; } = false; + [ExportGroup("Override Controllable")] + [Export(PropertyHint.GroupEnable)] public bool OverrideControllable { get; private set; } = false; [Export] public bool Controllable { get; private set; } = false; [ExportCategory("Extra Modifiers")] - [Export] + [ExportGroup("Override Creation Modifier")] + [Export(PropertyHint.GroupEnable)] public bool OverrideCreationModifier { get; private set; } = false; [Export] public BulletCreationModifier Modifier; + [ExportGroup("Time Modifiers")] [Export] public Array TimeModifiers = []; protected virtual BulletInfo MakeBullet(Vector2 position, int count = 1, float spread = 0f, float rotationOffset = 0f)