Merge remote-tracking branch 'origin/feature-json6' into featue-json7

src/engine/objects/MobEquipment.java

@@ -56,12 +56,13 @@ public class MobEquipment extends AbstractGameObject {
         setMagicValue();
     }
 
-    public MobEquipment(int itemBaseID, float dropChance) {
+    public MobEquipment(int templateID, float dropChance) {
         super(MobEquipment.getNewID());
-        this.itemBase = ItemBase.getItemBase(itemBaseID);
-        this.template = ItemTemplate.templates.get(itemBaseID);
+        this.itemBase = ItemBase.getItemBase(templateID);
+        this.templateID = templateID;
+        this.template = ItemTemplate.templates.get(this.templateID);
 
-        Enum.EquipSlotType equipSlot = template.item_eq_slots_and.iterator().next();
+        Enum.EquipSlotType equipSlot = template.item_eq_slots_or.iterator().next();
 
         this.slot = equipSlot;
         this.dropChance = dropChance;