Skip to content

Commit

Permalink
remove 2 slot requirement on heavy and missile drone
Browse files Browse the repository at this point in the history
  • Loading branch information
direwolf420 committed May 28, 2020
1 parent 51e3bd4 commit d211afb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
5 changes: 1 addition & 4 deletions Items/Weapons/DroneController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -152,7 +152,6 @@ public static DroneData SetDroneData(DroneType selected)
projType: ModContent.ProjectileType<HeavyLaserDrone>(),
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
Expand All @@ -163,7 +162,6 @@ public static DroneData SetDroneData(DroneType selected)
projType: ModContent.ProjectileType<MissileDrone>(),
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
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion Projectiles/Minions/Drones/HeavyLaserDrone.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Projectiles/Minions/Drones/MissileDrone.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d211afb

Please sign in to comment.