From 6da107e029cc960732a0aa83cbcc245c132e682d Mon Sep 17 00:00:00 2001
From: Daniel Mullings <mullingsd@uni.coventry.ac.uk>
Date: Wed, 17 Nov 2021 02:15:20 +0000
Subject: [PATCH] armorNamePresent Feature Added (Partial: Not all features for
 Armor complete)

---
 api_market_handler.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/api_market_handler.py b/api_market_handler.py
index 9a946cf..0d91dbd 100644
--- a/api_market_handler.py
+++ b/api_market_handler.py
@@ -1,4 +1,5 @@
 import json
+import winsound
 from urllib.request import urlopen
 
 api_key = "x-api-key=9w3MIVAGdu84n6Db"
@@ -12,6 +13,9 @@ if (release_state):
     fleaMarketData = json.load(apiJsonObj)
 else:
     print("Release State = " + str(release_state) + "!, API Not Connected, Market Data Outdated")
+    for i in range (0 , 3):
+        winsound.Beep(750, 250)
+        i += 1
     tempFleaMarketData_Json_File = open("tempFleaMarketData.json", encoding="utf-8")
     fleaMarketData = json.load(tempFleaMarketData_Json_File)
 
@@ -28,11 +32,15 @@ def isWeaponNamePresent(p_userMessage):
     return ItemNamePresent(p_userMessage, "Weapon")
 def isAmmoNamePresent(p_userMessage):
     return ItemNamePresent(p_userMessage, "Ammo")
+def isArmourNamePresent(p_userMessage):
+    return ItemNamePresent(p_userMessage, "Armor_vests")
 
 def getWeaponName(p_userMessage):
     return ItemName(p_userMessage, "Weapon")
 def getAmmoName(p_userMessage):
     return ItemName(p_userMessage, "Ammo")
+def getArmourName(p_userMessage):
+    return ItemName(p_userMessage, "Armor_vests")
 
 def getWeaponTraderPrice(p_weaponName):
     return ItemPrice(p_weaponName, "Weapon", "tMarket")
@@ -51,22 +59,23 @@ def getItemTrader(p_itemName):
 
 def ItemNamePresent(p_userMessage, p_itemType):
     for marketItem in fleaMarketData:
-        if (marketItem["tags"][0] == p_itemType):
+        if (p_itemType in marketItem["tags"]):
             if (marketItem["shortName"].replace("-", "").replace(" ", "").lower() in p_userMessage.replace("-", "").replace(" ", "").lower()):
                 return True
     return False
 def ItemName(p_userMessage, p_itemType):
     for marketItem in fleaMarketData:
-        if (marketItem["tags"][0] == p_itemType):
-            if (p_userMessage == "debug_PrintAll"):
-                print(marketItem["tags"])
+        if (p_userMessage == "debug_PrintAll"):
+            if ("Armor_vests" in marketItem["tags"]):
+                print(str(marketItem["tags"]) + " --- " + str(marketItem["shortName"]))
+        if (p_itemType in marketItem["tags"]):
             if (marketItem["shortName"].replace("-", "").replace(" ", "").lower() in p_userMessage.replace("-", "").replace(" ", "").lower()):
                 return marketItem["shortName"]
     return "ERROR! ---Item name not present---"
 def ItemPrice(p_itemName, p_itemType, p_priceType):
     RefreshFleaMarketData()
     for marketItem in fleaMarketData:
-        if (marketItem["tags"][0] == p_itemType):
+        if (p_itemType in marketItem["tags"][0]):
             if (p_itemName == marketItem["shortName"]):
                 if (p_priceType == "tMarket"):
                     return marketItem["traderPriceCur"] + str(marketItem["traderPrice"])
@@ -85,6 +94,9 @@ def ItemTrader(p_itemName):
 
 
 
-def printAllItemName(p_itemType):
+def printAllItemName():
     if (not release_state):
-        ItemName("debug_PrintAll", p_itemType)
\ No newline at end of file
+        ItemName("debug_PrintAll", " ")
+
+printAllItemName()
+print(getArmourName(isArmourNamePresent("3 m")))
\ No newline at end of file