themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Overhauled commands. Now everything is dumped into Commands.cs

Browse source
This commit is contained in:
Deathmax 2011-06-02 12:14:32 +08:00
parent 864a3df125
commit ea3c9c5580
3 changed files with 611 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

333
TShockAPI/Commands.cs Normal file
View file

@ -0,0 +1,333 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Terraria;
using System.Text.RegularExpressions;
namespace TShockAPI
{
public class Commands
{
public delegate void CommandDelegate(CommandArgs args);
public struct CommandArgs
{
public string Message;
public int PlayerX;
public int PlayerY;
public int PlayerID;
public CommandArgs(string message, int x, int y, int id)
{
Message = message; PlayerX = x; PlayerY = y; PlayerID = id;
}
}
public static void InitCommands()
{
TShock.commandList.Add("kick", new CommandDelegate(Kick));
TShock.commandList.Add("ban", new CommandDelegate(Ban));
TShock.commandList.Add("off", new CommandDelegate(Off));
TShock.commandList.Add("reload", new CommandDelegate(Reload));
TShock.commandList.Add("dropmeteor", new CommandDelegate(DropMeteor));
TShock.commandList.Add("star", new CommandDelegate(Star));
TShock.commandList.Add("bloodmoon", new CommandDelegate(Bloodmoon));
TShock.commandList.Add("eater", new CommandDelegate(Eater));
TShock.commandList.Add("eye", new CommandDelegate(Eye));
TShock.commandList.Add("skeletron", new CommandDelegate(Skeletron));
TShock.commandList.Add("hardcore", new CommandDelegate(Hardcore));
TShock.commandList.Add("invade", new CommandDelegate(Invade));
TShock.commandList.Add("password", new CommandDelegate(Password));
TShock.commandList.Add("save", new CommandDelegate(Save));
TShock.commandList.Add("spawn", new CommandDelegate(Spawn));
TShock.commandList.Add("tp", new CommandDelegate(TP));
TShock.commandList.Add("tphere", new CommandDelegate(TPHere));
TShock.commandList.Add("spawnmob", new CommandDelegate(SpawnMob));
TShock.commandList.Add("item", new CommandDelegate(Item));
TShock.commandList.Add("give", new CommandDelegate(Give));
TShock.commandList.Add("heal", new CommandDelegate(Heal));
TShock.commandList.Add("butcher", new CommandDelegate(Butcher));
TShock.commandList.Add("maxspawns", new CommandDelegate(MaxSpawns));
TShock.commandList.Add("spawnrate", new CommandDelegate(SpawnRate));
}
#region Command Methods
public static void Kick(CommandArgs args)
{
string plStr = args.Message.Remove(0, 5).Trim();
int ply = args.PlayerID;
if (!(Tools.FindPlayer(plStr) == -1 || plStr == ""))
{
Tools.Kick(Tools.FindPlayer(plStr), "You were kicked.");
Tools.Broadcast(plStr + " was kicked by " + Tools.FindPlayer(ply));
}
}
public static void Ban(CommandArgs args)
{
string plStr = args.Message.Remove(0, 4).Trim();
if (!(Tools.FindPlayer(plStr) == -1 || plStr == ""))
{
FileTools.WriteBan(Tools.FindPlayer(plStr));
Tools.Kick(Tools.FindPlayer(plStr), "You were banned.");
}
}
public static void Off(CommandArgs args)
{
Netplay.disconnect = true;
}
public static void Reload(CommandArgs args)
{
FileTools.SetupConfig();
}
public static void DropMeteor(CommandArgs args)
{
WorldGen.spawnMeteor = false;
WorldGen.dropMeteor();
}
public static void Star(CommandArgs args)
{
int penis56 = 12;
int penis57 = Main.rand.Next(Main.maxTilesX - 50) + 100;
penis57 *= 0x10;
int penis58 = Main.rand.Next((int)(Main.maxTilesY * 0.05)) * 0x10;
Microsoft.Xna.Framework.Vector2 vector = new Microsoft.Xna.Framework.Vector2((float)penis57, (float)penis58);
float speedX = Main.rand.Next(-100, 0x65);
float speedY = Main.rand.Next(200) + 100;
float penis61 = (float)Math.Sqrt((double)((speedX * speedX) + (speedY * speedY)));
penis61 = ((float)penis56) / penis61;
speedX *= penis61;
speedY *= penis61;
Projectile.NewProjectile(vector.X, vector.Y, speedX, speedY, 12, 0x3e8, 10f, Main.myPlayer);
}
public static void Bloodmoon(CommandArgs args)
{
int ply = args.PlayerID;
Tools.Broadcast(Tools.FindPlayer(ply) + " turned on blood moon.");
Main.bloodMoon = true;
Main.time = 0;
Main.dayTime = false;
NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY);
NetMessage.syncPlayers();
}
public static void Eater(CommandArgs args)
{
int x = args.PlayerX;
int y = args.PlayerY;
int ply = args.PlayerID;
Tools.NewNPC((int)ConfigurationManager.NPCList.WORLD_EATER, x, y, ply);
Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned an eater of worlds!");
}
public static void Eye(CommandArgs args)
{
int x = args.PlayerX;
int y = args.PlayerY;
int ply = args.PlayerID;
Tools.NewNPC((int)ConfigurationManager.NPCList.EYE, x, y, ply);
Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned an eye!");
}
public static void Skeletron(CommandArgs args)
{
int x = args.PlayerX;
int y = args.PlayerY;
int ply = args.PlayerID;
Tools.NewNPC((int)ConfigurationManager.NPCList.SKELETRON, x, y, ply);
Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned skeletron!");
}
public static void Hardcore(CommandArgs args)
{
int x = args.PlayerX;
int y = args.PlayerY;
int ply = args.PlayerID;
for (int i = 0; i <= 2; i++)
{
Tools.NewNPC(i, x, y, ply);
}
Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned all 3 bosses!");
}
public static void Invade(CommandArgs args)
{
int ply = args.PlayerID;
Tools.Broadcast(Main.player[ply].name + " started an invasion.");
TShock.StartInvasion();
}
public static void Password(CommandArgs args)
{
int ply = args.PlayerID;
string passwd = args.Message.Remove(0, 9).Trim();
Netplay.password = passwd;
Tools.SendMessage(ply, "Server password changed to: " + passwd);
}
public static void Save(CommandArgs args)
{
int ply = args.PlayerID;
WorldGen.saveWorld();
Tools.SendMessage(ply, "World saved.");
}
public static void Spawn(CommandArgs args)
{
int ply = args.PlayerID;
TShock.Teleport(ply, Main.player[ply].SpawnX * 16, Main.player[ply].SpawnY * 16);
Tools.SendMessage(ply, "Teleported to your spawnpoint.");
}
public static void TP(CommandArgs args)
{
int ply = args.PlayerID;
string player = args.Message.Remove(0, 3).Trim();
if (Tools.FindPlayer(player) != -1 && player != "")
{
TShock.Teleport(ply, Main.player[Tools.FindPlayer(player)].position.X, Main.player[Tools.FindPlayer(player)].position.Y);
Tools.SendMessage(ply, "Teleported to " + player);
}
}
public static void TPHere(CommandArgs args)
{
int ply = args.PlayerID;
string player = args.Message.Remove(0, 7).Trim();
if (Tools.FindPlayer(player) != -1 && player != "")
{
TShock.Teleport(Tools.FindPlayer(player), Main.player[ply].position.X, Main.player[ply].position.Y);
Tools.SendMessage(Tools.FindPlayer(player), "You were teleported to " + Tools.FindPlayer(ply) + ".");
Tools.SendMessage(ply, "You brought " + player + " here.");
}
}
public static void SpawnMob(CommandArgs args)
{
int x = args.PlayerX;
int y = args.PlayerY;
var msgargs = Regex.Split(args.Message, "(?<=^[^\"]*(?:\"[^\"]*\"[^\"]*)*) (?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)");
if (msgargs.Length >= 2 && msgargs.Length <= 3)
{
for (int i = 1; i < msgargs.Length; i++)
msgargs[i] = ((msgargs[i].TrimEnd('"')).TrimStart('"'));
string inputtype = "";
int amount = 1;
int npcid = -1;
int type = -1;
inputtype = msgargs[1];
if (msgargs.Length == 3)
int.TryParse(msgargs[2], out amount);
if (!int.TryParse(inputtype, out type))
type = TShock.GetNPCID(inputtype);
if (type >= 1 && type <= 43)
{
for (int i = 0; i < amount; i++)
npcid = NPC.NewNPC(x, y, type, 0);
Tools.Broadcast(string.Format("{0} was spawned {1} time(s).", Main.npc[npcid].name, amount));;
}
}
}
public static void Item(CommandArgs args)
{
var msgargs = Regex.Split(args.Message, "(?<=^[^\"]*(?:\"[^\"]*\"[^\"]*)*) (?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)")[1];
int ply = args.PlayerID;
if (msgargs.Length >= 2)
{
msgargs = ((msgargs.TrimEnd('"')).TrimStart('"'));
int type = 0;
if (!int.TryParse(msgargs, out type))
type = TShock.GetItemID(msgargs);
if (type >= 1 && type <= 235)
{
for (int i = 0; i < 40; i++)
{
if (!Main.player[ply].inventory[i].active)
{
Main.player[ply].inventory[i].SetDefaults(type);
Main.player[ply].inventory[i].stack = Main.player[ply].inventory[i].maxStack;
Tools.SendMessage(ply, "Got some " + Main.player[ply].inventory[i].name + ".");
TShock.UpdateInventories();
break;
}
}
}
}
}
public static void Give(CommandArgs args)
{
var msgargs = Regex.Split(args.Message, "(?<=^[^\"]*(?:\"[^\"]*\"[^\"]*)*) (?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)");
int ply = args.PlayerID;
if (msgargs.Length == 3)
{
for (int i = 1; i < msgargs.Length; i++)
msgargs[i] = ((msgargs[i].TrimEnd('"')).TrimStart('"'));
int type = 0;
int player = -1;
if (!int.TryParse(msgargs[1], out type))
type = TShock.GetItemID(msgargs[1]);
if (type >= 1 && type <= 235)
{
player = Tools.FindPlayer(msgargs[2]);
if (player != -1)
{
for (int i = 0; i < 40; i++)
{
if (!Main.player[player].inventory[i].active)
{
Main.player[player].inventory[i].SetDefaults(type);
Main.player[player].inventory[i].stack = Main.player[player].inventory[i].maxStack;
Tools.SendMessage(ply, string.Format("Gave {0} some {1}.", msgargs[2], Main.player[player].inventory[i].name));
Tools.SendMessage(player, string.Format("{0} gave you some {1}.", Tools.FindPlayer(ply), Main.player[player].inventory[i].name));
TShock.UpdateInventories();
break;
}
}
}
}
}
}
public static void Heal(CommandArgs args)
{
int ply = args.PlayerID;
int x = args.PlayerX;
int y = args.PlayerY;
var msgargs = Regex.Split(args.Message, "(?<=^[^\"]*(?:\"[^\"]*\"[^\"]*)*) (?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)");
int player = ply;
if (msgargs.Length == 2)
player = Tools.FindPlayer((msgargs[1].TrimEnd('"')).TrimStart('"'));
if (player != ply)
{
Tools.SendMessage(ply, string.Format("You just healed {0}", (msgargs[1].TrimEnd('"')).TrimStart('"')));
Tools.SendMessage(player, string.Format("{0} just healed you!", Tools.FindPlayer(ply)));
}
else
Tools.SendMessage(ply, "You just got healed!");
for (int i = 0; i < 20; i++)
{
int itemid = Terraria.Item.NewItem(1, 1, 1, 1, 58);
Main.item[itemid].position.X = (float)x;
Main.item[itemid].position.Y = (float)y;
NetMessage.SendData(21, -1, -1, "", itemid, 0f, 0f, 0f);
}
}
public static void Butcher(CommandArgs args)
{
int killcount = 0;
for (int i = 0; i < Main.npc.Length; i++)
{
if (Main.npc[i].townNPC || !Main.npc[i].active)
continue;
else
{
Main.npc[i].StrikeNPC(99999, 90f, 1);
NetMessage.SendData(28, -1, -1, "", i, (float)99999, 90f, 1);
killcount++;
}
}
Tools.Broadcast("Killed " + killcount.ToString() + " NPCs.");
}
public static void MaxSpawns(CommandArgs args)
{
int ply = args.PlayerID;
int amount = Convert.ToInt32(args.Message.Remove(0, 10));
NPC.maxSpawns = amount;
Tools.Broadcast(Tools.FindPlayer(ply) + " changed the maximum spawns to: " + amount);
}
public static void SpawnRate(CommandArgs args)
{
int ply = args.PlayerID;
int amount = Convert.ToInt32(args.Message.Remove(0, 10));
NPC.spawnRate = amount;
Tools.Broadcast(Tools.FindPlayer(ply) + " changed the spawn rate to: " + amount);
}
#endregion
}
}

28
TShockAPI/TShock.cs
View file

@ -2,6 +2,7 @@
using System.IO;
using System.Net;
using System.Text.RegularExpressions;
using System.Collections.Generic;
using Microsoft.Xna.Framework;
using Terraria;
using TerrariaAPI;
@ -19,6 +20,8 @@ namespace TShockAPI
public static bool shownVersion = false;
public static Dictionary<string, Commands.CommandDelegate> commandList = new Dictionary<string, Commands.CommandDelegate>();
public override Version Version
{
get { return VersionNum; }
@ -60,6 +63,7 @@ namespace TShockAPI
NetHooks.OnPreGetData += GetData;
NetHooks.OnGreetPlayer += new NetHooks.GreetPlayerD(OnGreetPlayer);
NpcHooks.OnStrikeNpc += new NpcHooks.StrikeNpcD(NpcHooks_OnStrikeNpc);
Commands.InitCommands();
}
public override void DeInitialize()
@ -157,9 +161,27 @@ namespace TShockAPI
int x = (int)Main.player[ply].position.X;
int y = (int)Main.player[ply].position.Y;
//if (Tools.IsAdmin(ply))
//{
if (msg.StartsWith("/"))
{
if (Tools.IsAdmin(ply))
{
if (msg.Length > 5 && msg.Substring(0, 5) == "/kick")
Commands.CommandArgs args = new Commands.CommandArgs(msg, x, y, ply);
Commands.CommandDelegate command;
if (commandList.TryGetValue(msg.Split(' ')[0].TrimStart('/'), out command))
command.Invoke(args);
else
Tools.SendMessage(ply, "Invalid command! Try /help.", new float[] { 255f, 0f, 0f });
handler.Handled = true;
}
else if (!Tools.IsAdmin(ply) && msg != "/help")
{
Tools.SendMessage(ply, "You don't have permissions to do that!", new float[] { 255f, 0f, 0f });
handler.Handled = true;
}
}
/*if (msg.Length > 5 && msg.Substring(0, 5) == "/kick")
{
string plStr = msg.Remove(0, 5).Trim();
if (!(Tools.FindPlayer(plStr) == -1 || plStr == ""))
@ -437,8 +459,8 @@ namespace TShockAPI
NPC.spawnRate = amount;
Tools.Broadcast(Tools.FindPlayer(ply) + " changed the spawn rate to: " + amount);
handler.Handled = true;
}
}
}*/
//}
if (msg == "/help")
{
Tools.SendMessage(ply, "TShock Commands:");

1
TShockAPI/TShockAPI.csproj
View file

@ -49,6 +49,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Commands.cs" />
<Compile Include="ConfigurationManager.cs" />
<Compile Include="FileTools.cs" />
<Compile Include="Tools.cs" />