Changeset 128

Timestamp:

Aug 26, 2014, 1:08:25 AM (10 years ago)

Author:

alloc

Message:

Fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (2 diffs)
• 7dtd-server-fixes/src/AdminToolsStuff.cs (modified) (1 diff)
• 7dtd-server-fixes/src/AssemblyInfo.cs (modified) (1 diff)
• 7dtd-server-fixes/src/CommandExtensions.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/CommonMappingFunctions.cs (modified) (1 diff)
• 7dtd-server-fixes/src/PlayerDataStuff.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/TelnetCommands/CreativeMenu.cs (added)
• 7dtd-server-fixes/src/TelnetCommands/Give.cs (added)
• 7dtd-server-fixes/src/TelnetCommands/ListItems.cs (added)
• assembly-patcher/Main.cs (modified) (2 diffs)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/Assembly-CSharp.patched.dll (modified) ( previous)
• server-fixes.userprefs (modified) (1 diff)

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

@@ -37 +37 @@
     </Reference>
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\7dtd-binaries\Assembly-CSharp.deobf.dll</HintPath>
+      <HintPath>..\7dtd-binaries\Assembly-CSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -62 +62 @@
     <Compile Include="src\TelnetCommands\RemoveLandProtection.cs" />
     <Compile Include="src\TelnetCommands\Version.cs" />
+    <Compile Include="src\TelnetCommands\RenderMap.cs" />
+    <Compile Include="src\TelnetCommands\CreativeMenu.cs" />
+    <Compile Include="src\TelnetCommands\Give.cs" />
+    <Compile Include="src\TelnetCommands\ListItems.cs" />
+    <Compile Include="src\MapRendering.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -78 +78 @@
                         return cc.Names ();
                 } else {
-                        return new string[0];
+                        return new string[]{cmd};
                 }
         }

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

@@ -18 +18 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.090.*")]
+[assembly: AssemblyVersion("0.091.*")]
 
 // The following attributes are used to specify the signing key for the assembly, 

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

@@ -7 +7 @@
         {
                 try {
+                        manager.m_GUIConsole.AddCommand (new CreativeMenu (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new GetGamePrefs (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new GetTime (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new Give (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new Kill (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new ListItems (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new ListLandProtection (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new ListPlayersExtended (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new RemoveLandProtection (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new RenderMap (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new Reply (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new SayToPlayer (manager.m_GUIConsole));
@@ -21 +25 @@
                         Log.Out ("Error registering custom commands: " + e);
                 }
-                /*
-                try {
-                        List<ConsoleCommand> commands = manager.m_GUIConsole.commands;
-                        foreach (ConsoleCommand c in commands) {
-                                string name = string.Empty;
-                                foreach (string cname in c.Names()) {
-                                        if (cname.Length > 0) {
-                                                if (name.Length > 0)
-                                                        name += ", ";
-                                                name += cname;
-                                        }
-                                }
-                                name += " => " + c.Description();
-                                Log.Out (name);
-                        }
-                } catch (Exception e) {
-                        Log.Out ("Error listing commands: " + e);
-                }
-                */
         }
 }

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

@@ -41 +41 @@
         {
                 return SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (GetPlayerName (_ci));
+        }
+
+        public static string GetSteamID (string _playerName)
+        {
+                return SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (_playerName);
         }
 

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

@@ -59 +59 @@
                         Log.Out ("Error in GM_SavePlayerData: " + e);
                 }
-                /*
-                Log.Out ("Inventory of player:");
-                for (int i = 0; i < _playerDataFile.inventory.Length; i++) {
-                        InventoryField item = _playerDataFile.inventory [i];
-                        printItem (item, i);
-                }
 
-                Log.Out ("Bag of player:");
-                for (int i = 0; i < _playerDataFile.bag.Length; i++) {
-                        InventoryField item = _playerDataFile.bag [i];
-                        printItem (item, i);
-                }*/
+//              Log.Out ("Inventory of player:");
+//              for (int i = 0; i < _playerDataFile.inventory.Length; i++) {
+//                      InventoryField item = _playerDataFile.inventory [i];
+//                      printItem (item, i);
+//              }
+//
+//              Log.Out ("Bag of player:");
+//              for (int i = 0; i < _playerDataFile.bag.Length; i++) {
+//                      InventoryField item = _playerDataFile.bag [i];
+//                      printItem (item, i);
+//              }
         }
 
@@ -93 +93 @@
                                 name = iBlock.GetItemName (item.itemValue);
                         }
-                        Log.Out (string.Format ("Slot {0:00}: {1:00} * {2}", slot, item.count, name));
+                        Log.Out (string.Format ("Slot {0:00}: {1:00} * {2}, blockinst={3}, meta={4}, type={5}, usetimes={6}",
+                                                slot, item.count, name, item.itemValue.blockinst, item.itemValue.meta, item.itemValue.type, item.itemValue.usetimes));
                 }
         }

binary-improvements/assembly-patcher/Main.cs

@@ -20 +20 @@
                         markTypePatched (module, type);
 
+                        mappingPatch (module);
                         consoleOutputPatch (module);
                         telnetPatch (module);
@@ -29 +30 @@
                         Console.WriteLine ("Done");
 
+                }
+
+                private static void mappingPatch (ModuleDefinition module)
+                {
+                        TypeDefinition type = module.GetType ("Chunk");
+                        addHook (type, "CalcMapColors", true, 0, true, typeof(MapRendering).GetMethod ("RenderSingleChunk"));
                 }
 

binary-improvements/server-fixes.userprefs

@@ -7 +7 @@
       <File FileName="7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs" Line="45" Column="17" />
       <File FileName="7dtd-server-fixes/src/AllocsNetTelnetServer.cs" Line="1" Column="1" />
-      <File FileName="7dtd-server-fixes/src/TelnetCommands/RemoveLandProtection.cs" Line="52" Column="44" />
+      <File FileName="7dtd-server-fixes/src/TelnetCommands/RemoveLandProtection.cs" Line="41" Column="47" />
     </Files>
   </MonoDevelop.Ide.Workbench>