Fixed a few PlacementAnywhere bugs and edge cases

Only doesn't work well with multi tiles tried to place mid air.
xKirtle · Jun 28, 2020 · 65b4e31 · 65b4e31
1 parent d1a4341
commit 65b4e31
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 27 deletions.
diff --git a/Items/Accessories/CreativeWrench.cs b/Items/Accessories/CreativeWrench.cs
@@ -46,7 +46,6 @@ public override void UpdateAccessory(Player player, bool hideVisual)
                 Player.tileRangeX = 65;
                 Player.tileRangeY = 55;
 
-                //Thanks direwolf420 for the monstrosity checks
                 //Right click timer
                 if (Main.mouseRight && UIUtilities.IsUIAvailable()
                     && (!player.mouseInterface || CreativeWheelRework.CreativeWheelReworkPanel.IsMouseHovering)
@@ -81,12 +80,6 @@ public override void UpdateAccessory(Player player, bool hideVisual)
                         autoHammerAlert = true;
                     }
                 }
-
-                //PlacementAnywhere
-                if (modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.PlacementAnywhere))
-                {
-
-                }
             }
         }
 
@@ -121,14 +114,15 @@ public override bool CanPlace(int i, int j, int type)
                 if (!modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinitePlacement)
                 && !modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinityUpgrade))
                 {
-                    if (selectedItem.type == ItemID.BoneWand || selectedItem.type == ItemID.HiveWand ||
-                        selectedItem.type == ItemID.LeafWand || selectedItem.type == ItemID.LivingMahoganyWand ||
-                        selectedItem.type == ItemID.LivingMahoganyLeafWand || selectedItem.type == ItemID.LivingWoodWand ||
-                        selectedItem.type == ItemID.StaffofRegrowth)
-                    {
-                        //I'm sorry but it's just easier this way
-                        //Wands are infinite, might need to loop through the inventory and check if they have ammo to decrease their stack?
-                    }
+                    if (selectedItem.type == ItemID.LivingMahoganyWand || selectedItem.type == ItemID.LivingMahoganyLeafWand)
+                        ReduceItemStack(ItemID.RichMahogany);
+                    else if (selectedItem.type == ItemID.LivingWoodWand || selectedItem.type == ItemID.LeafWand)
+                        ReduceItemStack(ItemID.Wood);
+                    else if (selectedItem.type == ItemID.BoneWand)
+                        ReduceItemStack(ItemID.Bone);
+                    else if (selectedItem.type == ItemID.HiveWand)
+                        ReduceItemStack(ItemID.Hive);
+                    else if (selectedItem.type == ItemID.StaffofRegrowth) { } //Condition to make specific wands not removed
                     else //TODO: This is still reducing the stack by 1 when trying to place multi tiles in the air
                     {
                         selectedItem.stack--;
@@ -157,19 +151,30 @@ public override bool CanPlace(int i, int j, int type)
             return base.CanPlace(i, j, type);
         }
 
+        private void ReduceItemStack(int ammoItemType)
+        {
+            foreach (Item item in Main.LocalPlayer.inventory)
+            {
+                if (item.type == ammoItemType)
+                {
+                    item.stack--;
+                    break;
+                }
+            }
+        }
+
         //Infinite Placement Stuff
         public override void PlaceInWorld(int i, int j, Item item)
         {
             BuilderPlayer modPlayer = Main.LocalPlayer.GetModPlayer<BuilderPlayer>();
 
-            if (!modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinitePlacement)
-            && !modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinityUpgrade))
+            if (!modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinitePlacement) &&
+                !modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinityUpgrade))
             {
                 if (item.consumable == false)
                     item.consumable = true;
 
-                //Wands will decrease their stack either way, but at least won't be consumed.
-                //Perhaps make my own Multi Wand to compensate for that?
+                //Wands aren't consumable items
                 if (item.type == ItemID.BoneWand || item.type == ItemID.HiveWand || item.type == ItemID.LeafWand ||
                     item.type == ItemID.LivingMahoganyWand || item.type == ItemID.LivingMahoganyLeafWand ||
                     item.type == ItemID.LivingWoodWand || item.type == ItemID.StaffofRegrowth)
@@ -179,8 +184,8 @@ public override void PlaceInWorld(int i, int j, Item item)
             if (modPlayer.mirrorWandEffects)
                 UIUtilities.MirrorWandPlacement(i, j, item, -1);
 
-            if (modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinitePlacement)
-            || modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinityUpgrade))
+            if (modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinitePlacement) ||
+                modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinityUpgrade))
                 item.consumable = false;
             else
                 base.PlaceInWorld(i, j, item);
@@ -192,8 +197,8 @@ public class InfinitePlacementWall : GlobalWall
         public override void PlaceInWorld(int i, int j, int type, Item item)
         {
             BuilderPlayer modPlayer = Main.LocalPlayer.GetModPlayer<BuilderPlayer>();
-            if (modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinityUpgrade)
-            || modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinitePlacement))
+            if (modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinityUpgrade) ||
+                modPlayer.creativeWheelSelectedIndex.Contains((int)CreativeWheelItem.InfinitePlacement))
                 item.consumable = false;
             else
                 item.consumable = true;

diff --git a/Items/MirrorWand.cs b/Items/MirrorWand.cs
@@ -32,8 +32,8 @@ public override void SetStaticDefaults()
         }
         public override void SetDefaults()
         {
-            item.height = 20;
-            item.width = 18;
+            item.height = 32;
+            item.width = 32;
             item.useTime = 1;
             item.useAnimation = 10;
             item.useStyle = ItemUseStyleID.HoldingOut;
@@ -109,7 +109,6 @@ public override void UpdateInventory(Player player)
         {
             BuilderPlayer modPlayer = player.GetModPlayer<BuilderPlayer>();
             base.UpdateInventory(player);
-            //Main.NewText("Start: " + MirrorWand.mouseLeftStart + " End: " + MirrorWand.mouseLeftEnd);
 
             if (OperationComplete && OperationCompleteLeft && TransparentSelection.validPlacement)
                 modPlayer.mirrorWandEffects = true;

diff --git a/build.txt b/build.txt
@@ -1,5 +1,5 @@
 displayName = Builder Essentials
 author = Kirtle
-version = 0.1.11.2
+version = 0.1.11.3
 buildIgnore = *.csproj, *.user, obj\*, bin\*, .vs\*
 homepage = https://discord.gg/wQYMbQq