Fixed bug in creature drops parsing

Author: Galarzaa90

CHANGELOG.rst

@@ -2,6 +2,13 @@
 Changelog
 =========
 
+.. v6.0.1
+
+6.0.1 (2021-08-18)
+==================
+
+- Fixed some creature drops not being parsed properly, resulting in incomplete data.
+
 .. v6.0.0
 
 6.0.0 (2021-08-17)

tibiawikisql/__init__.py

@@ -18,7 +18,7 @@
 __copyright__ = "Copyright 2021 Allan Galarza"
 
 __license__ = "Apache 2.0"
-__version__ = "6.0.0"
+__version__ = "6.0.1"
 
 from tibiawikisql import models
 from tibiawikisql.api import Article, Image, WikiClient, WikiEntry

tibiawikisql/models/creature.py

@@ -185,10 +185,14 @@ def match(k):
     loot = []
     for item_template in loot_items_templates:
         param_count = len(item_template.params)
-        if param_count < 3:
+        if param_count < 2:
             loot.append((strip_code(item_template.get(1)), ""))
         else:
-            loot.append((strip_code(item_template.get(2)), (strip_code(item_template.get(1)))))
+            second_param = strip_code(item_template.get(2))
+            if second_param in ["always", "common", "uncommon", "semi-rare", "rare", "very rare"]:
+                loot.append((strip_code(item_template.get(1)), ""))
+            else:
+                loot.append((second_param, (strip_code(item_template.get(1)))))
     return loot
 
 

tibiawikisql/schema.py

@@ -157,8 +157,8 @@ class ItemStoreOffer(Table, table_name="item_store_offer"):
 
 
 class CreatureDrop(Table, table_name="creature_drop"):
-    creature_id = Column(ForeignKey(Integer, table="creature", column="article_id"), index=True)
-    item_id = Column(ForeignKey(Integer, table="item", column="article_id"), index=True)
+    creature_id = Column(ForeignKey(Integer, table="creature", column="article_id"), index=True, nullable=False)
+    item_id = Column(ForeignKey(Integer, table="item", column="article_id"), index=True, nullable=False)
     chance = Column(Real)
     min = Column(Integer)
     max = Column(Integer)