diff --git a/Assets/Prefabs/MagicMissile.prefab b/Assets/Prefabs/MagicMissile.prefab index 2c51d10..d71d0b6 100644 --- a/Assets/Prefabs/MagicMissile.prefab +++ b/Assets/Prefabs/MagicMissile.prefab @@ -45,15 +45,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: abilityName: Magic Missile + abilityIcon: {fileID: 0} thisPlayer: {fileID: 0} canCooldown: 1 cooldown: 0.2 + power: 0 + projectileCount: 12 + pierceAmount: 0 accuracy: 1 bulletLifetime: 3 - damage: 5 projectileSpeed: 16 fireMode: 1 - projectileCount: 1 offset: {x: 1, y: 1} angle: 0 projectile: {fileID: 41144518337917555, guid: c8c4bd2326cbed637aa720d1a4d73968, type: 3} diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Enemy.cs index 05eeace..0e76c05 100644 --- a/Assets/Scripts/Enemy.cs +++ b/Assets/Scripts/Enemy.cs @@ -70,10 +70,20 @@ public class Enemy : Entity protected override void OnKillEffects() { Destroy(gameObject); + foreach (UpgradeDrop drop in possibleDrops) + { + DropUpgrade(drop); + } } - protected virtual void DropUpgrade() + protected virtual void DropUpgrade(UpgradeDrop drop) { - float random; + float random = Random.Range(0, 100); + { + if (random < drop.chance) //just so it matches up with the number. 80 chance means 80 percent? idk but less than 80 lol + { + // drop the item + } + } } } diff --git a/Assets/Scripts/ItemPickup.cs b/Assets/Scripts/ItemPickup.cs new file mode 100644 index 0000000..e084218 --- /dev/null +++ b/Assets/Scripts/ItemPickup.cs @@ -0,0 +1,24 @@ +using System; +using UnityEngine; + +public class ItemPickup : MonoBehaviour +{ + public bool inRange; + [Header("Movement")] + [SerializeField] private Rigidbody2D rb; + [SerializeField] private float speed; + + private void FixedUpdate() + { + if (inRange) + { + rb.linearVelocity = (transform.position - AbilityManager.instance.player.transform.position).normalized * speed; + } + } + + private void OnTriggerEnter2D(Collider2D other) + { + //pick up + Destroy(gameObject); + } +} diff --git a/Assets/Scripts/ItemPickup.cs.meta b/Assets/Scripts/ItemPickup.cs.meta new file mode 100644 index 0000000..fb266fb --- /dev/null +++ b/Assets/Scripts/ItemPickup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 271a03dda998936fa99eb33e6272307b \ No newline at end of file diff --git a/Assets/Scripts/ItemPickupRange.cs b/Assets/Scripts/ItemPickupRange.cs new file mode 100644 index 0000000..5b0225c --- /dev/null +++ b/Assets/Scripts/ItemPickupRange.cs @@ -0,0 +1,12 @@ +using System; +using UnityEngine; + +public class ItemPickupRange : MonoBehaviour +{ + [SerializeField] private ItemPickup thisItem; + + private void OnTriggerEnter2D(Collider2D other) + { + thisItem.inRange = true; + } +} diff --git a/Assets/Scripts/ItemPickupRange.cs.meta b/Assets/Scripts/ItemPickupRange.cs.meta new file mode 100644 index 0000000..f61c26d --- /dev/null +++ b/Assets/Scripts/ItemPickupRange.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8ed6160da3b86db81b18fdaf0abf65da \ No newline at end of file