Skip to content

Commit

Permalink
Merge branch 'master' into graphical
Browse files Browse the repository at this point in the history
  • Loading branch information
Putnam3145 committed Feb 24, 2014
2 parents d98687c + 1faea81 commit 4ea4a06
Show file tree
Hide file tree
Showing 15 changed files with 703 additions and 30 deletions.
60 changes: 30 additions & 30 deletions data/init/world_gen.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
[DEMON_NUMBER:52]
[NIGHT_TROLL_NUMBER:26]
[BOGEYMAN_NUMBER:26]
[VAMPIRE_NUMBER:26]
[WEREBEAST_NUMBER:26]
[SECRET_NUMBER:52]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:52]
[DISTURBANCE_INTERACTION_NUMBER:52]
[EVIL_CLOUD_NUMBER:26]
Expand Down Expand Up @@ -113,9 +113,9 @@
[DEMON_NUMBER:52]
[NIGHT_TROLL_NUMBER:26]
[BOGEYMAN_NUMBER:26]
[VAMPIRE_NUMBER:26]
[WEREBEAST_NUMBER:26]
[SECRET_NUMBER:52]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:52]
[DISTURBANCE_INTERACTION_NUMBER:52]
[EVIL_CLOUD_NUMBER:26]
Expand Down Expand Up @@ -200,9 +200,9 @@
[DEMON_NUMBER:28]
[NIGHT_TROLL_NUMBER:14]
[BOGEYMAN_NUMBER:14]
[VAMPIRE_NUMBER:14]
[WEREBEAST_NUMBER:14]
[SECRET_NUMBER:28]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:28]
[DISTURBANCE_INTERACTION_NUMBER:28]
[EVIL_CLOUD_NUMBER:14]
Expand Down Expand Up @@ -287,9 +287,9 @@
[DEMON_NUMBER:28]
[NIGHT_TROLL_NUMBER:14]
[BOGEYMAN_NUMBER:14]
[VAMPIRE_NUMBER:14]
[WEREBEAST_NUMBER:14]
[SECRET_NUMBER:28]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:28]
[DISTURBANCE_INTERACTION_NUMBER:28]
[EVIL_CLOUD_NUMBER:14]
Expand Down Expand Up @@ -374,9 +374,9 @@
[DEMON_NUMBER:22]
[NIGHT_TROLL_NUMBER:11]
[BOGEYMAN_NUMBER:11]
[VAMPIRE_NUMBER:11]
[WEREBEAST_NUMBER:11]
[SECRET_NUMBER:22]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:22]
[DISTURBANCE_INTERACTION_NUMBER:22]
[EVIL_CLOUD_NUMBER:11]
Expand Down Expand Up @@ -461,9 +461,9 @@
[DEMON_NUMBER:22]
[NIGHT_TROLL_NUMBER:11]
[BOGEYMAN_NUMBER:11]
[VAMPIRE_NUMBER:11]
[WEREBEAST_NUMBER:11]
[SECRET_NUMBER:22]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:22]
[DISTURBANCE_INTERACTION_NUMBER:22]
[EVIL_CLOUD_NUMBER:11]
Expand Down Expand Up @@ -548,9 +548,9 @@
[DEMON_NUMBER:20]
[NIGHT_TROLL_NUMBER:10]
[BOGEYMAN_NUMBER:10]
[VAMPIRE_NUMBER:10]
[WEREBEAST_NUMBER:10]
[SECRET_NUMBER:20]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:20]
[DISTURBANCE_INTERACTION_NUMBER:20]
[EVIL_CLOUD_NUMBER:10]
Expand Down Expand Up @@ -635,9 +635,9 @@
[DEMON_NUMBER:20]
[NIGHT_TROLL_NUMBER:10]
[BOGEYMAN_NUMBER:10]
[VAMPIRE_NUMBER:10]
[WEREBEAST_NUMBER:10]
[SECRET_NUMBER:20]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:20]
[DISTURBANCE_INTERACTION_NUMBER:20]
[EVIL_CLOUD_NUMBER:10]
Expand Down Expand Up @@ -722,9 +722,9 @@
[DEMON_NUMBER:20]
[NIGHT_TROLL_NUMBER:10]
[BOGEYMAN_NUMBER:10]
[VAMPIRE_NUMBER:10]
[WEREBEAST_NUMBER:10]
[SECRET_NUMBER:20]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:20]
[DISTURBANCE_INTERACTION_NUMBER:20]
[EVIL_CLOUD_NUMBER:10]
Expand Down Expand Up @@ -809,9 +809,9 @@
[DEMON_NUMBER:20]
[NIGHT_TROLL_NUMBER:10]
[BOGEYMAN_NUMBER:10]
[VAMPIRE_NUMBER:10]
[WEREBEAST_NUMBER:10]
[SECRET_NUMBER:20]
[VAMPIRE_NUMBER:2]
[WEREBEAST_NUMBER:2]
[SECRET_NUMBER:2]
[REGIONAL_INTERACTION_NUMBER:20]
[DISTURBANCE_INTERACTION_NUMBER:20]
[EVIL_CLOUD_NUMBER:10]
Expand Down
110 changes: 110 additions & 0 deletions raw/objects/inorganic_putnamagic.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
inorganic_putnamagic

[OBJECT:INORGANIC]

[INORGANIC:FOCUS_WATER_SCIENCE]
[USE_MATERIAL_TEMPLATE:SOIL_TEMPLATE]
[MAT_FIXED_TEMP:9990]
[MELTING_POINT:10170]
[BOILING_POINT:10180]
[DISPLAY_COLOR:1:0:0]
[BUILD_COLOR:1:0:1]
[MATERIAL_VALUE:350]
[SOLID_DENSITY:917]
[LIQUID_DENSITY:1000]
[STATE_NAME_ADJ:SOLID:enchanted ice]
[STATE_NAME_ADJ:POWDER:enchanted snow]
[STATE_NAME_ADJ:LIQUID:enchanted water]
[STATE_NAME_ADJ:GAS:enchanted water vapor]
[STATE_COLOR:ALL:BLUE]
[MATERIAL_REACTION_PRODUCT:FOCUS:INORGANIC:WATER_WEAPON_SCIENCE]
[SPECIAL]

[INORGANIC:WATER_WEAPON_SCIENCE]
[USE_MATERIAL_TEMPLATE:METAL_TEMPLATE]
[MELTING_POINT:10900]
[BOILING_POINT:10980]
[DISPLAY_COLOR:1:0:0]
[BUILD_COLOR:1:0:1]
[MATERIAL_VALUE:350]
[STATE_NAME_ADJ:SOLID:water]
[STATE_NAME_ADJ:POWDER:enchanted snow]
[STATE_NAME_ADJ:LIQUID:enchanted water]
[STATE_NAME_ADJ:GAS:enchanted water vapor]
[SOLID_DENSITY:5000]
[LIQUID_DENSITY:10660]
[MOLAR_MASS:18015]
[IMPACT_YIELD:5000000]
[IMPACT_FRACTURE:5000000]
[IMPACT_STRAIN_AT_YIELD:0]
[COMPRESSIVE_YIELD:5000000]
[COMPRESSIVE_FRACTURE:5000000]
[COMPRESSIVE_STRAIN_AT_YIELD:0]
[TENSILE_YIELD:5000000]
[TENSILE_FRACTURE:5000000]
[TENSILE_STRAIN_AT_YIELD:0]
[TORSION_YIELD:5000000]
[TORSION_FRACTURE:5000000]
[TORSION_STRAIN_AT_YIELD:0]
[SHEAR_YIELD:5000000]
[SHEAR_FRACTURE:5000000]
[SHEAR_STRAIN_AT_YIELD:0]
[BENDING_YIELD:5000000]
[BENDING_FRACTURE:5000000]
[BENDING_STRAIN_AT_YIELD:0]
[MAX_EDGE:100000]
[STATE_COLOR:ALL_SOLID:BLUE]
[SPECIAL]

[INORGANIC:FOCUS_FIRE_SCIENCE]
[USE_MATERIAL_TEMPLATE:SOIL_TEMPLATE]
[MELTING_POINT:10090]
[MAT_FIXED_TEMP:10080]
[BOILING_POINT:10180]
[DISPLAY_COLOR:4:14:0]
[BUILD_COLOR:4:14:0]
[MATERIAL_VALUE:350]
[SOLID_DENSITY:917]
[LIQUID_DENSITY:1000]
[STATE_NAME_ADJ:ALL_SOLID:enchanted fire]
[STATE_NAME_ADJ:LIQUID:enchanted fire]
[STATE_NAME_ADJ:GAS:enchanted fire]
[MATERIAL_REACTION_PRODUCT:FOCUS:INORGANIC:FIRE_WEAPON_SCIENCE]
[SPECIAL]

[INORGANIC:FIRE_WEAPON_SCIENCE]
[USE_MATERIAL_TEMPLATE:METAL_TEMPLATE]
[MELTING_POINT:15000]
[MAT_FIXED_TEMP:12000]
[BOILING_POINT:15180]
[DISPLAY_COLOR:4:14:0]
[BUILD_COLOR:4:14:0]
[MATERIAL_VALUE:350]
[STATE_NAME_ADJ:SOLID:fire]
[STATE_NAME_ADJ:POWDER:enchanted fire]
[STATE_NAME_ADJ:LIQUID:enchanted fire]
[STATE_NAME_ADJ:GAS:enchanted fire]
[SOLID_DENSITY:5000]
[LIQUID_DENSITY:10660]
[MOLAR_MASS:18015]
[IMPACT_YIELD:5000000]
[IMPACT_FRACTURE:5000000]
[IMPACT_STRAIN_AT_YIELD:0]
[COMPRESSIVE_YIELD:5000000]
[COMPRESSIVE_FRACTURE:5000000]
[COMPRESSIVE_STRAIN_AT_YIELD:0]
[TENSILE_YIELD:5000000]
[TENSILE_FRACTURE:5000000]
[TENSILE_STRAIN_AT_YIELD:0]
[TORSION_YIELD:5000000]
[TORSION_FRACTURE:5000000]
[TORSION_STRAIN_AT_YIELD:0]
[SHEAR_YIELD:5000000]
[SHEAR_FRACTURE:5000000]
[SHEAR_STRAIN_AT_YIELD:0]
[BENDING_YIELD:5000000]
[BENDING_FRACTURE:5000000]
[BENDING_STRAIN_AT_YIELD:0]
[MAX_EDGE:100000]
[STATE_COLOR:ALL_SOLID:RED]
[SPECIAL]
Loading

0 comments on commit 4ea4a06

Please sign in to comment.