Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

Commit

Permalink
1.3.3 Update (#50)
Browse files Browse the repository at this point in the history
* 1.3.3 first draft

- Bump version
- Default warps
- Revamped player dict
- `Warps` command (alternative to `warp list`
- `jail [player] (duration in seconds)` command

* Update README.md

* 1.3.3 second draft

* 1.3.3 third draft

 - Adding `Empty` command, closes #43
 - `*` wildcard now works for warping
 - Removed **__alot__** of unnessesary lines

* Update README.md

Added:
 - EMPTY command
 - JAIL command
Changed: 
 - `admintoolbox_debug_player_player_joinANDleave` to `admintoolbox_player_join_info`

* 1.3.3 forth draft

 - Updating to smod 3.1.11
 - Readding intercom whitelist
 - Fixing SetPlayerVariables class
 - General code improvements

* Fixed readme.md & resources.md

* Update README.md

* Update RESOURCES.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* 1.3.3 fifth draft

 - Added `admintoolbox_custom_nuke_cards` bool  &  `admintoolbox_nuke_card_list` List
 - Renamed duplicate commands
 - Fixed bugs

* Update README.md

* Update README.md

* Removed debug in IntercomEvent

* Update README.md

* Update to 1.3.3

* Bump version
  • Loading branch information
Rnen authored Aug 12, 2018
1 parent eb803be commit 72e90b9
Show file tree
Hide file tree
Showing 30 changed files with 954 additions and 713 deletions.
16 changes: 8 additions & 8 deletions .github/RESOURCES.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
|#19| Weapon Manager Tablet
|#20| E-11 Standard Rifle
|#21| P90
|#22| SFA Ammo (E- 11 Rifle Ammo)
|#22| 5.56mm Ammo (E- 11 Rifle Ammo)
|#23| MP4
|#24| Logicer (Chaos Weapon)
|#25| Frag Granade
|#26| Flash Granade
|#27| Disarmer
|#28| RAT Ammo (MP7, Logicer ammo)
|#29| PAT ammo (Com15, P90 ammo)
|#28| 7.62mm Ammo (MP4, Logicer ammo)
|#29| 9mm ammo (Com15, P90 ammo)

#
## DamageType ID's
Expand All @@ -91,7 +91,7 @@
#16| COM15 | Pistol
#17| E11_STANDARD_RIFLE | NTF Rifle
#18| P90 |
#19| MP7 |
#19| MP4 |
#20| LOGICER | Chaos weapon

#
Expand All @@ -107,7 +107,7 @@
#6| Tutorial

#
>Room ID's is not finished beeing documented
>Room ID's are not yet finished being documented
## Room ID's
| Room ID | Description |
| :--- | :--- |
Expand All @@ -131,8 +131,8 @@ HC_SERVERS | ^
HC_SERVERS | ^
HC_TESLA_B | Tesla Gate
HC_TESLA_B | Tesla Gate
HC_457_CR | Micro HID Room
HC_096_CR |
HC_457_CR | 096's containment
HC_096_CR | Micro HID Room
HC_079_HALL |
HC_079_HALL |
HC_079_MON |
Expand All @@ -148,4 +148,4 @@ Straight_4 |
LC_ARMORY |
Shelter | Containment Shelter (entrance)
intercom | Intercom Room
pocket | Pocked Dimention
pocket | Pocket Dimention
386 changes: 259 additions & 127 deletions AdminToolbox/AdminToolbox/AdminToolbox.cs

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion AdminToolbox/AdminToolbox/AdminToolbox.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,19 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Commands\IntercomLockCommand.cs" />
<Compile Include="Commands\ATDisableCommand.cs" />
<Compile Include="Commands\KeepSettingsCommand.cs" />
<Compile Include="Commands\BreakDoorsCommand.cs" />
<Compile Include="Commands\InstantKillCommand.cs" />
<Compile Include="Commands\LockdownCommand.cs" />
<Compile Include="Commands\DoorCommand.cs" />
<Compile Include="Commands\ATColorCommand.cs" />
<Compile Include="Commands\JailCommand.cs" />
<Compile Include="Commands\EmptyCommand.cs" />
<Compile Include="Commands\ServerCommand.cs" />
<Compile Include="Commands\RoundLockCommand.cs" />
<Compile Include="Commands\WarpsCommand.cs" />
<Compile Include="Commands\WarpCommand.cs" />
<Compile Include="Commands\PosCommand.cs" />
<Compile Include="Commands\PlayerCommand.cs" />
Expand All @@ -68,7 +73,6 @@
<Compile Include="Commands\HealCommand.cs" />
<Compile Include="Commands\GodModeCommand.cs" />
<Compile Include="MyMiscEvents.cs" />
<Compile Include="PlayerJoinLeaveHandler.cs" />
<Compile Include="Commands\TeleportCommand.cs" />
<Compile Include="Commands\MyTemplateCommand.cs" />
<Compile Include="Commands\PlayerListCommand.cs" />
Expand Down
31 changes: 8 additions & 23 deletions AdminToolbox/AdminToolbox/Commands/BreakDoorsCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ namespace AdminToolbox.Command
{
class BreakDoorsCommand : ICommandHandler
{
private AdminToolbox plugin;
public BreakDoorsCommand(AdminToolbox plugin)
{
this.plugin = plugin;
}

public string GetCommandDescription()
{
return "Toggles that players break doors when interacting with them";
Expand All @@ -39,22 +33,18 @@ public string[] OnCall(ICommandSender sender, string[] args)
int playerNum = 0;
foreach (Player pl in server.GetPlayers())
{
AdminToolbox.playerdict[pl.SteamId][3] = j;
AdminToolbox.playerdict[pl.SteamId].destroyDoor = j;
playerNum++;
}
outPut += "\nSet " + playerNum + " player's BreakDoors to " + j;
return new string[] { "\nSet " + playerNum + " player's BreakDoors to " + j };
}
else
{
//plugin.Info("Not a valid bool!");
return new string[] { "Not a valid bool!" };
}
}
else
{
foreach (Player pl in server.GetPlayers()) { AdminToolbox.playerdict[pl.SteamId][3] = !AdminToolbox.playerdict[pl.SteamId][3]; }
//plugin.Info("Toggled all players godmodes");
foreach (Player pl in server.GetPlayers()) { AdminToolbox.playerdict[pl.SteamId].destroyDoor = !AdminToolbox.playerdict[pl.SteamId].destroyDoor; }
return new string[] { "Toggled all players BreakDoors" };
}
}
Expand All @@ -64,19 +54,14 @@ public string[] OnCall(ICommandSender sender, string[] args)
List<string> myPlayerList = new List<string>();
foreach (Player pl in server.GetPlayers())
{
if (AdminToolbox.playerdict[pl.SteamId][3])
{
if (AdminToolbox.playerdict[pl.SteamId].destroyDoor)
myPlayerList.Add(pl.Name);
//str += " - " +pl.Name + "\n";
}
}
if (myPlayerList.Count > 0)
{
myPlayerList.Sort();
foreach (var item in myPlayerList)
{
str += "\n - " + item;
}
}
else str = "\nNo players with \"BreakDoors\" enabled!";
return new string[] { str };
Expand All @@ -85,14 +70,14 @@ public string[] OnCall(ICommandSender sender, string[] args)
if (myPlayer == null) { return new string[] { "Couldn't find player: " + args[0] }; }
if (args.Length > 1)
{
if (args[1].ToLower() == "on" || args[1].ToLower() == "true") { AdminToolbox.playerdict[myPlayer.SteamId][3] = true; }
else if (args[1].ToLower() == "off" || args[1].ToLower() == "false") { AdminToolbox.playerdict[myPlayer.SteamId][3] = false; }
return new string[] { myPlayer.Name + " BreakDoors: " + AdminToolbox.playerdict[myPlayer.SteamId][3] };
if (args[1].ToLower() == "on" || args[1].ToLower() == "true") { AdminToolbox.playerdict[myPlayer.SteamId].destroyDoor = true; }
else if (args[1].ToLower() == "off" || args[1].ToLower() == "false") { AdminToolbox.playerdict[myPlayer.SteamId].destroyDoor = false; }
return new string[] { myPlayer.Name + " BreakDoors: " + AdminToolbox.playerdict[myPlayer.SteamId].destroyDoor };
}
else
{
AdminToolbox.playerdict[myPlayer.SteamId][3] = !AdminToolbox.playerdict[myPlayer.SteamId][3];
return new string[] { myPlayer.Name + " BreakDoors: " + AdminToolbox.playerdict[myPlayer.SteamId][3] };
AdminToolbox.playerdict[myPlayer.SteamId].destroyDoor = !AdminToolbox.playerdict[myPlayer.SteamId].destroyDoor;
return new string[] { myPlayer.Name + " BreakDoors: " + AdminToolbox.playerdict[myPlayer.SteamId].destroyDoor };
}

}
Expand Down
69 changes: 69 additions & 0 deletions AdminToolbox/AdminToolbox/Commands/EmptyCommand.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
using Smod2.Commands;
using Smod2;
using Smod2.API;
using System;
using System.Linq;

namespace AdminToolbox.Command
{
class EmptyCommand : ICommandHandler
{
public string GetCommandDescription()
{
return "Empties the player's inventory";
}

public string GetUsage()
{
return "E / EMPTY [Player] (ItemType INT / Delete) (Delete)";
}

public string[] OnCall(ICommandSender sender, string[] args)
{
Server server = PluginManager.Manager.Server;
if (args.Length > 0)
{
Player myPlayer = GetPlayerFromString.GetPlayer(args[0], out myPlayer);
if (myPlayer == null) { return new string[] { "Couldn't get player: " + args[0] }; ; }
AdminToolbox.AddToPlayerDict(myPlayer);
byte itemNumber = 0;
string[] deleteAliases = { "delete", "del", "d" };
if (args.Length > 1 && deleteAliases.Contains(args[1].ToLower()))
{
foreach (Smod2.API.Item item in myPlayer.GetInventory())
if (item.ItemType != ItemType.NULL) { item.Remove(); itemNumber++; }
myPlayer.SetAmmo(AmmoType.DROPPED_5, 0);
myPlayer.SetAmmo(AmmoType.DROPPED_7, 0);
myPlayer.SetAmmo(AmmoType.DROPPED_9, 0);
return new string[] { "Deleted " + itemNumber + " items from player " + myPlayer.Name + "'s inventory" };
}
else if (args.Length > 1 && byte.TryParse(args[1], out byte itemInt))
if (args.Length > 2 && deleteAliases.Contains(args[2].ToLower()))
{
foreach (Smod2.API.Item item in myPlayer.GetInventory())
if ((byte)item.ItemType == itemInt) { item.Remove(); itemNumber++; }
return new string[] { "Deleted all \"" + Enum.GetName(typeof(ItemType), itemInt) + "\" items from player " + myPlayer.Name + "'s inventory" };
}
else
{
foreach (Smod2.API.Item item in myPlayer.GetInventory())
if ((byte)item.ItemType == itemInt) { item.Drop(); itemNumber++; }
return new string[] { "Dropped all \"" + Enum.GetName(typeof(ItemType), itemInt) + "\" items from player " + myPlayer.Name + "'s inventory" };
}
else
{
foreach (Smod2.API.Item item in myPlayer.GetInventory())
if (item.ItemType != ItemType.NULL) { item.Drop(); itemNumber++; }
PluginManager.Manager.Server.Map.SpawnItem(ItemType.DROPPED_5, myPlayer.GetPosition(), myPlayer.GetRotation());
PluginManager.Manager.Server.Map.SpawnItem(ItemType.DROPPED_7, myPlayer.GetPosition(), myPlayer.GetRotation());
PluginManager.Manager.Server.Map.SpawnItem(ItemType.DROPPED_9, myPlayer.GetPosition(), myPlayer.GetRotation());
myPlayer.SetAmmo(AmmoType.DROPPED_5, 0);
myPlayer.SetAmmo(AmmoType.DROPPED_5, 0);
myPlayer.SetAmmo(AmmoType.DROPPED_5, 0);
return new string[] { "Dropped " + itemNumber + " items from player " + myPlayer.Name + "'s inventory" };
}
}
return new string[] { GetUsage() };
}
}
}
52 changes: 19 additions & 33 deletions AdminToolbox/AdminToolbox/Commands/GodModeCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,16 @@ namespace AdminToolbox.Command
{
class GodModeCommand : ICommandHandler
{
private AdminToolbox plugin;
public bool noDmg = false;

public GodModeCommand(AdminToolbox plugin)
{
this.plugin = plugin;
}

public string GetCommandDescription()
{
return "Switch on/off godmode for player";
}

public string GetUsage()
{
return "GOD [PLAYER] (BOOL)";
return "(ATGOD / ATGODMODE / AT-GOD) [PLAYER] (BOOL)";
}

public string[] OnCall(ICommandSender sender, string[] args)
Expand All @@ -43,35 +37,32 @@ public string[] OnCall(ICommandSender sender, string[] args)
int playerNum = 0;
foreach (Player pl in server.GetPlayers())
{
AdminToolbox.playerdict[pl.SteamId][1] = j;
if(changedState) AdminToolbox.playerdict[pl.SteamId][2] = j;
AdminToolbox.playerdict[pl.SteamId].godMode = j;
if(changedState) AdminToolbox.playerdict[pl.SteamId].dmgOff = j;
playerNum++;
}
outPut += "\nSet " + playerNum + " player's Godmode to " + j;
//plugin.Info("Set " + playerNum + " player's Godmode to " + j);
if (changedState) { /*plugin.Info("\nNoDmg for theese " + playerNum + " players set to: " + j);*/ return new string[] { "\nSet " + playerNum + " player's Godmode to " + j, "\nNoDmg for theese " + playerNum + " players set to: " + j }; }
return new string[] { "\nSet " + playerNum + " player's Godmode to " + j };
outPut += "\nSet " + playerNum + " player's AT-Godmode to " + j;
if (changedState) return new string[] { "\n" + "Set " + playerNum + " player's AT-Godmode to " + j, "\n" + "NoDmg for theese " + playerNum + " players set to: " + j };
return new string[] { "\n" + "Set " + playerNum + " player's AT-Godmode to " + j };
}
else
{
//plugin.Info("Not a valid bool!");
return new string[] { "Not a valid bool!" };
}
}
else
{
foreach (Player pl in server.GetPlayers()) { AdminToolbox.playerdict[pl.SteamId][1] = !AdminToolbox.playerdict[pl.SteamId][1]; }
//plugin.Info("Toggled all players godmodes");
return new string[] { "Toggled all players godmodes" };
foreach (Player pl in server.GetPlayers()) { AdminToolbox.playerdict[pl.SteamId].godMode = !AdminToolbox.playerdict[pl.SteamId].godMode; }
return new string[] { "Toggled all players AT-Godmodes" };
}
}
else if(args[0].ToLower() == "list" || args[0].ToLower() == "get")
{
string str = "\nPlayers with Godmode enabled: \n";
string str = "\n" + "Players with AT-Godmode enabled: " + "\n";
List<string> myPlayerList = new List<string>();
foreach(Player pl in server.GetPlayers())
{
if (AdminToolbox.playerdict[pl.SteamId][1])
if (AdminToolbox.playerdict[pl.SteamId].godMode)
{
myPlayerList.Add(pl.Name);
//str += " - " +pl.Name + "\n";
Expand All @@ -85,40 +76,35 @@ public string[] OnCall(ICommandSender sender, string[] args)
str += "\n - " + item;
}
}
else str = "\nNo players with \"Godmode\" enabled!";
//plugin.Info(str);
else str = "\n" + "No players with \"AT-Godmode\" enabled!";
return new string[] { str };
}
Player myPlayer = GetPlayerFromString.GetPlayer(args[0], out myPlayer);
if (myPlayer == null) { /*plugin.Info("Couldn't find player: " + args[0]);*/ return new string[] { "Couldn't find player: " + args[0] }; }
if (myPlayer == null) return new string[] { "Couldn't find player: " + args[0] };
if (args.Length > 1)
{
bool changedValue=false;
if (args.Length > 2) { if (args[2].ToLower() == "nodmg") { changedValue = true; } }
if (args[1].ToLower() == "on" || args[1].ToLower() == "true") { AdminToolbox.playerdict[myPlayer.SteamId][1] = true; }
else if (args[1].ToLower() == "off" || args[1].ToLower() == "false") { AdminToolbox.playerdict[myPlayer.SteamId][1] = false; }
//plugin.Info(myPlayer.Name + " godmode: " + AdminToolbox.playerdict[myPlayer.SteamId][1]);
if (args[1].ToLower() == "on" || args[1].ToLower() == "true") { AdminToolbox.playerdict[myPlayer.SteamId].godMode = true; }
else if (args[1].ToLower() == "off" || args[1].ToLower() == "false") { AdminToolbox.playerdict[myPlayer.SteamId].godMode = false; }
if (changedValue)
{
AdminToolbox.playerdict[myPlayer.SteamId][2] = AdminToolbox.playerdict[myPlayer.SteamId][1];
//plugin.Info(myPlayer.Name + " No Dmg: " + AdminToolbox.playerdict[myPlayer.SteamId][2]);
return new string[] { myPlayer.Name + " godmode: " + AdminToolbox.playerdict[myPlayer.SteamId][1], myPlayer.Name + " No Dmg: " + AdminToolbox.playerdict[myPlayer.SteamId][2] };
AdminToolbox.playerdict[myPlayer.SteamId].dmgOff = AdminToolbox.playerdict[myPlayer.SteamId].godMode;
return new string[] { myPlayer.Name + " AT-Godmode: " + AdminToolbox.playerdict[myPlayer.SteamId].godMode, myPlayer.Name + " No Dmg: " + AdminToolbox.playerdict[myPlayer.SteamId].dmgOff };
}
else
return new string[] { myPlayer.Name + " godmode: " + AdminToolbox.playerdict[myPlayer.SteamId][1] };
return new string[] { myPlayer.Name + " AT-Godmode: " + AdminToolbox.playerdict[myPlayer.SteamId].godMode };
}
else
{
AdminToolbox.playerdict[myPlayer.SteamId][1] = !AdminToolbox.playerdict[myPlayer.SteamId][1];
//plugin.Info(myPlayer.Name + " Godmode: " + AdminToolbox.playerdict[myPlayer.SteamId][1]);
return new string[] { myPlayer.Name + " Godmode: " + AdminToolbox.playerdict[myPlayer.SteamId][1] };
AdminToolbox.playerdict[myPlayer.SteamId].godMode = !AdminToolbox.playerdict[myPlayer.SteamId].godMode;
return new string[] { myPlayer.Name + " AT-Godmode: " + AdminToolbox.playerdict[myPlayer.SteamId].godMode };
}

}
else
{
return new string[] { GetUsage() };
//plugin.Info(GetUsage());
}
}
}
Expand Down
12 changes: 2 additions & 10 deletions AdminToolbox/AdminToolbox/Commands/HealCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,14 @@ namespace AdminToolbox.Command
{
class HealCommand : ICommandHandler
{
private AdminToolbox plugin;

public HealCommand(AdminToolbox plugin)
{
this.plugin = plugin;
}

public string GetCommandDescription()
{
return "Heals player. Use int for spesific amount (optional)";
}

public string GetUsage()
{
return "HEAL [PLAYER] (AMOUNT)";
return "(ATHEAL / AT-HEAL) [PLAYER] (AMOUNT)";
}

public string[] OnCall(ICommandSender sender, string[] args)
Expand Down Expand Up @@ -55,12 +48,11 @@ public string[] OnCall(ICommandSender sender, string[] args)
else
{
foreach (Player pl in server.GetPlayers()) { pl.SetHealth(pl.TeamRole.MaxHP); }
plugin.Info("Set all players to their default max HP");
return new string[] { "Set all players to their default max HP" };
}
}
Player myPlayer = GetPlayerFromString.GetPlayer(args[0], out myPlayer);
if (myPlayer == null) { /*plugin.Info("Couldn't find player: " + args[0]);*/ return new string[] { "Couldn't find player: " + args[0] }; }
if (myPlayer == null) return new string[] { "Couldn't find player: " + args[0] };
if (args.Length > 1)
{
if (Int32.TryParse(args[1], out int j))
Expand Down
Loading

0 comments on commit 72e90b9

Please sign in to comment.