Merge branch 'R74nCom:main' into main

This commit is contained in:
JustAGenericUsername 2024-05-17 19:52:08 -04:00 committed by GitHub
commit ac3c35b3b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 130 additions and 30 deletions

View File

@ -154,6 +154,41 @@ elements.skull = {
tempHigh: 760,
stateHigh: "quicklime",
state: "solid",
density: 1000,
hardness: 0.5,
breakInto: ["quicklime","bone","bone","bone_marrow"]
},
elements.dino_bones = {
color: "#d9d9d9",
hidden:true,
behavior: behaviors.SUPPORT,
reactions: {
"water": { elem2:"broth", tempMin:70 },
"salt_water": { elem2:"broth", tempMin:70 },
"sugar_water": { elem2:"broth", tempMin:70 },
"seltzer": { elem2:"broth", tempMin:70 },
"rock": { "elem1": "fossil", chance:0.00005 },
"sand": { "elem1": "fossil", chance:0.000035 },
"dirt": { "elem1": "fossil", chance:0.00003 },
"tuff": { "elem1": "fossil", chance:0.00005 },
"basalt": { "elem1": "fossil", chance:0.00004 },
"mudstone": { "elem1": "fossil", chance:0.00004 },
"packed_sand": { "elem1": "fossil", chance:0.00004 },
"gravel": { "elem1": "fossil", chance:0.000035 },
"clay": { "elem1": "fossil", chance:0.00003 },
"clay_soil": { "elem1": "fossil", chance:0.00003 },
"permafrost": { "elem1": "fossil", chance:0.000035 },
"mulch": { "elem1": "fossil", chance:0.00003 },
"ant_wall": { "elem1": "fossil", chance:0.00002 },
"limestone": { "elem1": "fossil", chance:0.00005 },
"quicklime": { "elem1": "fossil", chance:0.000045 },
"slaked_lime": { "elem1": "fossil", chance:0.000035 },
},
category:"life",
tempHigh: 760,
stateHigh: "quicklime",
state: "solid",
density: 1500,
hardness: 0.5,
breakInto: ["quicklime","bone","bone","bone_marrow"]
@ -167,11 +202,13 @@ elements.coal = {
"salt_water": { elem2:"dirty_water", chance:0.02 },
"sugar_water": { elem2:"dirty_water", chance:0.02 },
"seltzer": { elem2:"dirty_water", chance:0.02 },
"dead_plant": { elem2:["coal","charcoal"], tempMin:200, chance:0.005, oneway:true },
"dead_plant": { elem2:"coal", tempMin:200, chance:0.005, oneway:true },
"wood": { elem2:["coal","coal","charcoal"], tempMin:280, chance:0.005, oneway:true },
"tree_branch": { elem2:["coal","coal","charcoal"], tempMin:280, chance:0.005, oneway:true },
"charcoal": { elem2:"coal", tempMin:200, chance:0.005, oneway:true },
},
burn: 28,
burnTime: 1500,
burnTime: 1000,
burnInto: ["fire","fire","fire","fire","ash","carbon_dioxide"],
tempHigh: 6000,
stateHigh: "fire",
@ -200,8 +237,49 @@ elements.hive_amber = {
category: "solids"
},
elements.dinosaur = {
color: ["#7F2B0A","#808080","#006400"],
behavior: [
"XX|M2%5|XX",
"M2%10|XX|M2%20 AND BO",
"M2%5|M1|M2%15",
],
tempHigh: 225,
stateHigh: ["cooked_meat","cooked_meat","ash","dino_bones"],
tempLow: -35,
stateLow: ["frozen_meat","frozen_meat","dino_bones","dino_bones"],
breakInto: ["blood","blood","meat","meat","dino_bones","blood","blood","meat","meat","dino_bones","feather"],
category: "life",
burn: 75,
burnTime: 30,
burnInto: ["cooked_meat","cooked_meat","ash","dino_bones"],
state: "solid",
density: 1500,
conduct: 0.25,
reactions: {
"bird": { elem2: [null,null,null,null,null,"feather"], chance: 0.3, func: behaviors.FEEDPIXEL },
"head": { elem2: [null,null,null,null,null,null,null,"blood","blood","skull"], chance: 0.5, func: behaviors.FEEDPIXEL },
"body": { elem2: [null,null,null,null,null,null,"blood","blood","bone"], chance: 0.5, func: behaviors.FEEDPIXEL },
"plant": { elem2: null, chance: 0.5, func: behaviors.FEEDPIXEL },
"bone": { elem2: ["bone_marrow","blood",null], chance: 0.3, },
"bone_marrow": { elem2: ["blood","blood",null], chance: 0.3, func: behaviors.FEEDPIXEL },
"blood": { elem2: null, chance: 0.1, func: behaviors.FEEDPIXEL },
"meat": { elem2: null, chance: 0.5, func: behaviors.FEEDPIXEL },
"cooked_meat": { elem2: null, chance: 0.4, func: behaviors.FEEDPIXEL },
"cured_meat": { elem2: null, chance: 0.4, func: behaviors.FEEDPIXEL },
"fly": { elem2: null, chance: 0.05, func: behaviors.FEEDPIXEL },
"ant": { elem2: null, chance: 0.05, func: behaviors.FEEDPIXEL },
}
};
elements.head.breakInto = ["blood","meat","skull"]
elements.head.burnInto = ["ash","cooked_meat","skull"]
elements.head.stateHigh = ["cooked_meat","cooked_meat","skull"]
elements.head.stateLow = ["frozen_meat","frozen_meat","skull"]
elements.dead_bug.breakInto = ["calcium","calcium","calcium","quicklime"]
if (!elements.sap.reactions) { elements.sap.reactions = {} }
@ -257,13 +335,15 @@ elements.bone_marrow.reactions.slaked_lime = { "elem1": "marrow_fossil", tempMin
if (!elements.wood.reactions) { elements.wood.reactions = {} }
elements.wood.reactions.rock = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000045 };
elements.wood.reactions.rock = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000045 };
elements.wood.reactions.sand = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000035 };
elements.wood.reactions.dirt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00003 };
elements.wood.reactions.tuff = { "elem1": "petrified_wood", tempMin:50, chance:0.000045 };
elements.wood.reactions.rock = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.000045 };
elements.wood.reactions.sand = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.000035 };
elements.wood.reactions.dirt = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.00003 };
elements.wood.reactions.tuff = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000045 };
elements.wood.reactions.tuff = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.000045 };
elements.wood.reactions.basalt = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000035 };
elements.wood.reactions.basalt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000035 };
elements.wood.reactions.mudstone = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 };
elements.wood.reactions.basalt = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.000035 };
elements.wood.reactions.mudstone = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000035 };
elements.wood.reactions.mudstone = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.000035 };
elements.wood.reactions.packed_sand = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 };
elements.wood.reactions.gravel = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 };
elements.wood.reactions.clay = { "elem1": "petrified_wood", tempMin:50, chance:0.000025 };
@ -277,13 +357,15 @@ elements.wood.reactions.slaked_lime = { "elem1": "petrified_wood", tempMin:50, c
if (!elements.tree_branch.reactions) { elements.tree_branch.reactions = {} }
elements.tree_branch.reactions.rock = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00005 };
elements.tree_branch.reactions.rock = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00005 };
elements.tree_branch.reactions.sand = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00003 };
elements.tree_branch.reactions.dirt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.tree_branch.reactions.tuff = { "elem1": "petrified_wood", tempMin:50, chance:0.00005 };
elements.tree_branch.reactions.rock = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.00005 };
elements.tree_branch.reactions.sand = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.00003 };
elements.tree_branch.reactions.dirt = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.tree_branch.reactions.tuff = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00005 };
elements.tree_branch.reactions.tuff = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.00005 };
elements.tree_branch.reactions.basalt = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00004 };
elements.tree_branch.reactions.basalt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00004 };
elements.tree_branch.reactions.mudstone = { "elem1": "petrified_wood", tempMin:50, chance:0.00004 };
elements.tree_branch.reactions.basalt = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.00004 };
elements.tree_branch.reactions.mudstone = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00004 };
elements.tree_branch.reactions.mudstone = { "elem1": ["methane","coal","coal","coal","coal"], tempMin:280, chance:0.00004 };
elements.tree_branch.reactions.packed_sand = { "elem1": "petrified_wood", tempMin:50, chance:0.00004 };
elements.tree_branch.reactions.gravel = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 };
elements.tree_branch.reactions.clay = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 };
@ -295,19 +377,37 @@ elements.tree_branch.reactions.quicklime = { "elem1": "petrified_wood", tempMin:
elements.tree_branch.reactions.slaked_lime = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 };
if (!elements.dead_plant.reactions) { elements.dead_plant.reactions = {} }
elements.dead_plant.reactions.rock = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00005 };
elements.dead_plant.reactions.sand = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.dirt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.tuff = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.basalt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00005 };
elements.dead_plant.reactions.basalt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.mudstone = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.packed_sand = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00003 };
elements.dead_plant.reactions.gravel = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.clay = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.clay_soil = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.mulch = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.ant_wall = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.limestone = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000035 };
elements.dead_plant.reactions.quicklime = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.slaked_lime = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.rock = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.00005 };
elements.dead_plant.reactions.sand = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.dirt = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.tuff = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.basalt = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.00005 };
elements.dead_plant.reactions.mudstone = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.packed_sand = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.00003 };
elements.dead_plant.reactions.gravel = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.clay = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.clay_soil = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.mulch = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.ant_wall = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.limestone = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000035 };
elements.dead_plant.reactions.quicklime = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
elements.dead_plant.reactions.slaked_lime = { "elem1": ["oil","methane","methane","coal","coal"], tempMin:280, chance:0.000025 };
if (!elements.algae.reactions) { elements.algae.reactions = {} }
elements.algae.reactions.rock = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.00005 };
elements.algae.reactions.sand = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.dirt = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.tuff = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.basalt = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.00005 };
elements.algae.reactions.mudstone = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.packed_sand = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.00003 };
elements.algae.reactions.gravel = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.clay = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.clay_soil = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.mulch = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.ant_wall = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.limestone = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000035 };
elements.algae.reactions.quicklime = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
elements.algae.reactions.slaked_lime = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
delete elements.dirt.reactions.bone