Cross-platform linefeed tomfoolery

pineapplemachine · Sep 22, 2015 · 31381ad · 31381ad
1 parent 55ce893
commit 31381ad
Show file tree

Hide file tree

Showing 2 changed files with 118 additions and 118 deletions.
diff --git a/scripts/pineapple/pydwarf.noexotic.py b/scripts/pineapple/pydwarf.noexotic.py
@@ -1,19 +1,19 @@
-import pydwarf
-
-@pydwarf.urist(
-    name = 'pineapple.noexotic',
-    version = '1.0.1',
-    author = 'Sophie Kirschner',
-    description = 'Replaces all [PET_EXOTIC] and [MOUNT_EXOTIC] tags with their non-exotic counterparts.',
-    compatibility = (pydwarf.df_0_34, pydwarf.df_0_40)
-)
-def noexotic(df):
-    # Do the removing
-    pets = df.all('PET_EXOTIC').each(lambda token: token.setvalue('PET'), none=True)
-    mounts = df.all('MOUNT_EXOTIC').each(lambda token: token.setvalue('MOUNT'), none=True)
-
-    # All done!
-    if len(pets) or len(mounts):
-        return pydwarf.success('Replaced %d PET_EXOTIC and %d MOUNT_EXOTIC tokens.' % (len(pets), len(mounts)))
-    else:
-        return pydwarf.failure('I found no PET_EXOTIC or MOUNT_EXOTIC tokens to replace.')
+import pydwarf
+
+@pydwarf.urist(
+    name = 'pineapple.noexotic',
+    version = '1.0.1',
+    author = 'Sophie Kirschner',
+    description = 'Replaces all [PET_EXOTIC] and [MOUNT_EXOTIC] tags with their non-exotic counterparts.',
+    compatibility = (pydwarf.df_0_34, pydwarf.df_0_40)
+)
+def noexotic(df):
+    # Do the removing
+    pets = df.all('PET_EXOTIC').each(lambda token: token.setvalue('PET'), none=True)
+    mounts = df.all('MOUNT_EXOTIC').each(lambda token: token.setvalue('MOUNT'), none=True)
+
+    # All done!
+    if len(pets) or len(mounts):
+        return pydwarf.success('Replaced %d PET_EXOTIC and %d MOUNT_EXOTIC tokens.' % (len(pets), len(mounts)))
+    else:
+        return pydwarf.failure('I found no PET_EXOTIC or MOUNT_EXOTIC tokens to replace.')
diff --git a/scripts/putnam/pydwarf.materialsplus.py b/scripts/putnam/pydwarf.materialsplus.py
@@ -1,99 +1,99 @@
-import os
-import pydwarf
-import raws
-
-
-
-mats_dir = pydwarf.rel(__file__, 'raw/materialsplus')
-
-default_entities = 'MOUNTAIN'
-
-add_paths = [os.path.join(mats_dir, path) for path in [
-    'inorganic_alloys_mat_plus.txt',
-    'inorganic_metals_mat_plus.txt',
-    'inorganic_other_mat_plus.txt',
-    'item_mat_plus.txt'
-]]
-
-patch_paths = [os.path.join(mats_dir, path) for path in [
-    'reaction_alloys_mat_plus.txt',
-    'reaction_production_mat_plus.txt'
-]]
-
-
-
-add_properties = [
-    (
-        # Identifier for making the log easier to understand
-        'zircon',
-        # Regex to match inorganic IDs
-        '.* ZIRCON',
-        # Add these properties
-        'MATERIAL_REACTION_PRODUCT:KROLL_PROCESS:INORGANIC:ZIRCONIUM_PUTNAM'
-    ),
-    (
-        'beryl',
-        '.* BERYL|HELIODOR|MORGANITE|GOSHENITE|EMERALD',
-        'REACTION_CLASS:BERYLLIUM'
-    ),
-    (
-        'silicon',
-        'ANDESITE|OLIVINE|HORNBLENDE|SERPENTINE|ORTHOCLASE|MICROCLINE|MICA',
-        'REACTION_CLASS:SILICON'
-    ),
-    (
-        'dolomite',
-        'DOLOMITE',
-        'REACTION_CLASS:PIDGEON_PROCESS'
-    ),
-    (
-        'cromite',
-        'CHROMITE',
-        '[METAL_ORE:CHROMIUM_PUTNAM:100][METAL_ORE:IRON:50]'
-    ),
-    (
-        'pyrolusite',
-        'PYROLUSITE',
-        'METAL_ORE:MANGANESE_PUTNAM:100'
-    ),
-]
-
-
-
-@pydwarf.urist(
-    name = 'putnam.materialsplus',
-    version = '1.0.1',
-    author = ('Putnam', 'Sophie Kirschner'),
-    description = 'Adds a bunch of materials to the game.',
-    compatibility = (pydwarf.df_0_34, pydwarf.df_0_40)
-)
-def materialsplus(df, entities=default_entities):
-    # Add properties to various inorganics as defined by the add_properties dict
-    errors = 0
-    for identifier, re_id, addprops in add_properties:
-        additions = df.allobj(type='INORGANIC', re_id=re_id).each(
-            lambda token: token.addprop(addprops), none=True
-        )
-        if len(additions):
-            pydwarf.log.debug('Added %s properties to %d inorganics.' % (identifier, len(additions)))
-        else:
-            errors += 1
-            pydwarf.log.error('Failed to add %s properties because no matching inorganics were found.' % identifier)
-
-    for path in add_paths:
-        pydwarf.log.debug('Adding file at %s.' % path)
-        df.add(path=path, loc='raw/objects')
-
-    for path in patch_paths:
-        response = pydwarf.urist.getfn('pineapple.easypatch')(
-            df,
-            files = path,
-            loc = 'raw/objects',
-            permit_entities = entities
-        )
-        if not response: return response
-
-    if not errors:
-        return pydwarf.success()
-    else:
-        return pydwarf.failure('Failed to add inorganic properties for %d groups.' % errors)
+import os
+import pydwarf
+import raws
+
+
+
+mats_dir = pydwarf.rel(__file__, 'raw/materialsplus')
+
+default_entities = 'MOUNTAIN'
+
+add_paths = [os.path.join(mats_dir, path) for path in [
+    'inorganic_alloys_mat_plus.txt',
+    'inorganic_metals_mat_plus.txt',
+    'inorganic_other_mat_plus.txt',
+    'item_mat_plus.txt'
+]]
+
+patch_paths = [os.path.join(mats_dir, path) for path in [
+    'reaction_alloys_mat_plus.txt',
+    'reaction_production_mat_plus.txt'
+]]
+
+
+
+add_properties = [
+    (
+        # Identifier for making the log easier to understand
+        'zircon',
+        # Regex to match inorganic IDs
+        '.* ZIRCON',
+        # Add these properties
+        'MATERIAL_REACTION_PRODUCT:KROLL_PROCESS:INORGANIC:ZIRCONIUM_PUTNAM'
+    ),
+    (
+        'beryl',
+        '.* BERYL|HELIODOR|MORGANITE|GOSHENITE|EMERALD',
+        'REACTION_CLASS:BERYLLIUM'
+    ),
+    (
+        'silicon',
+        'ANDESITE|OLIVINE|HORNBLENDE|SERPENTINE|ORTHOCLASE|MICROCLINE|MICA',
+        'REACTION_CLASS:SILICON'
+    ),
+    (
+        'dolomite',
+        'DOLOMITE',
+        'REACTION_CLASS:PIDGEON_PROCESS'
+    ),
+    (
+        'cromite',
+        'CHROMITE',
+        '[METAL_ORE:CHROMIUM_PUTNAM:100][METAL_ORE:IRON:50]'
+    ),
+    (
+        'pyrolusite',
+        'PYROLUSITE',
+        'METAL_ORE:MANGANESE_PUTNAM:100'
+    ),
+]
+
+
+
+@pydwarf.urist(
+    name = 'putnam.materialsplus',
+    version = '1.0.1',
+    author = ('Putnam', 'Sophie Kirschner'),
+    description = 'Adds a bunch of materials to the game.',
+    compatibility = (pydwarf.df_0_34, pydwarf.df_0_40)
+)
+def materialsplus(df, entities=default_entities):
+    # Add properties to various inorganics as defined by the add_properties dict
+    errors = 0
+    for identifier, re_id, addprops in add_properties:
+        additions = df.allobj(type='INORGANIC', re_id=re_id).each(
+            lambda token: token.addprop(addprops), none=True
+        )
+        if len(additions):
+            pydwarf.log.debug('Added %s properties to %d inorganics.' % (identifier, len(additions)))
+        else:
+            errors += 1
+            pydwarf.log.error('Failed to add %s properties because no matching inorganics were found.' % identifier)
+
+    for path in add_paths:
+        pydwarf.log.debug('Adding file at %s.' % path)
+        df.add(path=path, loc='raw/objects')
+
+    for path in patch_paths:
+        response = pydwarf.urist.getfn('pineapple.easypatch')(
+            df,
+            files = path,
+            loc = 'raw/objects',
+            permit_entities = entities
+        )
+        if not response: return response
+
+    if not errors:
+        return pydwarf.success()
+    else:
+        return pydwarf.failure('Failed to add inorganic properties for %d groups.' % errors)