Merge branch 'master' into test-3

# Conflicts:
#	.gitignore
#	eos/saveddata/character.py
#	service/network.py
#	service/price.py

scripts/effectUsedBy.py

@@ -405,10 +405,11 @@ if options.effects:
 else:
     effect_list = []
     for effect_file in os.listdir(effects_path):
-        file_name, file_extension = effect_file.rsplit('.', 1)
-        # Ignore non-py files and exclude implementation-specific 'effects'
-        if file_extension == "py" and not file_name in ("__init__"):
-            effect_list.append(file_name)
+        if not effect_file.startswith('__'):
+            file_name, file_extension = effect_file.rsplit('.', 1)
+            # Ignore non-py files and exclude implementation-specific 'effects'
+            if file_extension == "py" and not file_name in ("__init__"):
+                effect_list.append(file_name)
 
 # Stage 2
 

scripts/jsonToSql.py

@@ -113,13 +113,30 @@ def main(db, json_path):
     def convertClones(data):
         newData = []
 
+        # December, 2017 - CCP decided to use only one set of skill levels for alpha clones. However, this is still
+        # represented in the data as a skillset per race. To ensure that all skills are the same, we store them in a way
+        # that we can check to make sure all races have the same skills, as well as skill levels
+
+        check = {}
+
         for ID in data:
             for skill in data[ID]["skills"]:
                 newData.append({
                     "alphaCloneID": int(ID),
-                    "alphaCloneName": data[ID]["internalDescription"],
+                    "alphaCloneName": "Alpha Clone",
                     "typeID": skill["typeID"],
                     "level": skill["level"]})
+                if ID not in check:
+                    check[ID] = {}
+                check[ID][int(skill["typeID"])] = int(skill["level"])
+
+        if not reduce(lambda a, b: a if a == b else False, [v for _, v in check.iteritems()]):
+            raise Exception("Alpha Clones not all equal")
+
+        newData = [x for x in newData if x['alphaCloneID'] == 1]
+
+        if len(newData) == 0:
+            raise Exception("Alpha Clone processing failed")
 
         return newData