Merge pull request #64 from THEXN/master

Update BridgeBuilder 支持竖直放置图格

Author: Controllerdestiny

BridgeBuilder/BridgeBuilder.cs

@@ -10,7 +10,7 @@ namespace BridgeBuilder
     public class BridgeBuilder : TerrariaPlugin
     {
         public override string Name => "BridgeBuilder";
-        public override Version Version => new Version(1, 0, 5);
+        public override Version Version => new Version(1, 0, 6);
         public override string Author => "Soofa，肝帝熙恩汉化1449";
         public override string Description => "铺桥!";
         public static Configuration Config;
@@ -46,10 +46,23 @@ private async void BridgeCmd(CommandArgs args)
             await Task.Run(() =>
             {
                 TSPlayer plr = args.Player;
-                int direction = plr.TPlayer.direction;
-                int startX = direction == -1 ? plr.TileX - 1 : plr.TileX + 2;
+                int directionX = plr.TPlayer.direction;
+                int directionY = 0;
+
+                if (args.Parameters.Count > 0)
+                {
+                    string direction = args.Parameters[0].ToLower();
+                    if (direction == "up" || direction == "down")
+                    {
+                        directionY = direction == "up" ? -1 : 1; // 确保正确的垂直方向
+                        directionX = 0; // 在垂直建造时，水平方向不移动
+                    }
+                }
+
+                int startX = directionX == 0 ? plr.TileX : (directionX == -1 ? plr.TileX - 1 : plr.TileX + 2);
                 int i = 0;
-                int j = plr.TileY + 3;
+                int j = plr.TileY + (directionY == -1 ? -1 : (directionY == 1 ? 3 : 3));
+
                 Item selectedItem = plr.SelectedItem;
 
                 if (selectedItem.createTile < 0 && selectedItem.createWall < 0)
@@ -61,72 +74,68 @@ await Task.Run(() =>
                 bool isTile = selectedItem.createTile >= 0;
                 int styleId = selectedItem.placeStyle;
 
-                if (j > Main.maxTilesY || j < 0)
+                if (j < 0 || j >= Main.maxTilesY)
                 {
                     plr.SendErrorMessage("无法在这里建造桥梁。");
                     return;
                 }
 
-                if (isTile)
+                int placedCount = 0;
+
+                while (CheckTileAvailability(startX + i * directionX, j, plr) && selectedItem.stack > 0)
                 {
-                    if (!Config.AllowedTileIDs.Contains(selectedItem.createTile))
+                    if (isTile)
+                    {
+                        WorldGen.PlaceTile(startX + i * directionX, j, selectedItem.createTile, false, true, -1, styleId);
+                    }
+                    else
                     {
-                        plr.SendErrorMessage("你手持的物块无法自动建造桥梁。（一般仅允许使用平台或团队块或种植盆。）");
-                        return;
+                        Main.tile[startX + i * directionX, j].wall = (ushort)selectedItem.createWall;
                     }
 
-                    int tileCount = 0;
-                    while (CheckTileAvailability(startX, startX + i, j, plr))
+                    TSPlayer.All.SendTileRect((short)(startX + i * directionX), (short)j, 1, 1);
+                    plr.SelectedItem.stack--;
+                    i++;
+                    if (directionY != 0) // 只有在垂直建造时改变Y坐标
                     {
-                        WorldGen.PlaceTile(startX + i, j, selectedItem.createTile, false, true, -1, styleId);
-                        TSPlayer.All.SendTileRect((short)(startX + i), (short)j, 1, 1);
-                        plr.SelectedItem.stack--;
-                        i += direction;
-                        tileCount++;
+                        j += directionY;
                     }
+                    placedCount++;
+                }
 
-                    plr.SendSuccessMessage($"{tileCount}格桥梁建造完成！");
+                if (placedCount > 0)
+                {
+                    plr.SendSuccessMessage($"{placedCount}格桥梁建造完成！");
                 }
                 else
                 {
-                    if (!Config.AllowedwallIDs.Contains(selectedItem.createWall))
-                    {
-                        plr.SendErrorMessage("你手持的墙壁无法自动建造桥梁。（一般仅允许使用平台或团队块或种植盆。）");
-                        return;
-                    }
-                    int wallCount = 0;
-                    while (CheckTileAvailability(startX, startX + i, j, plr))
-                    {
-                        Main.tile[startX + i, j].wall = (ushort)selectedItem.createWall;
-                        TSPlayer.All.SendTileRect((short)(startX + i), (short)j, 1, 1);
-                        plr.SelectedItem.stack--;
-                        i += direction;
-                        wallCount++;
-                    }
-                    plr.SendSuccessMessage($"{wallCount}格桥梁建造完成！");
+                    plr.SendErrorMessage("没有足够的空间或物品来建造桥梁。");
                 }
 
                 NetMessage.SendData((int)PacketTypes.PlayerSlot, -1, -1, NetworkText.FromLiteral(plr.SelectedItem.Name), plr.Index, plr.TPlayer.selectedItem);
                 NetMessage.SendData((int)PacketTypes.PlayerSlot, plr.Index, -1, NetworkText.FromLiteral(plr.SelectedItem.Name), plr.Index, plr.TPlayer.selectedItem);
             });
         }
 
-
-        private static bool CheckTileAvailability(int startX, int x, int y, TSPlayer plr)
+        private static bool CheckTileAvailability(int x, int y, TSPlayer plr, int directionX = 0, int directionY = 0)
         {
-            bool canPlace = x < Main.maxTilesX && x >= 0 &&
-                            Math.Abs(startX - x) < Config.MaxPlaceLength &&
+            bool canPlace = x < Main.maxTilesX && x >= 0 && y < Main.maxTilesY && y >= 0 &&
+                            Math.Abs(directionX != 0 ? plr.TileX - x : plr.TileY - y) < Config.MaxPlaceLength &&
                             plr.SelectedItem.stack > 0 &&
-                            !TShock.Regions.InArea(x, y) &&
-                            !Main.tile[x, y].active();
+                            !TShock.Regions.InArea(x, y);
 
-            if (plr.SelectedItem.createTile < 0 && plr.SelectedItem.createWall >= 0) 
+            if (plr.SelectedItem.createTile < 0 && plr.SelectedItem.createWall >= 0) // 检查墙壁
             {
                 canPlace &= Main.tile[x, y].wall == 0;
             }
+            else if (plr.SelectedItem.createTile >= 0) // 检查物块
+            {
+                canPlace &= !Main.tile[x, y].active();
+            }
 
             return canPlace;
         }
+
     }
 }
 

BridgeBuilder/README.md

@@ -4,10 +4,14 @@
 - 出处: [github](https://github.com/Soof4/BridgeBuilder)
 - 快速向玩家面向的平行方向铺路，碰到方块则停止
 - 可自定义铺桥方块，默认配置内已有：平台，种植盆，团队块
-
+- 可以竖直放了
+- 科普：<>内是必填，[]内是选填
 ## 更新日志
 
 ```
+1.0.6
+添加竖直方向
+
 1.0.5
 修改添加了墙壁逻辑，填墙壁id就好了
 ```
@@ -16,7 +20,7 @@
 
 | 语法           |        权限         |   说明   |
 | -------------- | :-----------------: | :------: |
-| /bridge 或 /桥来 |  bridgebuilder.bridge  | 快速铺桥指令|
+| /bridge [up/down] 或 /桥来 [up/down]|  bridgebuilder.bridge  | 快速铺桥指令|
 
 ## 配置