Skip to content

Commit

Permalink
GH #36 - Enable simple minerals by default
Browse files Browse the repository at this point in the history
The non-simple minerals don't seem to have reactions associated
with them, which may be a bug. This patch disables simple-minerals
by default, which also restores the previous MWDF default settings.
  • Loading branch information
pjf committed Dec 5, 2013
1 parent 1d95295 commit 4d9a46a
Show file tree
Hide file tree
Showing 16 changed files with 422 additions and 422 deletions.
52 changes: 26 additions & 26 deletions Dwarf Fortress/raw/objects/inorganic_mineral.txt
Expand Up @@ -4,13 +4,13 @@ inorganic_mineral


kimberlite can have diamonds
YESMIN[INORGANIC:KIMBERLITE]
!NOMIN!INORGANIC:KIMBERLITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:kimberlite][DISPLAY_COLOR:1:7:0][TILE:132]
[ENVIRONMENT_SPEC:GABBRO:VEIN:70]
[IS_STONE]

YESMIN[INORGANIC:SCHEELITE]
!NOMIN!INORGANIC:SCHEELITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:scheelite][DISPLAY_COLOR:6:3:1][TILE:58]
[ENVIRONMENT_SPEC:GRANITE:CLUSTER_SMALL:40]
Expand All @@ -22,7 +22,7 @@ YESMIN[INORGANIC:SCHEELITE]
[REACTION_CLASS:WOLFRAM]


YESMIN[INORGANIC:LIMONITE]
!NOMIN!INORGANIC:LIMONITE]
[USE_MATERIAL_TEMPLATE:MINERAL_STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:limonite][DISPLAY_COLOR:6:7:1][TILE:42]
[ENVIRONMENT:SEDIMENTARY:VEIN:50]ore1
Expand All @@ -39,7 +39,7 @@ YESSMELTING[METAL_ORE:VIOLENT_REACTION:2]



YESMIN[INORGANIC:HORN_SILVER]
!NOMIN!INORGANIC:HORN_SILVER]
[USE_MATERIAL_TEMPLATE:MINERAL_STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:horn silver][DISPLAY_COLOR:7:7:1][TILE:156]
[ENVIRONMENT_SPEC:NATIVE_SILVER:CLUSTER_SMALL:50]
Expand All @@ -55,27 +55,27 @@ YESSMELTING[METAL_ORE:VIOLENT_REACTION:2]
[MELTING_POINT:10819]


YESMIN[INORGANIC:TALC]
!NOMIN!INORGANIC:TALC]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:talc][DISPLAY_COLOR:7:7:1][TILE:133]
[ENVIRONMENT_SPEC:DOLOMITE:CLUSTER:50]ore1
[SOLID_DENSITY:2691]
[IS_STONE]
[MELTING_POINT:12700]

YESMIN[INORGANIC:JET]
!NOMIN!INORGANIC:JET]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:jet][DISPLAY_COLOR:0:7:1][TILE:133]
[ENVIRONMENT:SEDIMENTARY:CLUSTER:50]ore1
[IS_STONE]

YESMIN[INORGANIC:PUDDINGSTONE]
!NOMIN!INORGANIC:PUDDINGSTONE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:puddingstone][DISPLAY_COLOR:6:7:0][TILE:133]
[ENVIRONMENT_SPEC:CONGLOMERATE:CLUSTER:50]ore1[AQUIFER]
[IS_STONE]

YESMIN[INORGANIC:PETRIFIED_WOOD]
!NOMIN!INORGANIC:PETRIFIED_WOOD]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:petrified wood][DISPLAY_COLOR:4:7:1][TILE:133]
[ENVIRONMENT:SEDIMENTARY:CLUSTER_SMALL:50]
Expand All @@ -84,7 +84,7 @@ YESMIN[INORGANIC:PETRIFIED_WOOD]
[BOILING_POINT:14014]

ore of antimony
YESMIN[INORGANIC:STIBNITE]
!NOMIN!INORGANIC:STIBNITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:stibnite][DISPLAY_COLOR:7:7:1][TILE:131]
[BASIC_COLOR:7:0]
Expand All @@ -95,30 +95,30 @@ YESMIN[INORGANIC:STIBNITE]
[MATERIAL_REACTION_PRODUCT:GLAZE_MAT_U_ORE:INORGANIC:ANTIMONY_GLAZE]
[MATERIAL_REACTION_PRODUCT:GLAZE_MAT_NC_ORE:INORGANIC:ANTIMONY_GLAZE]

YESMIN[INORGANIC:MARCASITE]
!NOMIN!INORGANIC:MARCASITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:marcasite][DISPLAY_COLOR:7:7:1][TILE:133]
[ENVIRONMENT_SPEC:KAOLINITE:CLUSTER_SMALL:50]
[IS_STONE]
[MELTING_POINT:10810]

KCl, can be used/processed to fertilizer, destroyed by water -- should only be in very dry environments
YESMIN[INORGANIC:SYLVITE]
!NOMIN!INORGANIC:SYLVITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:sylvite][DISPLAY_COLOR:6:7:1][TILE:133]
[ENVIRONMENT_SPEC:ROCK_SALT:CLUSTER:50]ore1
[IS_STONE]
[MELTING_POINT:11397]
[BOILING_POINT:12700]

YESMIN[INORGANIC:CRYOLITE]
!NOMIN!INORGANIC:CRYOLITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:cryolite][DISPLAY_COLOR:7:7:1][TILE:132]
[ENVIRONMENT_SPEC:GRANITE:CLUSTER_SMALL:50]
[IS_STONE]
[MELTING_POINT:11817]

YESMIN[INORGANIC:PERICLASE]
!NOMIN!INORGANIC:PERICLASE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:periclase][DISPLAY_COLOR:7:7:1][TILE:134]
[ENVIRONMENT_SPEC:MARBLE:CLUSTER_SMALL:50]
Expand All @@ -129,7 +129,7 @@ YESMIN[INORGANIC:PERICLASE]



YESMIN[INORGANIC:MAGNETITE]
!NOMIN!INORGANIC:MAGNETITE]
[USE_MATERIAL_TEMPLATE:MINERAL_STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:magnetite][DISPLAY_COLOR:0:7:1][TILE:42]
[ENVIRONMENT:SEDIMENTARY:CLUSTER:50]ore1
Expand All @@ -145,7 +145,7 @@ YESSLAGPIT[METAL_ORE:SLAG:50]slaghigh
[MELTING_POINT:12768]
[MATERIAL_REACTION_PRODUCT:GLAZE_MAT_ORE:INORGANIC:IRON_GLAZE]

YESMIN[INORGANIC:PYROLUSITE]
!NOMIN!INORGANIC:PYROLUSITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:pyrolusite][DISPLAY_COLOR:0:7:1][TILE:132]
[ENVIRONMENT:IGNEOUS_ALL:CLUSTER_SMALL:50]
Expand All @@ -156,7 +156,7 @@ YESMIN[INORGANIC:PYROLUSITE]
[MATERIAL_REACTION_PRODUCT:GLAZE_MAT_NC_ORE:INORGANIC:MANGANESE_GLAZE]

this is uranium oxide, but was possibly used for glazing ceramics (colored glass most likely came later involving refinement beyond our tech level)
YESMIN[INORGANIC:PITCHBLENDE]
!NOMIN!INORGANIC:PITCHBLENDE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:pitchblende][DISPLAY_COLOR:5:7:0][TILE:132]
[ENVIRONMENT_SPEC:GRANITE:CLUSTER_SMALL:50]
Expand All @@ -167,7 +167,7 @@ YESMIN[INORGANIC:PITCHBLENDE]
[MATERIAL_REACTION_PRODUCT:GLAZE_MAT_U_ORE:INORGANIC:PITCHBLENDE_GLAZE]
[MATERIAL_REACTION_PRODUCT:GLAZE_MAT_NC_ORE:INORGANIC:PITCHBLENDE_GLAZE]

YESMIN[INORGANIC:BORAX]
!NOMIN!INORGANIC:BORAX]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:borax][DISPLAY_COLOR:7:7:1][TILE:133]
[ENVIRONMENT_SPEC:GYPSUM:CLUSTER_SMALL:50]
Expand All @@ -177,7 +177,7 @@ YESMIN[INORGANIC:BORAX]
[BOILING_POINT:12835]


YESMIN[INORGANIC:HORNBLENDE]
!NOMIN!INORGANIC:HORNBLENDE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:hornblende][DISPLAY_COLOR:0:7:1][TILE:134]
[ENVIRONMENT:IGNEOUS_ALL:CLUSTER_SMALL:50]
Expand All @@ -186,15 +186,15 @@ YESMIN[INORGANIC:HORNBLENDE]
[MELTING_POINT:11890]


YESMIN[INORGANIC:SERPENTINE]
!NOMIN!INORGANIC:SERPENTINE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:serpentine][DISPLAY_COLOR:2:7:0][TILE:132]
[ENVIRONMENT_SPEC:OLIVINE:CLUSTER_SMALL:50]
[IS_STONE]
[MELTING_POINT:10281]

used with kaolinite sometimes for ceramics
YESMIN[INORGANIC:ORTHOCLASE]
!NOMIN!INORGANIC:ORTHOCLASE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:orthoclase][DISPLAY_COLOR:6:7:1][TILE:134]
[ENVIRONMENT:IGNEOUS_INTRUSIVE:CLUSTER:50]ore1
Expand All @@ -203,7 +203,7 @@ YESMIN[INORGANIC:ORTHOCLASE]
[MELTING_POINT:12250]

mica group contains various minerals, this is based on muscovite
YESMIN[INORGANIC:MICA]
!NOMIN!INORGANIC:MICA]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:mica][DISPLAY_COLOR:0:7:1][TILE:132]
[ENVIRONMENT:METAMORPHIC:CLUSTER:50]ore1
Expand All @@ -213,7 +213,7 @@ YESMIN[INORGANIC:MICA]
[MELTING_POINT:12295]


YESMIN[INORGANIC:ALABASTER]
!NOMIN!INORGANIC:ALABASTER]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:alabaster][DISPLAY_COLOR:7:7:1][TILE:177]
[ENVIRONMENT_SPEC:GYPSUM:CLUSTER_SMALL:50]
Expand All @@ -222,7 +222,7 @@ YESMIN[INORGANIC:ALABASTER]
[REACTION_CLASS:GYPSUM]
[MELTING_POINT:10261]

YESMIN[INORGANIC:SELENITE]
!NOMIN!INORGANIC:SELENITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:selenite][DISPLAY_COLOR:7:7:1][TILE:177]
[ENVIRONMENT_SPEC:GYPSUM:CLUSTER_SMALL:50]
Expand All @@ -231,7 +231,7 @@ YESMIN[INORGANIC:SELENITE]
[REACTION_CLASS:GYPSUM]
[MELTING_POINT:10225]

YESMIN[INORGANIC:SATINSPAR]
!NOMIN!INORGANIC:SATINSPAR]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:satinspar][DISPLAY_COLOR:7:7:1][TILE:177]
[ENVIRONMENT_SPEC:GYPSUM:CLUSTER_SMALL:50]
Expand All @@ -241,7 +241,7 @@ YESMIN[INORGANIC:SATINSPAR]
[MELTING_POINT:10261]

gypsum without any water (plaster still has some)
YESMIN[INORGANIC:ANHYDRITE]
!NOMIN!INORGANIC:ANHYDRITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:anhydrite][DISPLAY_COLOR:7:7:1][TILE:133]
[BASIC_COLOR:7:0]
Expand All @@ -254,7 +254,7 @@ YESMIN[INORGANIC:ANHYDRITE]
[MELTING_POINT:12610]

used to make alum, a mordant/deoderant/used in tanning/fire retardent/astringent/preservative, although alunite makes potassium alum and ammonium alum might be the one for tanning
YESMIN[INORGANIC:ALUNITE]
!NOMIN!INORGANIC:ALUNITE]
[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:alunite][DISPLAY_COLOR:7:7:1][TILE:133]
[ENVIRONMENT:IGNEOUS_EXTRUSIVE:CLUSTER:50]ore1
Expand Down

0 comments on commit 4d9a46a

Please sign in to comment.