Merge pull request #3 from Rawng/includes

Parse new include style item.xml

1 files changed, 16 insertions, 12 deletions

diff --git a/utils.py b/utils.py
index 07c4451..fb0be37 100644
--- a/utils.py
+++ b/utils.py
@@ -53,18 +53,22 @@ class ItemDB:
         self.itemdb_file = ElementTree(file="data/items.xml")
 
         for item in self.itemdb_file.getroot():
-            if item.get('id') > 500:
-                item_struct = Item()
-                item_struct.name = item.get('name')
-                if item.get('weight'):
-                    item_struct.weight = int(item.get('weight'))
-                else:
-                    item_struct.weight = 0
-
-                if item.get('type'):
-                    item_struct.type = item.get('type')
-                item_struct.description = item.get('description')
-                self.item_names[int(item.get('id'))] = item_struct
+            if item.get('name'):
+                file2 = ElementTree(file=item.get('name'))
+                for item2 in file2.getroot():
+                    if item2.get('name'):
+                        file3 = ElementTree(file=item2.get('name'))
+                        for item3 in file3.getroot():
+                            item_struct = Item()
+                            item_struct.name = item3.get('name')
+                            if item3.get('weight'):
+                                item_struct.weight = item3.get('weight')
+                            else:
+                                item_struct.weight = 0
+                            if item3.get('type'):
+                                item_struct.type = item3.get('type')
+                                item_struct.description = item3.get('description')
+                                self.item_names[int(item3.get('id'))] = item_struct
 
     def getItem(self, item_id):
         return self.item_names[item_id]