balanced some drones, moved files around

AssPlayer.cs

@@ -4,7 +4,6 @@
 using AssortedCrazyThings.Items;
 using AssortedCrazyThings.Items.Weapons;
 using AssortedCrazyThings.Projectiles.Minions.CompanionDungeonSouls;
-using AssortedCrazyThings.Projectiles.Minions.Drones;
 using AssortedCrazyThings.UI;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -69,7 +68,8 @@ public class AssPlayer : ModPlayer
 
         public bool droneControllerMinion = false;
 
-        public const byte shieldDroneReductionMax = 50;
+        public const byte shieldDroneReductionMax = 35;
+        public const byte ShieldIncreaseAmount = 7;
         public byte shieldDroneReduction = 0; //percentage * 100
         public float shieldDroneLerpVisual = 0; //percentage
 
@@ -222,7 +222,7 @@ public void DecreaseDroneShield(ref int damage)
                 }
 
                 damage = (int)(damage * ((100 - shieldDroneReduction) / 100f));
-                if (Main.netMode != NetmodeID.Server && Main.myPlayer == player.whoAmI) shieldDroneReduction -= ShieldDrone.ShieldIncreaseAmount; //since this is only set clientside by the projectile and synced by packets
+                if (Main.netMode != NetmodeID.Server && Main.myPlayer == player.whoAmI) shieldDroneReduction -= ShieldIncreaseAmount; //since this is only set clientside by the projectile and synced by packets
             }
         }
 
@@ -859,8 +859,6 @@ public override void ModifyHitNPCWithProj(Projectile proj, NPC target, ref int d
         public override void ModifyHitPvp(Item item, Player target, ref int damage, ref bool crit)
         {
             //ApplyCandleDebuffs(target);
-            target.GetModPlayer<AssPlayer>().DecreaseDroneShield(ref damage);
-
             target.GetModPlayer<AssPlayer>().ResetEmpoweringTimer();
 
             target.GetModPlayer<AssPlayer>().SpawnSoulTemp();
@@ -869,8 +867,6 @@ public override void ModifyHitPvp(Item item, Player target, ref int damage, ref
         public override void ModifyHitPvpWithProj(Projectile proj, Player target, ref int damage, ref bool crit)
         {
             //ApplyCandleDebuffs(target);
-            target.GetModPlayer<AssPlayer>().DecreaseDroneShield(ref damage);
-
             target.GetModPlayer<AssPlayer>().ResetEmpoweringTimer();
 
             target.GetModPlayer<AssPlayer>().SpawnSoulTemp();
@@ -901,6 +897,8 @@ public override bool PreHurt(bool pvp, bool quiet, ref int damage, ref int hitDi
         {
             if (getDefenseDuration != 0) damage = 1;
 
+            DecreaseDroneShield(ref damage);
+
             if (wyvernCampfire && damageSource.SourceProjectileType == ProjectileID.HarpyFeather)
             {
                 hitDirection = 0; //this cancels knockback

Items/DroneParts.cs → Items/DroneUnlockables/DroneParts.cs

@@ -1,15 +1,14 @@
 using Terraria;
-using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace AssortedCrazyThings.Items
+namespace AssortedCrazyThings.Items.DroneUnlockables
 {
+    //TODO tooltip, sprite
     public class DroneParts : ModItem
     {
         public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Drone Parts");
-            //TODO tooltip
             Tooltip.SetDefault("'You could make use of this'");
         }
 

Items/DroneUnlockables.cs → Items/DroneUnlockables/DroneUnlockable.cs

@@ -1,14 +1,12 @@
-using AssortedCrazyThings.Base;
 using AssortedCrazyThings.Items.Weapons;
 using System.Collections.Generic;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace AssortedCrazyThings.Items
+namespace AssortedCrazyThings.Items.DroneUnlockables
 {
-    //TODO Recipes for drone unlockables
-    public abstract class DroneUnlockables : ModItem
+    public abstract class DroneUnlockable : ModItem
     {
         public override void SetDefaults()
         {
@@ -19,8 +17,8 @@ public override void SetDefaults()
             item.consumable = true;
             item.maxStack = 1;
             item.UseSound = SoundID.Item4;
-            item.useTime = 40;
-            item.useAnimation = 40;
+            item.useTime = 30;
+            item.useAnimation = 30;
             item.useStyle = ItemUseStyleID.HoldingUp;
             item.value = Item.sellPrice(silver: 50);
         }
@@ -60,13 +58,36 @@ public override bool UseItem(Player player)
             if (Main.netMode != NetmodeID.Server && Main.myPlayer == player.whoAmI)
             {
                 player.GetModPlayer<AssPlayer>().droneControllerUnlocked |= UnlockedType;
-                AssUtils.UIText("Unlocked: " + DroneController.GetDroneData(UnlockedType).Name, CombatText.HealLife);
+                Main.NewText("Unlocked: " + DroneController.GetDroneData(UnlockedType).Name, CombatText.HealLife);
             }
             return true;
         }
+
+        public override void AddRecipes()
+        {
+            DroneRecipe recipe = new DroneRecipe(mod, UnlockedType);
+            recipe.AddIngredient(ModContent.ItemType<DroneParts>());
+            recipe.SetResult(this);
+            recipe.AddRecipe();
+        }
+    }
+
+    public class DroneRecipe : ModRecipe
+    {
+        public DroneType UnlockedType;
+
+        public DroneRecipe(Mod mod, DroneType unlockedType): base(mod)
+        {
+            UnlockedType = unlockedType;
+        }
+
+        public override bool RecipeAvailable()
+        {
+            return !Main.LocalPlayer.GetModPlayer<AssPlayer>().droneControllerUnlocked.HasFlag(UnlockedType);
+        }
     }
 
-    public class DroneUnlockableBasic : DroneUnlockables
+    public class DroneUnlockableBasicLaserDrone : DroneUnlockable
     {
         public override void SetStaticDefaults()
         {
@@ -82,7 +103,7 @@ public override DroneType UnlockedType
         }
     }
 
-    public class DroneUnlockableHeavy : DroneUnlockables
+    public class DroneUnlockableHeavyLaserDrone : DroneUnlockable
     {
         public override void SetStaticDefaults()
         {
@@ -98,7 +119,7 @@ public override DroneType UnlockedType
         }
     }
 
-    public class DroneUnlockableMissile : DroneUnlockables
+    public class DroneUnlockableMissileDrone : DroneUnlockable
     {
         public override void SetStaticDefaults()
         {
@@ -114,7 +135,7 @@ public override DroneType UnlockedType
         }
     }
 
-    public class DroneUnlockableHealing : DroneUnlockables
+    public class DroneUnlockableHealingDrone : DroneUnlockable
     {
         public override void SetStaticDefaults()
         {
@@ -130,7 +151,7 @@ public override DroneType UnlockedType
         }
     }
 
-    public class DroneUnlockableShield : DroneUnlockables
+    public class DroneUnlockableShieldDrone : DroneUnlockable
     {
         public override void SetStaticDefaults()
         {

Items/Pets/HealingDroneItem.cs

@@ -1,3 +1,4 @@
+using AssortedCrazyThings.Items.DroneUnlockables;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
@@ -38,7 +39,7 @@ public override void AddRecipes()
             //transformation recipe
             ModRecipe recipe = new ModRecipe(mod);
             recipe.AddIngredient(item.type, 1);
-            recipe.SetResult(ModContent.ItemType<DroneUnlockableHealing>());
+            recipe.SetResult(ModContent.ItemType<DroneUnlockableHealingDrone>());
             recipe.AddRecipe();
         }
     }

Items/Weapons/DroneController.cs

@@ -165,8 +165,8 @@ public static DroneData SetDroneData(DroneType selected)
                         desc: "Fires a salvo of missiles after a long delay",
                         misc: "Occupies two minion slots",
                         firerate: "Very slow",
-                        dmgModifier: 0.2f,
-                        kBModifier: 1.333334f
+                        dmgModifier: 2.19f,
+                        kBModifier: 1.2f
                         );
                 case DroneType.Healing:
                     return new DroneData
@@ -182,7 +182,7 @@ public static DroneData SetDroneData(DroneType selected)
                         (
                         projType: ModContent.ProjectileType<ShieldDrone>(),
                         name: "Shield Drone",
-                        desc: "Creates a damage reducing shield",
+                        desc: "Creates a damage reducing shield over time",
                         misc: "Only one can be summoned\nShield resets if drone despawns",
                         combat: false
                         );
@@ -274,8 +274,8 @@ public override void SetDefaults()
             item.mana = 10;
             item.width = 28;
             item.height = 30;
-            item.useTime = 36;
-            item.useAnimation = 36;
+            item.useTime = 30;
+            item.useAnimation = 30;
             item.useStyle = ItemUseStyleID.HoldingUp;
             item.noMelee = true;
             item.noUseGraphic = true;
@@ -399,7 +399,7 @@ public override void ModifyTooltips(List<TooltipLine> tooltips)
 
             if (!(allUnlocked && hasController))
             {
-                tooltips.Add(new TooltipLine(mod, "Destroyer", "Defeat the destroyer to unlock more drones"));
+                tooltips.Add(new TooltipLine(mod, "Destroyer", "Defeat The Destroyer to unlock more drones"));
             }
 
             CanSpawn(Main.LocalPlayer, selected, out bool blocked);
@@ -427,7 +427,7 @@ public string PreviewTextureName
         {
             get
             {
-                return "Projectiles/Minions/Drones/" + Name.Replace(" ", "") + "Preview";
+                return "Items/DroneUnlockables/DroneUnlockable" + Name.Replace(" ", "");
             }
         }
 
@@ -439,7 +439,7 @@ public DroneData(int projType, string name, string desc, string misc = "", strin
             KBModifier = kBModifier;
             Firerate = firerate;
             string stats = combat ? ("\nBase Damage: " + (int)(DroneController.BaseDmg * (DmgModifier + 1f))
-             + "\nBase Knockback: " + Math.Round(DroneController.BaseKB * (KBModifier + 1f), 1)) : "";
+             + "\nBase Knockback: " + Math.Round(DroneController.BaseKB * KBModifier, 1)) : "";
             UITooltip = Name + stats + "\n" + desc + "\n" + misc;
             Combat = combat;
         }

NPCs/AssGlobalNPC.cs

@@ -1,5 +1,6 @@
 using AssortedCrazyThings.Base;
 using AssortedCrazyThings.Items;
+using AssortedCrazyThings.Items.DroneUnlockables;
 using AssortedCrazyThings.Items.Pets;
 using AssortedCrazyThings.Items.Placeable;
 using AssortedCrazyThings.Items.Weapons;

Projectiles/Minions/Drones/MissileDrone.cs

@@ -15,7 +15,7 @@ public class MissileDrone : DroneBase
     {
         private static readonly string nameGlow = "Projectiles/Minions/Drones/" + "MissileDrone_Glowmask";
 
-        public const int AttackCooldown = 180; //120 but incremented by 1.5f
+        public const int AttackCooldown = 360; //120 but incremented by 1.5f
         public const int AttackDelay = 60;
         public const int AttackDuration = 60;
 

Projectiles/Minions/Drones/ShieldDrone.cs

@@ -16,8 +16,7 @@ public class ShieldDrone : DroneBase
         private static readonly string nameLamps = "Projectiles/Minions/Drones/" + "ShieldDrone_Lamps";
         private static readonly string nameLower = "Projectiles/Minions/Drones/" + "ShieldDrone_Lower";
         private float addRotation; //same
-        private const int ShieldDelay = 180;
-        public const byte ShieldIncreaseAmount = 10;
+        private const int ShieldDelay = 360;
         private float LowerOutPercent = 0f;
 
         private float ShieldCounter
@@ -46,7 +45,7 @@ private int Stage
             get
             {
                 AssPlayer mPlayer = projectile.GetOwner().GetModPlayer<AssPlayer>();
-                return mPlayer.shieldDroneReduction / 10;
+                return mPlayer.shieldDroneReduction / AssPlayer.ShieldIncreaseAmount;
             }
         }
 
@@ -197,13 +196,13 @@ protected override void CustomAI()
                     if (ShieldCounter > ShieldDelay)
                     {
                         ShieldCounter = 0;
-                        if (RealOwner) mPlayer.shieldDroneReduction += ShieldIncreaseAmount;
-                        CombatText.NewText(player.getRect(), Color.LightBlue, ShieldIncreaseAmount);
+                        if (RealOwner) mPlayer.shieldDroneReduction += AssPlayer.ShieldIncreaseAmount;
+                        CombatText.NewText(player.getRect(), Color.LightBlue, AssPlayer.ShieldIncreaseAmount);
                         AssUtils.QuickDustLine(16, shootOrigin, target, between.Length() / 3, Color.White, alpha: 120, scale: 1.5f);
                     }
                 }
             }
-            else //if above 50%, addRotation should go down to projectile.rotation
+            else //if fully shielded, addRotation should go down to projectile.rotation
             {
                 addRotation = addRotation.AngleLerp(projectile.rotation, 0.1f);
             }