Merge branch 'master' into test-3

# Conflicts:
#	.gitignore
#	eos/saveddata/character.py
#	service/network.py
#	service/price.py
This commit is contained in:
blitzmann
2017-12-10 22:30:48 -05:00
89 changed files with 345 additions and 156 deletions

View File

@@ -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