From f5133d287b242365e4b9ee93cb4c51393394fcdb Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Sun, 31 Oct 2021 17:11:24 +0000
Subject: [PATCH] Default to square spirals

---
 Chat-Command-Reference.md                        | 2 +-
 worldeditadditions_commands/commands/spiral2.lua | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Chat-Command-Reference.md b/Chat-Command-Reference.md
index 1244b8a..af98884 100644
--- a/Chat-Command-Reference.md
+++ b/Chat-Command-Reference.md
@@ -160,7 +160,7 @@ Creates vertical walls of `<replace_node>` around the inside edges of the define
 
 
 ### `//spiral2 [<circle|square>] [<replace_node=dirt> [<interval=3> [<acceleration=0>] ] ]`
-Generates both square and circular spiral shapes with the given `<replace_node>`. The interval defines the gap between the spiral in nodes, and the acceleration defines by how much the interval should be increased (a value of 1 means 1 node per revolution).
+Generates both square and circular spiral shapes with the given `<replace_node>` - defaulting to square spirals. The interval defines the gap between the spiral in nodes, and the acceleration defines by how much the interval should be increased (a value of 1 means 1 node per revolution).
 
 ```
 //spiral2
diff --git a/worldeditadditions_commands/commands/spiral2.lua b/worldeditadditions_commands/commands/spiral2.lua
index e8efc06..5dbe9be 100644
--- a/worldeditadditions_commands/commands/spiral2.lua
+++ b/worldeditadditions_commands/commands/spiral2.lua
@@ -4,17 +4,17 @@ local Vector3 = wea.Vector3
 
 worldedit.register_command("spiral2", {
 	params = "[<circle|square>] [<replace_node=dirt> [<interval=3> [<acceleration=0>] ] ]",
-	description = "Generates a spiral that fills the defined region using the specified replace node. The spiral is either circular (default) or square in shape. The interval specifies the distance between the walls of the spiral, and the acceleration specifies how quickly this value should increase.",
+	description = "Generates a spiral that fills the defined region using the specified replace node. The spiral is either square (default) or circular in shape. The interval specifies the distance between the walls of the spiral, and the acceleration specifies how quickly this value should increase.",
 	privs = { worldedit = true },
 	require_pos = 2,
 	parse = function(params_text)
 		if not params_text then params_text = "" end
 		params_text = wea.trim(params_text)
-		if params_text == "" then return true, "circle", "dirt", 3, 0 end
+		if params_text == "" then return true, "square", "dirt", 3, 0 end
 		
 		local parts = wea.split_shell(params_text)
 		
-		local mode = "circle"
+		local mode = "square"
 		local target_node = "dirt"
 		local target_node_found = false
 		local interval = 3