From d87e827d9abe6c51c353ee21e04d6894c3d308bc Mon Sep 17 00:00:00 2001 From: DogooFalchion Date: Wed, 19 Oct 2016 23:20:45 -0400 Subject: [PATCH 1/3] Add Hardened Sand to the list of tiles that can be altered by a player --- TShockAPI/GetDataHandlers.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index aae3839b..6b59ad04 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1835,7 +1835,9 @@ namespace TShockAPI (newtile.Type == 1 || newtile.Type == 25 || newtile.Type == 117 || newtile.Type == 203 || Main.tileMoss[newtile.Type])) || // Sand <-> Sand ((tile.type == 53 || tile.type == 112 || tile.type == 116 || tile.type == 234) && - (newtile.Type == 53 || newtile.Type == 112 || newtile.Type == 116 || newtile.Type == 234))) + (newtile.Type == 53 || newtile.Type == 112 || newtile.Type == 116 || newtile.Type == 234)) || + // Hardened Sand <-> Hardened Sand + (TileID.Sets.Conversion.HardenedSand[tile.type] && TileID.Sets.Conversion.HardenedSand[newtile.Type])) { Main.tile[realx, realy].type = newtile.Type; changed = true; From 0843e4c38e4ba12093295af2d9b4f405c21c3298 Mon Sep 17 00:00:00 2001 From: DogooFalchion Date: Wed, 19 Oct 2016 23:28:45 -0400 Subject: [PATCH 2/3] Update the existing logic to use the Conversion sets, KISS. --- TShockAPI/GetDataHandlers.cs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 6b59ad04..8f5cfa05 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1822,20 +1822,19 @@ namespace TShockAPI if (tile.active() && newtile.Active) { // Grass <-> Grass - if (((tile.type == 2 || tile.type == 23 || tile.type == 60 || tile.type == 70 || tile.type == 109 || tile.type == 199) && - (newtile.Type == 2 || newtile.Type == 23 || newtile.Type == 60 || newtile.Type == 70 || newtile.Type == 109 || newtile.Type == 199)) || - // Dirt <-> Dirt + if ((TileID.Sets.Conversion.Grass[tile.type] && TileID.Sets.Conversion.Grass[newtile.Type]) || + // Dirt <-> Dirt ((tile.type == 0 || tile.type == 59) && (newtile.Type == 0 || newtile.Type == 59)) || // Ice <-> Ice - ((tile.type == 161 || tile.type == 163 || tile.type == 164 || tile.type == 200) && - (newtile.Type == 161 || newtile.Type == 163 || newtile.Type == 164 || newtile.Type == 200)) || + (TileID.Sets.Conversion.Ice[tile.type] && TileID.Sets.Conversion.Ice[newtile.Type]) || // Stone <-> Stone - ((tile.type == 1 || tile.type == 25 || tile.type == 117 || tile.type == 203 || Main.tileMoss[tile.type]) && - (newtile.Type == 1 || newtile.Type == 25 || newtile.Type == 117 || newtile.Type == 203 || Main.tileMoss[newtile.Type])) || - // Sand <-> Sand - ((tile.type == 53 || tile.type == 112 || tile.type == 116 || tile.type == 234) && - (newtile.Type == 53 || newtile.Type == 112 || newtile.Type == 116 || newtile.Type == 234)) || + ((TileID.Sets.Conversion.Stone[tile.type] || Main.tileMoss[tile.type]) && + (TileID.Sets.Conversion.Stone[newtile.Type] || Main.tileMoss[newtile.Type])) || + // Sand <-> Sand + (TileID.Sets.Conversion.Sand[tile.type] && TileID.Sets.Conversion.Sand[newtile.Type]) || + // Sandstone <-> Sandstone + (TileID.Sets.Conversion.Sandstone[tile.type] && TileID.Sets.Conversion.Sandstone[newtile.Type]) || // Hardened Sand <-> Hardened Sand (TileID.Sets.Conversion.HardenedSand[tile.type] && TileID.Sets.Conversion.HardenedSand[newtile.Type])) { From 50afef312c4872e468d45484bff75e3966c1e90c Mon Sep 17 00:00:00 2001 From: DogooFalchion Date: Wed, 19 Oct 2016 23:34:02 -0400 Subject: [PATCH 3/3] Replace spaces with tabs. --- TShockAPI/GetDataHandlers.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 8f5cfa05..85d1fe27 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1823,7 +1823,7 @@ namespace TShockAPI { // Grass <-> Grass if ((TileID.Sets.Conversion.Grass[tile.type] && TileID.Sets.Conversion.Grass[newtile.Type]) || - // Dirt <-> Dirt + // Dirt <-> Dirt ((tile.type == 0 || tile.type == 59) && (newtile.Type == 0 || newtile.Type == 59)) || // Ice <-> Ice @@ -1831,12 +1831,12 @@ namespace TShockAPI // Stone <-> Stone ((TileID.Sets.Conversion.Stone[tile.type] || Main.tileMoss[tile.type]) && (TileID.Sets.Conversion.Stone[newtile.Type] || Main.tileMoss[newtile.Type])) || - // Sand <-> Sand - (TileID.Sets.Conversion.Sand[tile.type] && TileID.Sets.Conversion.Sand[newtile.Type]) || - // Sandstone <-> Sandstone - (TileID.Sets.Conversion.Sandstone[tile.type] && TileID.Sets.Conversion.Sandstone[newtile.Type]) || - // Hardened Sand <-> Hardened Sand - (TileID.Sets.Conversion.HardenedSand[tile.type] && TileID.Sets.Conversion.HardenedSand[newtile.Type])) + // Sand <-> Sand + (TileID.Sets.Conversion.Sand[tile.type] && TileID.Sets.Conversion.Sand[newtile.Type]) || + // Sandstone <-> Sandstone + (TileID.Sets.Conversion.Sandstone[tile.type] && TileID.Sets.Conversion.Sandstone[newtile.Type]) || + // Hardened Sand <-> Hardened Sand + (TileID.Sets.Conversion.HardenedSand[tile.type] && TileID.Sets.Conversion.HardenedSand[newtile.Type])) { Main.tile[realx, realy].type = newtile.Type; changed = true;