Changeset 197

Timestamp:

Sep 21, 2014, 7:20:16 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (1 diff)
• 7dtd-server-fixes/src/CustomCommands/Give.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/CustomCommands/ListItems.cs (modified) (1 diff)
• 7dtd-server-fixes/src/ItemList.cs (added)
• 7dtd-server-fixes/src/PersistentData/Inventory.cs (modified) (3 diffs)
• 7dtd-server-fixes/src/StateManager.cs (modified) (1 diff)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/7dtd-server-fixes_version.txt (modified) (1 diff)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -124 +124 @@
     <Compile Include="src\JSON\MalformedJSONException.cs" />
     <Compile Include="src\CustomCommands\Unban.cs" />
+    <Compile Include="src\ItemList.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/7dtd-server-fixes/src/CustomCommands/Give.cs

@@ -36 +36 @@
                                 }
 
-                                ItemBase item = null;
-
-                                foreach (ItemBase ib in ItemBase.list) {
-                                        if (ib.name != null && ib.name.ToLower ().Equals (_params [1].ToLower ())) {
-                                                item = ib;
-                                                break;
-                                        }
-                                }
-
-                                if (item == null) {
+                                Nullable<ItemValue> iv = ItemList.Instance.GetItemValue(_params[1]);
+                                if (iv == null) {
                                         m_Console.SendResult ("Item not found.");
                                         return;
@@ -57 +49 @@
 
                                 EntityPlayer p = CommonMappingFunctions.GetEntityPlayer (ci);
-                                CommonMappingFunctions.GetGameManager ().DropEntityItemServer (item.itemID, n, p.GetPosition (), Vector3.zero, Vector3.zero, 50, CommonMappingFunctions.GetEntityID (ci));
+                                CommonMappingFunctions.GetGameManager ().DropEntityItemServer ((int)iv.Value.rawData, n, p.GetPosition (), Vector3.zero, Vector3.zero, 50, CommonMappingFunctions.GetEntityID (ci));
 
                                 m_Console.SendResult ("Dropped item");

binary-improvements/7dtd-server-fixes/src/CustomCommands/ListItems.cs

@@ -29 +29 @@
 
                                 int n = 0;
-                                foreach (ItemBase ib in ItemBase.list) {
-                                        if (ib.name != null && ib.name.ToLower ().Contains (_params [0].ToLower ())) {
-                                                m_Console.SendResult ("    " + ib.name);
+                                foreach (string s in ItemList.Instance.ItemNames) {
+                                        if (s.ToLower ().Contains (_params [0].ToLower ())) {
+                                                m_Console.SendResult ("    " + s);
                                                 n++;
                                         }

binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs

@@ -21 +21 @@
                 {
                         //Log.Out ("Updating player inventory - player id: " + pdf.id);
-                        ProcessInv (bag, pdf.bag);
-                        ProcessInv (belt, pdf.inventory);
+                        ProcessInv (bag, pdf.bag, pdf.id);
+                        ProcessInv (belt, pdf.inventory, pdf.id);
                 }
 
-                private void ProcessInv (List<InvItem> target, InventoryField[] sourceFields)
+                private void ProcessInv (List<InvItem> target, InventoryField[] sourceFields, int id)
                 {
                         lock (target) {
@@ -32 +32 @@
                                         if (sourceFields [i].count > 0) {
                                                 int count = sourceFields [i].count;
+                                                int maxAllowed = ItemBase.list [sourceFields [i].itemValue.type].StackNumber;
                                                 string name = getInvFieldName (sourceFields [i]);
 
+                                                if (count > maxAllowed)
+                                                        Log.Out ("Player with ID " + id + " has stack for \"" + name + "\" greater than allowed (" + count + " > " + maxAllowed + ")");
                                                 target.Add (new InvItem (name, count));
                                         } else {
@@ -45 +48 @@
                 {
                         ItemBase iBase = ItemBase.list [item.itemValue.type];
-                        return iBase.GetItemName(item.itemValue);
+                        return iBase.GetItemName (item.itemValue);
                 }
 

binary-improvements/7dtd-server-fixes/src/StateManager.cs

@@ -12 +12 @@
                         try {
                                 Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
-                                new Web();
-                                new Telnet();
+                                new Web ();
+                                new Telnet ();
 
+                                ItemList.Instance.Init ();
                                 CommandExtensions.InitCommandExtensions (manager);
 

binary-improvements/bin/Release/7dtd-server-fixes_version.txt

@@ -1 @@
-Version:       0.93.5375.21616
+Version:       0.93.5377.34787