Cleanup /splace.

This commit is contained in:
UnknownShadow200 2016-02-11 13:57:10 +11:00
parent df3ee22bba
commit 4693687b55

View File

@ -16,58 +16,46 @@
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
using System; using System;
namespace MCGalaxy.Commands namespace MCGalaxy.Commands {
{
public sealed class CmdSPlace : Command public sealed class CmdSPlace : Command {
{
public override string name { get { return "splace"; } } public override string name { get { return "splace"; } }
public override string shortcut { get { return "set"; } } public override string shortcut { get { return "set"; } }
public override string type { get { return CommandTypes.Building; } } public override string type { get { return CommandTypes.Building; } }
public override bool museumUsable { get { return false; } } public override bool museumUsable { get { return false; } }
public override LevelPermission defaultRank { get { return LevelPermission.Builder; } } public override LevelPermission defaultRank { get { return LevelPermission.Builder; } }
private ushort distance, interval;
private byte blocktype = (byte)1;
public CmdSPlace() { } public CmdSPlace() { }
public override void Use(Player p, string message) public override void Use(Player p, string message) {
{ ushort distance = 0, interval = 0;
distance = 0; interval = 0;
if (message == "") { Help(p); return; } if (message == "") { Help(p); return; }
if (message.Split(' ').Length > 1)
{ string[] parts = message.Split(' ');
try { ushort.TryParse(message.Split(' ')[0], out distance); } if (!ushort.TryParse(parts[0], out distance)) {
catch { Player.SendMessage(p, "Distance must be a number."); return; } Player.SendMessage(p, "Distance must be a number less than 65536."); return;
try { ushort.TryParse(message.Split(' ')[1], out interval); }
catch { Player.SendMessage(p, "Interval must be a number."); return; }
} }
else if (parts.Length > 1 && !ushort.TryParse(parts[1], out interval)) {
{ Player.SendMessage(p, "Interval must be a number less than 65536."); return;
try { ushort.TryParse(message, out distance); }
catch { Player.SendMessage(p, "Distance must be a number."); return; }
} }
if (distance < 1)
{ if (distance < 1) {
Player.SendMessage(p, "Enter a distance greater than 0."); return; Player.SendMessage(p, "Enter a distance greater than 0."); return;
} }
if (interval >= distance) if (interval >= distance) {
{
Player.SendMessage(p, "The Interval cannot be greater than the distance."); return; Player.SendMessage(p, "The Interval cannot be greater than the distance."); return;
} }
CatchPos cpos; CatchPos cpos = default(CatchPos);
cpos.givenMessage = message; cpos.givenMessage = message;
cpos.x = 0; cpos.y = 0; cpos.z = 0; p.blockchangeObject = cpos; cpos.distance = distance; cpos.interval = interval;
p.blockchangeObject = cpos;
Player.SendMessage(p, "Place two blocks to determine direction."); Player.SendMessage(p, "Place two blocks to determine direction.");
p.ClearBlockchange(); p.ClearBlockchange();
p.Blockchange += new Player.BlockchangeEventHandler(Blockchange1); p.Blockchange += new Player.BlockchangeEventHandler(Blockchange1);
} }
public override void Help(Player p)
{ public void Blockchange1(Player p, ushort x, ushort y, ushort z, byte type, byte extType) {
Player.SendMessage(p, "/splace [distance] [interval] - Measures a set [distance] and places a stone block at each end.");
Player.SendMessage(p, "Optionally place a block at set [interval] between them.");
}
public void Blockchange1(Player p, ushort x, ushort y, ushort z, byte type, byte extType)
{
RevertAndClearState(p, x, y, z); RevertAndClearState(p, x, y, z);
CatchPos bp = (CatchPos)p.blockchangeObject; CatchPos bp = (CatchPos)p.blockchangeObject;
bp.x = x; bp.y = y; bp.z = z; p.blockchangeObject = bp; bp.x = x; bp.y = y; bp.z = z; p.blockchangeObject = bp;
@ -77,75 +65,46 @@ namespace MCGalaxy.Commands
public void Blockchange2(Player p, ushort x, ushort y, ushort z, byte type, byte extType) { public void Blockchange2(Player p, ushort x, ushort y, ushort z, byte type, byte extType) {
RevertAndClearState(p, x, y, z); RevertAndClearState(p, x, y, z);
CatchPos cpos = (CatchPos)p.blockchangeObject; CatchPos cpos = (CatchPos)p.blockchangeObject;
ushort distance = cpos.distance, interval = cpos.interval;
if (x == cpos.x && z == cpos.z) { Player.SendMessage(p, "No direction was selected"); return; } if (x == cpos.x && z == cpos.z) { Player.SendMessage(p, "No direction was selected"); return; }
int dirX = 0, dirZ = 0;
if (Math.Abs(cpos.x - x) > Math.Abs(cpos.z - z)) if (Math.Abs(cpos.x - x) > Math.Abs(cpos.z - z))
{ dirX = x > cpos.x ? 1 : -1;
if (x > cpos.x)
{
p.level.Blockchange(p, (ushort)(cpos.x + (distance - 1)), cpos.y, cpos.z, blocktype);
p.level.Blockchange(p, cpos.x, cpos.y, cpos.z, blocktype);
if (interval > 0)
{
for (ushort offset = interval; cpos.x + offset < cpos.x + (distance - 1); offset += interval)
{
p.level.Blockchange(p, (ushort)(cpos.x + offset), cpos.y, cpos.z, blocktype);
}
}
}
else else
{ dirZ = z > cpos.z ? 1 : -1;
p.level.Blockchange(p, (ushort)(cpos.x - (distance - 1)), cpos.y, cpos.z, blocktype); ushort endX = (ushort)(cpos.x + dirX * distance);
p.level.Blockchange(p, cpos.x, cpos.y, cpos.z, blocktype); ushort endZ = (ushort)(cpos.z + dirZ * distance);
if (interval > 0) p.level.Blockchange(p, endX, cpos.y, endZ, Block.rock);
{
for (ushort offset = interval; cpos.x - (distance - 1) < cpos.x - offset; offset += interval) if (interval > 0) {
{ ushort xx = cpos.x, zz = cpos.z;
p.level.Blockchange(p, (ushort)(cpos.x - offset), cpos.y, cpos.z, blocktype); int delta = 0;
while (xx < p.level.Width && zz < p.level.Length && delta < distance) {
p.level.Blockchange(p, xx, cpos.y, zz, Block.rock);
xx = (ushort)(xx + dirX * interval);
zz = (ushort)(zz + dirZ * interval);
delta = Math.Abs(xx - cpos.x) + Math.Abs(zz - cpos.z);
} }
} } else {
} p.level.Blockchange(p, cpos.x, cpos.y, cpos.z, Block.rock);
}
else
{
if (z > cpos.z)
{
p.level.Blockchange(p, cpos.x, cpos.y, (ushort)(cpos.z + (distance - 1)), blocktype);
p.level.Blockchange(p, cpos.x, cpos.y, cpos.z, blocktype);
if (interval > 0)
{
for (ushort offset = interval; cpos.z + offset < cpos.z + (distance - 1); offset += interval)
{
p.level.Blockchange(p, cpos.x, cpos.y, (ushort)(cpos.z + offset), blocktype);
}
}
}
else
{
p.level.Blockchange(p, cpos.x, cpos.y, (ushort)(cpos.z - (distance - 1)), blocktype);
p.level.Blockchange(p, cpos.x, cpos.y, cpos.z, blocktype);
if (interval > 0)
{
for (ushort offset = interval; cpos.z - (distance - 1) < cpos.z - offset; offset += interval)
{
p.level.Blockchange(p, cpos.x, cpos.y, (ushort)(cpos.z - offset), blocktype);
}
}
}
}
if (interval > 0)
{
Player.SendMessage(p, "Placed stone blocks " + interval + " apart");
}
else
{
Player.SendMessage(p, "Placed stone blocks " + distance + " apart");
}
if (p.staticCommands) p.Blockchange += new Player.BlockchangeEventHandler(Blockchange1);
}
struct CatchPos
{
public ushort x, y, z; public string givenMessage;
} }
if (interval > 0)
Player.SendMessage(p, "Placed stone blocks " + interval + " apart");
else
Player.SendMessage(p, "Placed stone blocks " + distance + " apart");
if (p.staticCommands) p.Blockchange += new Player.BlockchangeEventHandler(Blockchange1);
}
struct CatchPos {
public ushort x, y, z; public string givenMessage;
public ushort distance, interval;
}
public override void Help(Player p) {
Player.SendMessage(p, "/splace [distance] [interval] - Measures a set [distance] and places a stone block at each end.");
Player.SendMessage(p, "Optionally place a block at set [interval] between them.");
}
} }
} }