From d211afb7da5b2db1359fbf10ca0b0f18cf90d062 Mon Sep 17 00:00:00 2001 From: direwolf420 Date: Thu, 28 May 2020 21:53:19 +0200 Subject: [PATCH] remove 2 slot requirement on heavy and missile drone --- Items/Weapons/DroneController.cs | 5 +---- Projectiles/Minions/Drones/HeavyLaserDrone.cs | 2 +- Projectiles/Minions/Drones/MissileDrone.cs | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Items/Weapons/DroneController.cs b/Items/Weapons/DroneController.cs index 9bf55eda..d2ef354a 100644 --- a/Items/Weapons/DroneController.cs +++ b/Items/Weapons/DroneController.cs @@ -46,7 +46,7 @@ public static bool AllUnlocked(Player player) public static int GetSlotOfNextDrone(Projectile self) { int slot = 0; - int min = 1000; + int min = Main.maxProjectiles; for (int i = 0; i < Main.maxProjectiles; i++) { Projectile proj = Main.projectile[i]; @@ -152,7 +152,6 @@ public static DroneData SetDroneData(DroneType selected) projType: ModContent.ProjectileType(), name: "Heavy Laser Drone", desc: "Fires a penetrating laser after a long delay", - misc: "Occupies two minion slots", firerate: "Extremely slow", dmgModifier: 8.091f, kBModifier: 4f @@ -163,7 +162,6 @@ public static DroneData SetDroneData(DroneType selected) projType: ModContent.ProjectileType(), name: "Missile Drone", desc: "Fires a salvo of missiles after a long delay", - misc: "Occupies two minion slots", firerate: "Very slow", dmgModifier: 2.19f, kBModifier: 1.2f @@ -259,7 +257,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a friendly Drone to support or fight for you" + "\nRight click to pick from available drones" + "\nHolding the item improves the Drones supportive and offensive abilities"); - //TODO remove this later or adjust it dynamically? ItemID.Sets.StaffMinionSlotsRequired[item.type] = 1; } diff --git a/Projectiles/Minions/Drones/HeavyLaserDrone.cs b/Projectiles/Minions/Drones/HeavyLaserDrone.cs index ac15bae6..271d5953 100644 --- a/Projectiles/Minions/Drones/HeavyLaserDrone.cs +++ b/Projectiles/Minions/Drones/HeavyLaserDrone.cs @@ -84,7 +84,7 @@ public override void SetDefaults() projectile.height = 30; projectile.alpha = 0; projectile.minion = true; - projectile.minionSlots = 2f; + projectile.minionSlots = 1f; } public override void SendExtraAI(BinaryWriter writer) diff --git a/Projectiles/Minions/Drones/MissileDrone.cs b/Projectiles/Minions/Drones/MissileDrone.cs index a34e83c6..9873ed56 100644 --- a/Projectiles/Minions/Drones/MissileDrone.cs +++ b/Projectiles/Minions/Drones/MissileDrone.cs @@ -55,7 +55,7 @@ public override void SetDefaults() projectile.height = 30; projectile.alpha = 0; projectile.minion = true; - projectile.minionSlots = 2f; + projectile.minionSlots = 1f; } public override void SendExtraAI(BinaryWriter writer)