diff --git a/mods/fossils.js b/mods/fossils.js index d8e97c67..324c0993 100644 --- a/mods/fossils.js +++ b/mods/fossils.js @@ -1,3 +1,5 @@ +/* code by nekonico aka doobienecoarc */ + elements.fossil = { color: ["#bbb3ae","#b4b4b4","#c0c0c0"], behavior: [ @@ -6,12 +8,12 @@ elements.fossil = { "M2%75|M1|M2%75", ], reactions: { - "water": {elem1: "wet_sand", chance: 0.00035}, - "salt_water": {elem1: "wet_sand", chance: 0.0005}, - "sugar_water": {elem1: "wet_sand", chance: 0.0004}, - "seltzer": {elem1: "wet_sand", chance: 0.0004}, - "dirty_water": {elem1: "wet_sand", chance: 0.0004}, - "soda": {elem1: "wet_sand", chance: 0.0004}, + "water": {elem1: ["wet_sand","fossil_sand"], chance: 0.00035}, + "salt_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0005}, + "sugar_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "seltzer": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "dirty_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "soda": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, "lichen": {elem1: "dirt", chance: 0.0025}, "bone": {elem2: "fossil", chance: 0.000025}, "bone_marrow": {elem2: "marrow_fossil", chance: 0.00002}, @@ -20,7 +22,7 @@ elements.fossil = { "tree_branch": {elem2: "petrified_wood", chance: 0.000015}, "grape": {elem2: "juice", chance: 0.1, color2: "#291824"}, "wheat": {elem2: "flour"}, - "primordial_soup": {elem1: "wet_sand", chance: 0.001} + "primordial_soup": {elem1: ["wet_sand","fossil_sand"], chance: 0.001} }, tempHigh: 950, stateHigh: "magma", @@ -31,10 +33,9 @@ elements.fossil = { breakInto: ["rock","gravel","gravel","gravel","sand"], }; -elements.marrow_fossil = { - color: ["#cbb2b3","#c1a8a8","#d0b0b0"], - hidden:true, - behavior: behaviors.SUPPORTPOWDER, +elements.fossil_sand = { + color: ["#bbb3ae","#b4b4b4","#c0c0c0"], + behavior: behaviors.POWDER, reactions: { "water": {elem1: "wet_sand", chance: 0.00035}, "salt_water": {elem1: "wet_sand", chance: 0.0005}, @@ -42,6 +43,32 @@ elements.marrow_fossil = { "seltzer": {elem1: "wet_sand", chance: 0.0004}, "dirty_water": {elem1: "wet_sand", chance: 0.0004}, "soda": {elem1: "wet_sand", chance: 0.0004}, + "bone": {elem2: "fossil", chance: 0.0000025}, + "bone_marrow": {elem2: "marrow_fossil", chance: 0.000002}, + "skull": {elem2: ["human_fossil","human_fossil","fossil"], chance: 0.0000025}, + "wood": {elem2: "petrified_wood", chance: 0.0000015}, + "tree_branch": {elem2: "petrified_wood", chance: 0.0000015}, + "primordial_soup": {elem1: "wet_sand", chance: 0.001} + }, + tempHigh: 1700, + stateHigh: "molten_glass", + category: "land", + state: "solid", + density: 2000, + breakInto: ["gravel","gravel","sand"], +}; + +elements.marrow_fossil = { + color: ["#cbb2b3","#c1a8a8","#d0b0b0"], + hidden:true, + behavior: behaviors.SUPPORTPOWDER, + reactions: { + "water": {elem1: ["wet_sand","fossil_sand"], chance: 0.00035}, + "salt_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0005}, + "sugar_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "seltzer": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "dirty_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "soda": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, "lichen": {elem1: "dirt", chance: 0.0025}, "bone": {elem2: "fossil", chance: 0.000025}, "bone_marrow": {elem2: "marrow_fossil", chance: 0.00002}, @@ -70,12 +97,12 @@ elements.human_fossil = { "M2%50|M1|M2%50", ], reactions: { - "water": {elem1: "wet_sand", chance: 0.00035}, - "salt_water": {elem1: "wet_sand", chance: 0.0005}, - "sugar_water": {elem1: "wet_sand", chance: 0.0004}, - "seltzer": {elem1: "wet_sand", chance: 0.0004}, - "dirty_water": {elem1: "wet_sand", chance: 0.0004}, - "soda": {elem1: "wet_sand", chance: 0.0004}, + "water": {elem1: ["wet_sand","fossil_sand"], chance: 0.00035}, + "salt_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0005}, + "sugar_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "seltzer": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "dirty_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "soda": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, "lichen": {elem1: "dirt", chance: 0.0025}, "bone": {elem2: "fossil", chance: 0.000025}, "bone_marrow": {elem2: "marrow_fossil", chance: 0.00002}, @@ -103,12 +130,12 @@ elements.dino_fossil = { "M2%75|M1|M2%75", ], reactions: { - "water": {elem1: "wet_sand", chance: 0.00035}, - "salt_water": {elem1: "wet_sand", chance: 0.0005}, - "sugar_water": {elem1: "wet_sand", chance: 0.0004}, - "seltzer": {elem1: "wet_sand", chance: 0.0004}, - "dirty_water": {elem1: "wet_sand", chance: 0.0004}, - "soda": {elem1: "wet_sand", chance: 0.0004}, + "water": {elem1: ["wet_sand","fossil_sand"], chance: 0.00035}, + "salt_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0005}, + "sugar_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "seltzer": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "dirty_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "soda": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, "lichen": {elem1: "dirt", chance: 0.0025}, "bone": {elem2: "fossil", chance: 0.000025}, "bone_marrow": {elem2: "marrow_fossil", chance: 0.00002}, @@ -133,12 +160,12 @@ elements.petrified_wood = { hidden:true, behavior: behaviors.STURDYPOWDER, reactions: { - "water": {elem1: "wet_sand", chance: 0.00035}, - "salt_water": {elem1: "wet_sand", chance: 0.0005}, - "sugar_water": {elem1: "wet_sand", chance: 0.0004}, - "seltzer": {elem1: "wet_sand", chance: 0.0004}, - "dirty_water": {elem1: "wet_sand", chance: 0.0004}, - "soda": {elem1: "wet_sand", chance: 0.0004}, + "water": {elem1: ["wet_sand","fossil_sand"], chance: 0.00035}, + "salt_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0005}, + "sugar_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "seltzer": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "dirty_water": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, + "soda": {elem1: ["wet_sand","fossil_sand"], chance: 0.0004}, "lichen": {elem1: "dirt", chance: 0.0025}, "bone": {elem2: "fossil", chance: 0.000025}, "bone_marrow": {elem2: "marrow_fossil", chance: 0.00002}, @@ -189,10 +216,47 @@ elements.skull = { state: "solid", density: 1000, hardness: 0.5, + breakInto: ["quicklime","bone","human_bones","bone_marrow"] +}, + +elements.human_bones = { + name: "bone", + color: "#d9d9d9", + hidden:true, + behavior: behaviors.SUPPORT, + reactions: { + "water": { elem2:"broth", tempMin:70, color2:"#d7db69" }, + "salt_water": { elem2:"broth", tempMin:70, color2:"#d7db69" }, + "sugar_water": { elem2:"broth", tempMin:70, color2:"#d7db69" }, + "seltzer": { elem2:"broth", tempMin:70, color2:"#d7db69" }, + "rock": { "elem1": "human_fossil", chance:0.00005 }, + "sand": { "elem1": "human_fossil", chance:0.000035 }, + "dirt": { "elem1": "human_fossil", chance:0.00003 }, + "tuff": { "elem1": "human_fossil", chance:0.00005 }, + "basalt": { "elem1": "human_fossil", chance:0.00004 }, + "mudstone": { "elem1": "human_fossil", chance:0.00004 }, + "packed_sand": { "elem1": "human_fossil", chance:0.00004 }, + "gravel": { "elem1": "human_fossil", chance:0.000035 }, + "clay": { "elem1": "human_fossil", chance:0.00003 }, + "clay_soil": { "elem1": "human_fossil", chance:0.00003 }, + "permafrost": { "elem1": "human_fossil", chance:0.000035 }, + "mulch": { "elem1": "human_fossil", chance:0.00003 }, + "ant_wall": { "elem1": "human_fossil", chance:0.00002 }, + "limestone": { "elem1": "human_fossil", chance:0.00005 }, + "quicklime": { "elem1": "human_fossil", chance:0.000045 }, + "slaked_lime": { "elem1": "human_fossil", chance:0.000035 }, + }, + category:"life", + tempHigh: 760, + stateHigh: "quicklime", + state: "solid", + density: 1000, + hardness: 0.5, breakInto: ["quicklime","bone","bone","bone_marrow"] }, elements.dino_bones = { + name: "bone", color: "#d9d9d9", hidden:true, behavior: behaviors.SUPPORT, @@ -242,17 +306,19 @@ elements.coal = { }, burn: 28, burnTime: 1000, - burnInto: ["fire","fire","fire","fire","ash","carbon_dioxide"], + burnInto: ["fire","fire","fire","fire","dust","carbon_dioxide"], tempHigh: 6000, stateHigh: "fire", category: "powders", state: "solid", density: 250, - breakInto: ["ash","ash","carbon_dioxide"], + breakInto: ["dust","ash","carbon_dioxide"], hardness: 0.5, }, elements.bug_amber = { + hidden:true, + name: "amber", color: ["#ffc000","#b67f18","#c86305","#cf7a19","#e4ae3a"], temp: 20, tempHigh: 345, @@ -262,6 +328,8 @@ elements.bug_amber = { }, elements.hive_amber = { + hidden:true, + name: "amber", color: "#ffc000", temp: 20, tempHigh: 345, @@ -271,6 +339,7 @@ elements.hive_amber = { }, elements.dinosaur = { + hidden:true, color: ["#7F2B0A","#808080","#006400"], behavior: [ "XX|M2%5|XX", @@ -308,31 +377,130 @@ elements.dinosaur = { "glass": { elem2: "glass_shard", chance: 0.05 }, "concrete": { elem2: "dust", chance: 0.03 }, } +}, + +elements.trilobite = { + hidden:true, + color: "#808080", + behavior: [ + "XX|M2%5|SW:water,salt_water,sugar_water,dirty_water,seltzer,pool_water,primordial_soup%05", + "XX|FX%0.5|M2%50 AND SW:water,salt_water,sugar_water,dirty_water,seltzer,pool_water,primordial_soup%10 AND BO", + "M2%50|M1|M2%50 AND SW:water,salt_water,sugar_water,dirty_water,seltzer,pool_water,primordial_soup%10", + ], + reactions: { + "algae": { elem2:null, chance:0.25, func:behaviors.FEEDPIXEL }, + "kelp": { elem2:"water", chance:0.25 }, + "plant": { elem2:null, chance:0.125, func:behaviors.FEEDPIXEL }, + "fly": { elem2:null, chance:0.4, func:behaviors.FEEDPIXEL }, + "firefly": { elem2:null, chance:0.6, func:behaviors.FEEDPIXEL }, + "worm": { elem2:null, chance:0.25, func:behaviors.FEEDPIXEL }, + "tadpole": { elem2:null, chance:0.25, func:behaviors.FEEDPIXEL }, + "oxygen": { elem2:"carbon_dioxide", chance:0.5 }, + "broth": { elem2:"water", chance:0.2, func:behaviors.FEEDPIXEL }, + "slug": { elem2:null, chance:0.2, func:behaviors.FEEDPIXEL }, + "herb": { elem2:null, chance:0.15, func:behaviors.FEEDPIXEL }, + "lettuce": { elem2:null, chance:0.15, func:behaviors.FEEDPIXEL }, + "dead_plant": { elem2:null, chance:0.15, func:behaviors.FEEDPIXEL }, + "lichen": { elem2:null, chance:0.1, func:behaviors.FEEDPIXEL }, + "yeast": { elem2:null, chance:0.15, func:behaviors.FEEDPIXEL }, + "yogurt": { elem2:null, chance:0.15, func:behaviors.FEEDPIXEL }, + "tea": { elem2:null, chance:0.2, func:behaviors.FEEDPIXEL }, + "yolk": { elem2:null, chance:0.15, func:behaviors.FEEDPIXEL }, + "cell": { elem2:null, chance:0.15, func:behaviors.FEEDPIXEL }, + "crumb": { elem2:null, chance:0.1, func:behaviors.FEEDPIXEL }, + "alcohol": { elem1:"dead_bug", chance:0.001 }, + "water": { elem2:"bubble", attr2:{"clone":"water"}, chance:0.002, oneway:true }, + "salt_water": { elem2:"bubble", attr2:{"clone":"salt_water"}, chance:0.002, oneway:true }, + "pool_water": { elem1:"dead_bug", chance:0.001 }, + "chlorine": { elem1:"dead_bug", chance:0.1 }, + "vinegar": { elem1:"dead_bug", chance:0.001 }, + }, + foodNeed: 10, + temp: 20, + tempHigh: 150, + stateHigh: "meat", + tempLow: -20, + stateLow: ["dead_bug","frozen_meat"], + category:"life", + breakInto: ["dead_bug","blood"], + burn:25, + burnTime:250, + state: "solid", + density: 1080, + conduct: 0.2, + eggColor: ["#211316","#2C1A1D","#503734"] +}, + +elements.extracted_dna = { + hidden:true, + name: "artificial_egg", + color: ["#211316","#2C1A1D","#503734","#e0d3ab","#d1c6be","#b5c0ad","#b9b8bc"], + behavior: behaviors.POWDER, + tick: function(pixel) { + if (Math.random() < 0.00025 || (pixel.dna && pixel.temp > 40 && pixel.temp < 150)) { + if (pixel.dna) { + changePixel(pixel,pixel.dna); + } + else changePixel(pixel,"cell") + } + }, + innerColor: "#ffffff", + tempHigh: 1200, + stateHigh: ["steam","dna","calcium","carbon_dioxide","sulfur_gas"], + breakInto: ["yolk","yolk","dna","cell"], + category:"life", + conduct: 1, }; -elements.head.breakInto = ["blood","meat","skull"] +elements.extractor = { + name: "dna-extractor", + color: ["#d1c6be","#b5c0ad","#b9b8bc"], + behavior: behaviors.STURDYPOWDER, + reactions: { + "hive_amber": { elem2:"extracted_dna", chance:0.2 }, + "bug_amber": { elem2:"extracted_dna", chance:0.2 }, + "dino_bones": { elem2:"extracted_dna", attr1:{"dna":"dinosaur"}, chance:0.2 }, + "skull": { elem2:"extracted_dna", attr1:{"dna":"human"}, chance:0.2 }, + "dino_fossil": { elem2:"extracted_dna", attr1:{"dna":"dinosaur"}, chance:0.02 }, + "human_fossil": { elem2:"extracted_dna", attr1:{"dna":"human"}, chance:0.02 }, + }, + category:"machines", + conduct: 1, + hardness: 1, +}; -elements.head.burnInto = ["ash","cooked_meat","skull"] +elements.head.breakInto = ["blood","meat","human_bones","skull"] -elements.head.stateHigh = ["cooked_meat","cooked_meat","skull"] +elements.head.burnInto = ["ash","cooked_meat","human_bones","skull","skull"] -elements.head.stateLow = ["frozen_meat","frozen_meat","skull"] +elements.head.stateHigh = ["cooked_meat","human_bones","skull","skull"] + +elements.head.stateLow = ["frozen_meat","human_bones","skull","skull","skull"] + +elements.body.breakInto = ["blood","meat","human_bones","bone"] + +elements.body.burnInto = ["ash","cooked_meat","human_bones"] + +elements.body.stateHigh = ["cooked_meat","human_bones"] + +elements.body.stateLow = ["frozen_meat","human_bones","human_bones"] elements.dead_bug.breakInto = ["calcium","calcium","calcium","quicklime"] if (!elements.sap.reactions) { elements.sap.reactions = {} } elements.sap.reactions.dead_bug = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.hive = { elem1:null, elem2:"hive_amber", chance:0.01 }; - elements.sap.reactions.ant = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.fly = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.flea = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.termite = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.worm = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.bee = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.firefly = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.stinkbug = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.slug = { elem1:"bug_amber", elem2:null, chance:0.08 }; - elements.sap.reactions.snail = { elem1:"bug_amber", elem2:null, chance:0.05 }; + elements.sap.reactions.hive = { elem1:null, elem2:"hive_amber", attr2:{"dna":"bee"}, chance:0.01 }; + elements.sap.reactions.ant = { elem1:"bug_amber", attr1:{"dna":"ant"}, elem2:null, chance:0.1 }; + elements.sap.reactions.fly = { elem1:"bug_amber", attr1:{"dna":"fly"}, elem2:null, chance:0.1 }; + elements.sap.reactions.flea = { elem1:"bug_amber", attr1:{"dna":"flea"}, elem2:null, chance:0.1 }; + elements.sap.reactions.termite = { elem1:"bug_amber", attr1:{"dna":"termite"}, elem2:null, chance:0.1 }; + elements.sap.reactions.worm = { elem1:"bug_amber", attr1:{"dna":"worm"}, elem2:null, chance:0.1 }; + elements.sap.reactions.bee = { elem1:"bug_amber", attr1:{"dna":"bee"}, elem2:null, chance:0.1 }; + elements.sap.reactions.firefly = { elem1:"bug_amber", attr1:{"dna":"firefly"}, elem2:null, chance:0.1 }; + elements.sap.reactions.stinkbug = { elem1:"bug_amber", attr1:{"dna":"stinkbug"}, elem2:null, chance:0.1 }; + elements.sap.reactions.slug = { elem1:"bug_amber", attr1:{"dna":"slug"}, elem2:null, chance:0.08 }; + elements.sap.reactions.snail = { elem1:"bug_amber", attr1:{"dna":"snail"}, elem2:null, chance:0.05 }; + elements.sap.reactions.trilobite = { elem1:"bug_amber", attr1:{"dna":"trilobite"}, elem2:null, chance:0.1 }; if (!elements.bone.reactions) { elements.bone.reactions = {} } diff --git a/mods/scp.js b/mods/scp.js index 55e23bd3..9703ac3d 100644 --- a/mods/scp.js +++ b/mods/scp.js @@ -1116,16 +1116,16 @@ elements.shy_body = { } if (pixel.dir == 1) { if (!isEmpty(pixel.x+2, pixel.y-1, true) && pixelMap[pixel.x+2][pixel.y-1].element == "head") { - pixel.panic += 0.1; + pixel.panic += 0.2; } else if (!isEmpty(pixel.x+3, pixel.y-1, true) && pixelMap[pixel.x+2][pixel.y-1].element == "head") { - pixel.panic += 0.1; + pixel.panic += 0.2; } else if (!isEmpty(pixel.x+4, pixel.y-1, true) && pixelMap[pixel.x+4][pixel.y-1].element == "head") { - pixel.panic += 0.1; + pixel.panic += 0.2; } else if (!isEmpty(pixel.x+5, pixel.y-1, true) && pixelMap[pixel.x+5][pixel.y-1].element == "head") { - pixel.panic += 0.1; + pixel.panic += 0.2; } else if (!isEmpty(pixel.x+5, pixel.y-1, true) && pixelMap[pixel.x+5][pixel.y-1].element == "head") { pixel.panic += 0.1; @@ -1139,19 +1139,31 @@ elements.shy_body = { else if (!isEmpty(pixel.x+8, pixel.y-1, true) && pixelMap[pixel.x+8][pixel.y-1].element == "head") { pixel.panic += 0.1; } + else if (!isEmpty(pixel.x+9, pixel.y-1, true) && pixelMap[pixel.x+9][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+10, pixel.y-1, true) && pixelMap[pixel.x+10][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+11, pixel.y-1, true) && pixelMap[pixel.x+11][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+12, pixel.y-1, true) && pixelMap[pixel.x+12][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } } else if (pixel.dir == -1) { if (!isEmpty(pixel.x-2, pixel.y-1, true) && pixelMap[pixel.x-2][pixel.y-1].element == "head") { - pixel.panic += 0.1; + pixel.panic += 0.2; } else if (!isEmpty(pixel.x-3, pixel.y-1, true) && pixelMap[pixel.x-3][pixel.y-1].element == "head") { - pixel.panic += 0.1; + pixel.panic += 0.2; } else if (!isEmpty(pixel.x-4, pixel.y-1, true) && pixelMap[pixel.x-4][pixel.y-1].element == "head") { - pixel.panic += 0.1; + pixel.panic += 0.2; } else if (!isEmpty(pixel.x-5, pixel.y-1, true) && pixelMap[pixel.x-5][pixel.y-1].element == "head") { - pixel.panic += 0.1; + pixel.panic += 0.2; } else if (!isEmpty(pixel.x-5, pixel.y-1, true) && pixelMap[pixel.x-5][pixel.y-1].element == "head") { pixel.panic += 0.1; @@ -1165,6 +1177,18 @@ elements.shy_body = { else if (!isEmpty(pixel.x-8, pixel.y-1, true) && pixelMap[pixel.x-8][pixel.y-1].element == "head") { pixel.panic += 0.1; } + else if (!isEmpty(pixel.x-9, pixel.y-1, true) && pixelMap[pixel.x-9][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-10, pixel.y-1, true) && pixelMap[pixel.x-10][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-11, pixel.y-1, true) && pixelMap[pixel.x-11][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-12, pixel.y-1, true) && pixelMap[pixel.x-12][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } } }, density: 1080,