diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index 674766c..2cf51a4 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -10,19 +10,13 @@ let shieldGif = "https://s10.gifyu.com/images/Defense-Degenz-V2.gif" let getHackGif = function | HackId.Virus -> "https://s10.gifyu.com/images/Attack-DegenZ.gif" - | HackId.Ransom -> "https://s10.gifyu.com/images/Mind-Control-Degenz-V2.gif" + | HackId.RemoteAccess -> "https://s10.gifyu.com/images/Mind-Control-Degenz-V2.gif" | HackId.Worm -> "https://s10.gifyu.com/images/WormBugAttack_Degenz.gif" - | HackId.DDos -> "https://s10.gifyu.com/images/Attack-DegenZ.gif" - | HackId.Crack -> "https://s10.gifyu.com/images/Attack-DegenZ.gif" - | HackId.Injection -> "https://s10.gifyu.com/images/Attack-DegenZ.gif" | _ -> hackGif let getShieldGif = function | ShieldId.Firewall -> "https://s10.gifyu.com/images/Defense-GIF-1-Degenz.gif" - | ShieldId.PortScan -> "https://s10.gifyu.com/images/PortScanDefense_Degenz.gif" - | ShieldId.Encryption -> "https://s10.gifyu.com/images/Anonymous-Degenz-V2.gif" - | ShieldId.Hardening -> "https://s10.gifyu.com/images/Encryption-Degenz-V2.gif" - | ShieldId.Sanitation -> "https://s10.gifyu.com/images/VPN-Degenz.gif" + | ShieldId.Encryption -> "https://s10.gifyu.com/images/Encryption-Degenz-V2.gif" | ShieldId.Cypher -> "https://s10.gifyu.com/images/Matrix_Degenz.gif" | _ -> shieldGif diff --git a/Bot/Items.json b/Bot/Items.json index de9142d..31e2143 100644 --- a/Bot/Items.json +++ b/Bot/Items.json @@ -14,12 +14,12 @@ }, { "Id": 1, - "Name": "Ransom", + "Name": "RemoteAccess", "Type": { "Case": "Hack" }, "Class": { - "Case": "Network" + "Case": "Penetration" }, "Cost": 100, "Power": 50, @@ -38,45 +38,6 @@ "Power": 50, "Cooldown": 260 }, - { - "Id": 3, - "Name": "DDos", - "Type": { - "Case": "Hack" - }, - "Class": { - "Case": "Exploit" - }, - "Cost": 100, - "Power": 50, - "Cooldown": 260 - }, - { - "Id": 4, - "Name": "Crack", - "Type": { - "Case": "Hack" - }, - "Class": { - "Case": "Penetration" - }, - "Cost": 100, - "Power": 50, - "Cooldown": 260 - }, - { - "Id": 5, - "Name": "Injection", - "Type": { - "Case": "Hack" - }, - "Class": { - "Case": "Penetration" - }, - "Cost": 100, - "Power": 50, - "Cooldown": 260 - }, { "Id": 6, "Name": "Firewall", @@ -92,19 +53,6 @@ }, { "Id": 7, - "Name": "PortScan", - "Type": { - "Case": "Shield" - }, - "Class": { - "Case": "Network" - }, - "Cost": 100, - "Power": 50, - "Cooldown": 260 - }, - { - "Id": 8, "Name": "Encryption", "Type": { "Case": "Shield" @@ -117,39 +65,13 @@ "Cooldown": 260 }, { - "Id": 9, - "Name": "Hardening", - "Type": { - "Case": "Shield" - }, - "Class": { - "Case": "Penetration" - }, - "Cost": 100, - "Power": 50, - "Cooldown": 260 - }, - { - "Id": 10, - "Name": "Sanitation", - "Type": { - "Case": "Shield" - }, - "Class": { - "Case": "Penetration" - }, - "Cost": 100, - "Power": 50, - "Cooldown": 260 - }, - { - "Id": 11, + "Id": 8, "Name": "Cypher", "Type": { "Case": "Shield" }, "Class": { - "Case": "Exploit" + "Case": "Penetration" }, "Cost": 100, "Power": 50, diff --git a/Bot/PlayerInteractions.fs b/Bot/PlayerInteractions.fs index 5f5008f..548b121 100644 --- a/Bot/PlayerInteractions.fs +++ b/Bot/PlayerInteractions.fs @@ -9,10 +9,9 @@ open Degenz.Shared module Commands = let newPlayer nickname (membr : uint64) = - let rand = System.Random(System.Guid.NewGuid().GetHashCode()) - let randHack = rand.Next(0, 6) - let randShield = rand.Next(6, 12) + let randHack = rand.Next(0, 3) + let randShield = rand.Next(6, 9) let hack = armoury |> Array.find (fun i -> i.Id = randHack) let shield = armoury |> Array.find (fun i -> i.Id = randShield) diff --git a/Shared/Shared.fs b/Shared/Shared.fs index 0390613..d3174e0 100644 --- a/Shared/Shared.fs +++ b/Shared/Shared.fs @@ -20,19 +20,13 @@ type BattleClass = type HackId = | Virus = 0 - | Ransom = 1 + | RemoteAccess = 1 | Worm = 2 - | DDos = 3 - | Crack = 4 - | Injection = 5 type ShieldId = | Firewall = 6 - | PortScan = 7 - | Encryption = 8 - | Hardening = 9 - | Sanitation = 10 - | Cypher = 11 + | Encryption = 7 + | Cypher = 8 type ItemType = | Hack