diff --git a/Bot/HackerBattle.fs b/Bot/HackerBattle.fs index 055ee7e..f60c793 100644 --- a/Bot/HackerBattle.fs +++ b/Bot/HackerBattle.fs @@ -56,9 +56,8 @@ let checkPlayerHasShieldSlotsAvailable (shield : Item) player = Error $"You are only allowed two shields at a time. Wait {cooldown} to add another shield" | false -> Ok updatedPlayer -// TODO H: Need to update the new hacker game mechanics let calculateDamage (hack : Item) (shield : Item) = - if hack.Power < shield.Power + if hack.Class = shield.Class then Weak else Strong diff --git a/Bot/Items.json b/Bot/Items.json index 3f3c49d..b9d48df 100644 --- a/Bot/Items.json +++ b/Bot/Items.json @@ -6,6 +6,7 @@ "Price": 0, "Power": 10, "Cooldown": 2, + "Class": 0, "Attributes": { "Sell": false, "Buy": false, @@ -20,6 +21,7 @@ "Price": 500, "Power": 50, "Cooldown": 2, + "Class": 1, "Attributes": { "Sell": true, "Buy": true, @@ -34,6 +36,7 @@ "Price": 5000, "Power": 80, "Cooldown": 2, + "Class": 2, "Attributes": { "Sell": true, "Buy": true, @@ -47,6 +50,7 @@ "Type": 1, "Price": 0, "Power": 10, + "Class": 0, "Cooldown": 600, "Attributes": { "Sell": false, @@ -56,11 +60,12 @@ } }, { - "Id": 8, - "Name": "Cypher", + "Id": 7, + "Name": "Encryption", "Type": 1, - "Price": 500, - "Power": 50, + "Price": 5000, + "Power": 80, + "Class": 1, "Cooldown": 600, "Attributes": { "Sell": true, @@ -70,11 +75,12 @@ } }, { - "Id": 7, - "Name": "Encryption", + "Id": 8, + "Name": "Cypher", "Type": 1, - "Price": 5000, - "Power": 80, + "Price": 500, + "Power": 50, + "Class": 2, "Cooldown": 600, "Attributes": { "Sell": true, diff --git a/Shared/Shared.fs b/Shared/Shared.fs index bc2ccc7..68513d3 100644 --- a/Shared/Shared.fs +++ b/Shared/Shared.fs @@ -65,6 +65,7 @@ module Types = Price : int Type : ItemType Power : int + Class : int Cooldown : int Attributes : ItemAttributes } @@ -74,6 +75,7 @@ module Types = Price = 0 Type = ItemType.Hack Power = 0 + Class = -1 Cooldown = 0 Attributes = ItemAttributes.empty }