Changeset 238 for binary-improvements/AllocsCommands

Timestamp:

Jul 3, 2015, 4:16:11 PM (9 years ago)

Author:

alloc

Message:

Server fixes for A12

Location:

binary-improvements/AllocsCommands

Files:

• AllocsCommands.csproj (modified) (1 diff)
• Chat.cs (modified) (1 diff)
• Commands/ExportItemIcons.cs (added)
• Commands/Give.cs (modified) (3 diffs)
• Commands/ListKnownPlayers.cs (modified) (1 diff)
• Commands/ListLandProtection.cs (modified) (3 diffs)
• Commands/RemoveLandProtection.cs (modified) (2 diffs)
• Commands/Reply.cs (modified) (1 diff)
• Commands/SayToPlayer.cs (modified) (1 diff)
• Commands/ShowInventory.cs (modified) (1 diff)
• Commands/TeleportPlayer.cs (modified) (2 diffs)
• ModInfo.xml (modified) (1 diff)

binary-improvements/AllocsCommands/AllocsCommands.csproj

@@ -52 +52 @@
     <Compile Include="Chat.cs" />
     <Compile Include="Commands\ListItems.cs" />
-    <Compile Include="Commands\GenerateItemIcons.cs" />
+    <Compile Include="Commands\ExportItemIcons.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/AllocsCommands/Chat.cs

@@ -13 +13 @@
                                 senderName = "Server";
                         }
-                        _receiver.SendPackage (new NetPackage_GameInfoMessage (_message, senderName + " (PM)"));
+                        _receiver.SendPackage (new NetPackageGameMessage (_message, senderName + " (PM)"));
                         string receiverName = _receiver.playerName;
                         SdtdConsole.Instance.Output ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + senderName + "\"");

binary-improvements/AllocsCommands/Commands/Give.cs

@@ -12 +12 @@
                 }
 
+                public override string GetHelp () {
+                        return "Give an item to a player by dropping it in front of that player\n" +
+                                   "Usage:\n" +
+                                   "   give <name / entity id> <item name> <amount>\n" +
+                                   "Either pass the full name of a player or his entity id (given by e.g. \"lpi\").\n" +
+                                   "Item name has to be the exact name of an item as listed by \"listitems\".\n" +
+                                   "Amount is the number of instances of this item to drop (as a single stack).";
+                }
+
                 public override string[] GetCommands ()
                 {
@@ -21 +30 @@
                         try {
                                 if (_params.Count != 3) {
-                                        SdtdConsole.Instance.Output ("Usage: give <playername|entityid> <itemname> <amount>");
+                                        SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3, found " + _params.Count + ".");
                                         return;
                                 }
@@ -46 +55 @@
                                 EntityPlayer p = GameManager.Instance.World.Players.dict [ci.entityId];
 
-                                InventoryField invField = new InventoryField (iv, n);
+                                ItemStack invField = new ItemStack (iv, n);
 
                                 GameManager.Instance.ItemDropServer (invField, p.GetPosition (), Vector3.zero, -1, 50);

binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs

@@ -9 +9 @@
                 public override string GetDescription ()
                 {
-                        return "lists all players that were ever online (optionally filtered)";
+                        return "lists all players that were ever online";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "  1. listknownplayers\n" +
+                                   "  2. listknownplayers -online\n" +
+                                   "  3. listknownplayers -notbanned\n" +
+                                   "  4. listknownplayers <player name>\n" +
+                                   "1. Lists all players that have ever been online\n" +
+                                   "2. Lists only the players that are currently online\n" +
+                                   "3. Lists only the players that are not banned\n" +
+                                        "4. Lists all players whose name contains the given string";
                 }
 

binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

@@ -9 +9 @@
                 {
                         return "lists all land protection blocks and owners";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "  1. listlandprotection summary\n" +
+                                   "  2. listlandprotection <steam id>\n" +
+                                   "  3. listlandprotection <player name / entity id>\n" +
+                                   "  4. listlandprotection nearby\n" +
+                                   "  5. listlandprotection nearby <radius>\n" +
+                                   "1. Lists only players that own claimstones, the number they own and the protection status\n" +
+                                   "2. Lists only the claims of the player given by his SteamID including the individual claim positions\n" +
+                                   "3. Same as 2 but player given by his player name or entity id (as given by e.g. \"lpi\")\n" +
+                                   "4. Lists claims in a square with edge length of 64 around the executing player\n" +
+                                   "5. Same as 4 but square edge length can be specified";
                 }
 
@@ -72 +86 @@
                                 }
 
-                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.positionToLPBlockOwner;
+                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.m_lpBlockMap;
                                 if (d != null) {
                                         Dictionary<PersistentPlayerData, List<Vector3i>> owners = new Dictionary<PersistentPlayerData, List<Vector3i>> ();
@@ -93 +107 @@
                                                         name += " (" + kvp.Key.PlayerId + ")";
 
-                                                        SdtdConsole.Instance.Output (String.Format ("Player \"{0}\" owns {3} keystones (protected: {1}, current hardness multiplier: {2})", name, w.LandClaimIsActive (kvp.Key), w.LandClaimPower (kvp.Key), kvp.Value.Count));
+                                                        SdtdConsole.Instance.Output (String.Format ("Player \"{0}\" owns {3} keystones (protected: {1}, current hardness multiplier: {2})", name, w.IsLandProtectionValidForPlayer (kvp.Key), w.GetLandProtectionHardnessModifierForPlayer (kvp.Key), kvp.Value.Count));
                                                         if (!summaryOnly) {
                                                                 foreach (Vector3i v in kvp.Value) {

binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs

@@ -9 +9 @@
                 {
                         return "removes the association of a land protection block to the owner";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:" +
+                                   "  1. removelandprotection <steamid>\n" +
+                                   "  2. removelandprotection <x> <y> <z>\n" +
+                                   "1. Remove all land claims owned by the user with the given SteamID\n" +
+                                   "2. Remove only the claim block on the exactly given block position";
                 }
 
@@ -65 +73 @@
                                 PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList ();
 
-                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.positionToLPBlockOwner;
+                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.m_lpBlockMap;
                                 if (d == null || !d.ContainsKey (v)) {
                                         SdtdConsole.Instance.Output ("No land protection block at the given position or not a valid position. Use \"listlandprotection\" to get a list of keystones.");

binary-improvements/AllocsCommands/Commands/Reply.cs

@@ -9 +9 @@
                 {
                         return "send a message to  the player who last sent you a PM";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "   reply <message>\n" +
+                                   "Send the given message to the user you last received a PM from.";
                 }
 

binary-improvements/AllocsCommands/Commands/SayToPlayer.cs

@@ -9 +9 @@
                 {
                         return "send a message to a single player";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "   pm <player name / steam id / entity id> <message>\n" +
+                                   "Send a PM to the player given by the player name or entity id (as given by e.g. \"lpi\").";
                 }
 

binary-improvements/AllocsCommands/Commands/ShowInventory.cs

@@ -9 +9 @@
                 public override string GetDescription ()
                 {
-                        return "list inventory of a given player (steam id, entity id or name)";
+                        return "list inventory of a given player";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "   showinventory <steam id / player name / entity id>\n" +
+                                   "Show the inventory of the player given by his SteamID, player name or\n" +
+                                   "entity id (as given by e.g. \"lpi\")." +
+                                   "Note: This only shows the player's inventory after it was first sent to\n" +
+                                   "the server which happens at least every 30 seconds.";
                 }
 

binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs

@@ -10 +10 @@
                 {
                         return "teleport a player to a given location";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "  1. teleportplayer <steam id / player name / entity id> <x> <y> <z>\n" +
+                                   "  2. teleportplayer <steam id / player name / entity id> <target steam id / player name / entity id>\n" +
+                                   "1. Teleports the player given by his SteamID, player name or entity id (as given by e.g. \"lpi\")\n" +
+                                   "   to the specified location\n" +
+                                        "2. As 1, but destination given by another player which has to be online";
                 }
 
@@ -61 +70 @@
                                         }
 
-                                        NetPackage_EntityTeleport pkg = new NetPackage_EntityTeleport (ep1);
+                                        NetPackageEntityTeleport pkg = new NetPackageEntityTeleport (ep1);
 
                                         ci1.SendPackage (pkg);

binary-improvements/AllocsCommands/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Additional commands for server operation" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="2" />
+                <Version value="4" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>