diff options
| author | william341 <[email protected]> | 2017-07-28 19:34:26 -0700 |
|---|---|---|
| committer | william341 <[email protected]> | 2017-07-28 19:34:26 -0700 |
| commit | 669bd3c0901929339cfc14bce0256659499151ae (patch) | |
| tree | 85114d8e970ceac06d076803b6779eda3ad1a360 | |
| parent | a9779111b59f259d834b431a53b11de868e7b6a3 (diff) | |
| download | shiftos_thereturn-669bd3c0901929339cfc14bce0256659499151ae.tar.gz shiftos_thereturn-669bd3c0901929339cfc14bce0256659499151ae.tar.bz2 shiftos_thereturn-669bd3c0901929339cfc14bce0256659499151ae.zip | |
memes
| -rw-r--r-- | ShiftOS.Frontend/Properties/Resources.Designer.cs | 41 | ||||
| -rw-r--r-- | ShiftOS.Frontend/Properties/Resources.resx | 3 | ||||
| -rw-r--r-- | ShiftOS.Objects/Hacking/Hackable.cs | 11 | ||||
| -rw-r--r-- | ShiftOS.Objects/ShiftOS.Objects.csproj | 1 |
4 files changed, 37 insertions, 19 deletions
diff --git a/ShiftOS.Frontend/Properties/Resources.Designer.cs b/ShiftOS.Frontend/Properties/Resources.Designer.cs index 0815696..1e6a8f2 100644 --- a/ShiftOS.Frontend/Properties/Resources.Designer.cs +++ b/ShiftOS.Frontend/Properties/Resources.Designer.cs @@ -110,9 +110,26 @@ namespace ShiftOS.Frontend.Properties { } /// <summary> - /// Looks up a localized string similar to //Loot information table + /// Looks up a localized string similar to /* ShiftOS Loot data file + /// * + /// * This file contains information about all loot in the game's campaign. + /// * + /// */ /// - ///[]. + ///[ + /// { + /// FriendlyName: "Force Heartbeat", + /// LootName: "sploitset_keepalive", + /// Rarity: 1, + /// PointTo: "sploitset_keepalive", + /// }, + /// { + /// FriendlyName: "SSHardline", + /// LootName: "sploitset_sshardline", + /// Rarity: 1, + /// PointTo: "sploitset_sshardline", + /// } + ///]. /// </summary> public static string LootInfo { get { @@ -132,14 +149,15 @@ namespace ShiftOS.Frontend.Properties { /// FriendlyName: "FTP Payload", /// PayloadName: "ftpull", /// EffectiveAgainstFirewall: 1, - /// EffectiveAgainst: "FileServer", + /// EffectiveAgainst: "FileServer" /// }, /// { - /// FriendlyName: "Ping Spam", + /// FriendlyName: "Force Heartbeat", /// PayloadName: "keepalive", /// EffectiveAgainstFirewall: 1, /// EffectiveAgainst: "SSHServer", /// Function: 1, + /// Dependencies: "sploitset_keepalive" /// } ///]. /// </summary> @@ -187,7 +205,20 @@ namespace ShiftOS.Frontend.Properties { } /// <summary> - /// Looks up a localized string similar to []. + /// Looks up a localized string similar to [ + /// } + /// Name: "sploitset_keepalive", + /// Cost: 1000000000, + /// Description: "lolyouarentsupposedtobeabletobuythis", + /// Dependencies: "thisupgradeshouldneverexistever;sploitset_sshardline", + /// }, + /// } + /// Name: "sploitset_sshardline", + /// Cost: 1000000000, + /// Description: "lolyouarentsupposedtobeabletobuythis", + /// Dependencies: "thisupgradeshouldneverexistever", + /// } + ///]. /// </summary> public static string Shiftorium { get { diff --git a/ShiftOS.Frontend/Properties/Resources.resx b/ShiftOS.Frontend/Properties/Resources.resx index 778e25f..c4acd46 100644 --- a/ShiftOS.Frontend/Properties/Resources.resx +++ b/ShiftOS.Frontend/Properties/Resources.resx @@ -142,9 +142,6 @@ <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> diff --git a/ShiftOS.Objects/Hacking/Hackable.cs b/ShiftOS.Objects/Hacking/Hackable.cs index 4596d2d..d95cf5a 100644 --- a/ShiftOS.Objects/Hacking/Hackable.cs +++ b/ShiftOS.Objects/Hacking/Hackable.cs @@ -68,15 +68,4 @@ namespace ShiftOS.Objects public int Rarity { get; set; } } - public class Loot - { - public Loot(LootInfo info, byte[] data) - { - Data = data; - Info = info; - } - - public LootInfo Info { get; private set; } - public byte[] Data { get; private set; } - } } diff --git a/ShiftOS.Objects/ShiftOS.Objects.csproj b/ShiftOS.Objects/ShiftOS.Objects.csproj index 27b950c..65324fb 100644 --- a/ShiftOS.Objects/ShiftOS.Objects.csproj +++ b/ShiftOS.Objects/ShiftOS.Objects.csproj @@ -47,6 +47,7 @@ </ItemGroup> <ItemGroup> <Compile Include="EngineShiftnetSubscription.cs" /> + <Compile Include="Hacking\Loot.cs" /> <Compile Include="Hacking\Port.cs" /> <Compile Include="Hacking\Payload.cs" /> <Compile Include="Hacking\Exploit.cs" /> |