hacking p1 e2

6 files changed, 38 insertions, 14 deletions

diff --git a/ShiftOS.Frontend/Properties/Resources.Designer.cs b/ShiftOS.Frontend/Properties/Resources.Designer.cs
index e21b46e..1d451a1 100644
--- a/ShiftOS.Frontend/Properties/Resources.Designer.cs
+++ b/ShiftOS.Frontend/Properties/Resources.Designer.cs
@@ -71,7 +71,19 @@ namespace ShiftOS.Frontend.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to .
+        ///   Looks up a localized string similar to /* ShiftOS Exploits data file
+        /// *
+        /// * This file contains information about all exploits in the game&apos;s campaign.
+        /// *
+        /// */
+        ///
+        ///[
+        ///	{
+        ///		FriendlyName: &quot;FTP Exploit&quot;,
+        ///		ExploitName: &quot;ftpwn&quot;
+        ///		EffectiveAgainstPort: &quot;FileServer&quot;,
+        ///	}
+        ///].
         /// </summary>
         public static string Exploits {
             get {
@@ -138,7 +150,7 @@ namespace ShiftOS.Frontend.Properties {
         ///
         ///[
         ///	{
-        ///		FriendlyName: &quot;FTP Exploit&quot;,
+        ///		FriendlyName: &quot;FTP Payload&quot;,
         ///		PayloadName: &quot;ftpull&quot;
         ///		EffectiveAgainstFirewall: 1,
         ///		EffectiveAgainstPort: &quot;FileServer&quot;,
diff --git a/ShiftOS.Frontend/Properties/Resources.resx b/ShiftOS.Frontend/Properties/Resources.resx
index c0a2cff..80ed513 100644
--- a/ShiftOS.Frontend/Properties/Resources.resx
+++ b/ShiftOS.Frontend/Properties/Resources.resx
@@ -142,4 +142,10 @@
   <data name="LootInfo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\LootInfo.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="Exploits" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\exploits.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="Payloads" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\payloads.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShiftOS.Frontend/Resources/Payloads.txt b/ShiftOS.Frontend/Resources/Payloads.txt
index 926a23f..1c7ff2d 100644
--- a/ShiftOS.Frontend/Resources/Payloads.txt
+++ b/ShiftOS.Frontend/Resources/Payloads.txt
@@ -6,7 +6,7 @@
 
 [
 	{
-		FriendlyName: "FTP Exploit",
+		FriendlyName: "FTP Payload",
 		PayloadName: "ftpull"
 		EffectiveAgainstFirewall: 1,
 		EffectiveAgainstPort: "FileServer",
diff --git a/ShiftOS.Frontend/ShiftOS.Frontend.csproj b/ShiftOS.Frontend/ShiftOS.Frontend.csproj
index 5d05320..5f3d18a 100644
--- a/ShiftOS.Frontend/ShiftOS.Frontend.csproj
+++ b/ShiftOS.Frontend/ShiftOS.Frontend.csproj
@@ -64,8 +64,8 @@
     <Compile Include="GUI\ProgressBar.cs" />
     <Compile Include="GUI\TextControl.cs" />
     <Compile Include="GUI\TextInput.cs" />
-    <Compile Include="HackableProvider.cs" />
-    <Compile Include="HackerTestCommands.cs" />
+    <Compile Include="Hacking\HackableProvider.cs" />
+    <Compile Include="Hacking\HackerTestCommands.cs" />
     <Compile Include="Infobox.cs" />
     <Compile Include="MainMenu.cs" />
     <Compile Include="MonoGameLanguageProvider.cs" />
@@ -101,7 +101,7 @@
     <EmbeddedResource Include="Icon.ico" />
     <EmbeddedResource Include="Icon.bmp" />
     <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
@@ -189,6 +189,10 @@
   <ItemGroup>
     <None Include="Resources\LootInfo.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\Payloads.txt" />
+    <Content Include="Resources\Exploits.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/ShiftOS.Objects/ShiftOS.Objects.csproj b/ShiftOS.Objects/ShiftOS.Objects.csproj
index 66027a8..6fa7f79 100644
--- a/ShiftOS.Objects/ShiftOS.Objects.csproj
+++ b/ShiftOS.Objects/ShiftOS.Objects.csproj
@@ -47,7 +47,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="EngineShiftnetSubscription.cs" />
-    <Compile Include="Hackable.cs" />
+    <Compile Include="Hacking\Payload.cs" />
+    <Compile Include="Hacking\Exploit.cs" />
+    <Compile Include="Hacking\Hackable.cs" />
     <Compile Include="MudAttributes.cs" />
     <Compile Include="Objects.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
index 27d54cc..6d2e5bd 100644
--- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj
+++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
@@ -132,12 +132,12 @@
       <DependentUpon>CrashHandler.cs</DependentUpon>
     </Compile>
     <Compile Include="Desktop.cs" />
-    <Compile Include="FileSkimmerBackend.cs" />
+    <Compile Include="GUI\FileSkimmerBackend.cs" />
     <Compile Include="Hacking.cs" />
     <Compile Include="IFileHandler.cs" />
     <Compile Include="Infobox.cs" />
-    <Compile Include="IShiftOSWindow.cs" />
-    <Compile Include="IStatusIcon.cs" />
+    <Compile Include="GUI\IShiftOSWindow.cs" />
+    <Compile Include="GUI\IStatusIcon.cs" />
     <Compile Include="IVirus.cs" />
     <Compile Include="KernelWatchdog.cs" />
     <Compile Include="Localization.cs" />
@@ -145,7 +145,7 @@
     <Compile Include="Lunix.cs" />
     <Compile Include="MissionAttribute.cs" />
     <Compile Include="NotificationDaemon.cs" />
-    <Compile Include="OutOfBoxExperience.cs" />
+    <Compile Include="GUI\OutOfBoxExperience.cs" />
     <Compile Include="Paths.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -162,14 +162,14 @@
     <Compile Include="ServerManager.cs" />
     <Compile Include="ShiftnetSite.cs" />
     <Compile Include="Shiftorium.cs" />
-    <Compile Include="Skinning.cs" />
+    <Compile Include="GUI\Skinning.cs" />
     <Compile Include="Story.cs" />
     <Compile Include="TerminalBackend.cs" />
     <Compile Include="TerminalTextWriter.cs" />
-    <Compile Include="TutorialManager.cs" />
+    <Compile Include="GUI\TutorialManager.cs" />
     <Compile Include="UserManagementCommands.cs" />
     <Compile Include="VirusManager.cs" />
-    <Compile Include="WinOpenAttribute.cs" />
+    <Compile Include="GUI\WinOpenAttribute.cs" />
     <EmbeddedResource Include="Infobox.resx">
       <DependentUpon>Infobox.cs</DependentUpon>
     </EmbeddedResource>