Merge pull request #451 from SquareScreamYT/main

more things
This commit is contained in:
slweeb 2024-03-25 21:03:19 -04:00 committed by GitHub
commit baab61bf05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 263 additions and 33 deletions

View File

@ -1,8 +1,8 @@
/*
Created by SquareScreamYT <@918475812884344852> and RealerRaddler <@914371295561535508>
Thanks to Alice <@697799964985786450>, nousernamefound <@316383921346707468>, Adora the Transfem <@778753696804765696> and Fioushemastor <@738828785482203189> for helping :)
Created by SquareScreamYT/sqec <@918475812884344852>
Thanks to RealerRaddler <@914371295561535508>, Alice <@697799964985786450>, nousernamefound <@316383921346707468>, Adora the Transfem <@778753696804765696> and Fioushemastor <@738828785482203189> for helping :)
v1.10.5
v1.10.8
you can support me at my youtube: https://youtube.com/@sqec
@ -12,6 +12,7 @@ Upcoming Features:
- white rice noodles
- matcha leaves, powder, tea
- cacao pods
- more chocolate, cocoa powder, white chocolate, cocoa butter
- agar (makes juice into jelly)
- pigs, ham and bacon
- garlic
@ -34,6 +35,14 @@ Upcoming Features:
- peaches
- cucumbers
- eggplants
- food coloring
- crabs (they eat coconuts)
- squids
- tofu
- miso
- juice reaction with milk makes average color
- juice reaction with other juices
- jackfruit
Changelog (v1.0)
- added chickens
@ -98,7 +107,7 @@ Changelog (v1.1)
- added knife tool
- cuts, peels, etc. pixels
- readded potato skin and peeled potato
- changed fried potato recipe from potato to skinned potato\
- changed fried potato recipe from potato to skinned potato
- added pepper
- added cake
- made by mixing baked batter and cream
@ -342,6 +351,23 @@ Changelog (v1.10.5)
Changelog (v1.10.7)
- added mango milk
Changelog (v1.10.8)
- added onion powder
- fix carrot plant bug
- added fried rice
- added durians
- added cut durians
- added durian seed, wood, leaves and branches
*/
/*
@ -2645,46 +2671,52 @@ elements.lemon_seed = {
elements.carrot_seed = {
color: "#b08d35",
tick: function(pixel) {
tick: function (pixel) {
if (isEmpty(pixel.x, pixel.y + 1)) {
movePixel(pixel, pixel.x, pixel.y + 1);
}
else {
if (Math.random() < 0.1 && pixel.age > 100 && pixel.temp < 100 && pixel.leafgrown == true && pixel.growthpixel == 0) {
if (!outOfBounds(pixel.x,pixel.y+1)) {
var randomNumber1 = Math.round(Math.random())
pixel.growthpixel = pixel.growthpixel+randomNumber1
var dirtPixel = pixelMap[pixel.x][pixel.y+1];
if (!outOfBounds(pixel.x, pixel.y + 1)) {
var randomNumber1 = Math.round(Math.random());
pixel.growthpixel = pixel.growthpixel + randomNumber1;
var dirtPixel = pixelMap[pixel.x][pixel.y + 1];
if (dirtPixel.element === "dirt" || dirtPixel.element === "mud" || dirtPixel.element === "sand" || dirtPixel.element === "wet_sand" || dirtPixel.element === "clay_soil" || dirtPixel.element === "mycelium") {
deletePixel(pixel.x,pixel.y+1);
movePixel(pixel,pixel.x,pixel.y+1);
createPixel("carrot_leaves",pixel.x,pixel.y-1);
deletePixel(pixel.x, pixel.y + 1);
movePixel(pixel, pixel.x, pixel.y + 1);
createPixel("carrot_leaves", pixel.x, pixel.y - 1);
pixel.growthpixel++;
}
}
}
if (Math.random() < 0.1 && pixel.age > 100 && pixel.temp < 100 && pixel.leafgrown == true && pixel.growthpixel > 0 && pixel.growthpixel < 4) {
if (!outOfBounds(pixel.x,pixel.y+1)) {
var dirtPixel = pixelMap[pixel.x][pixel.y+1];
if (!outOfBounds(pixel.x, pixel.y + 1)) {
var dirtPixel = pixelMap[pixel.x][pixel.y + 1];
if (dirtPixel.element === "dirt" || dirtPixel.element === "mud" || dirtPixel.element === "sand" || dirtPixel.element === "wet_sand" || dirtPixel.element === "clay_soil" || dirtPixel.element === "mycelium") {
deletePixel(pixel.x,pixel.y+1);
movePixel(pixel,pixel.x,pixel.y+1);
createPixel("carrot",pixel.x,pixel.y-1);
deletePixel(pixel.x, pixel.y + 1);
movePixel(pixel, pixel.x, pixel.y + 1);
createPixel("carrot", pixel.x, pixel.y - 1);
pixel.growthpixel++;
}
}
}
if (!isEmpty(pixel.x,pixel.y+1) && Math.random() > 0.95 && isEmpty(pixel.x-1,pixel.y-1) && isEmpty(pixel.x+1,pixel.y-1) && pixel.leafgrown == false) {
if (!isEmpty(pixel.x, pixel.y + 1) && Math.random() > 0.95 && isEmpty(pixel.x - 1, pixel.y - 1) && isEmpty(pixel.x + 1, pixel.y - 1) && pixel.leafgrown == false) {
var dirtPixel = pixelMap[pixel.x][pixel.y + 1];
if (dirtPixel.element === "dirt" || dirtPixel.element === "mud" || dirtPixel.element === "sand" || dirtPixel.element === "wet_sand" || dirtPixel.element === "clay_soil" || dirtPixel.element === "mycelium") {
createPixel("carrot_leaves",pixel.x-1,pixel.y-1);
createPixel("carrot_leaves",pixel.x+1,pixel.y-1);
pixel.leafgrown++
createPixel("carrot_leaves", pixel.x - 1, pixel.y - 1);
createPixel("carrot_leaves", pixel.x + 1, pixel.y - 1);
pixel.leafgrown = true;
}
}
else if (pixel.age > 150 && pixel.growthpixel == 4 && Math.random() < 0.1) {
changePixel(pixel,"carrot");
changePixel(pixel, "carrot");
}
pixel.age++;
}
doDefaults(pixel);
},
properties: {
"age":0,
"age": 0,
"growthpixel": 0,
"leafgrown": false
},
@ -2705,6 +2737,7 @@ elements.carrot_seed = {
"XX|M1|XX",
],
};
elements.carrot_leaves = {
color: ["#61cc3d","#58c234"],
behavior: behaviors.WALL,
@ -4645,6 +4678,11 @@ elements.mango_juice = {
}
}
},
reactions: {
"milk": { elem1: "fruit_milk", elem2: "fruit_milk", chance: 0.35, color1:"#fada70", color2:"#fada70"},
"coconut_milk": { elem1: "fruit_milk", elem2: "fruit_milk", chance: 0.35, color1:"#fada70", color2:"#fada70"},
"nut_milk": { elem1: "fruit_milk", elem2: "fruit_milk", chance: 0.35, color1:"#fada70", color2:"#fada70"}
},
behavior: behaviors.LIQUID,
category: "liquids",
tempHigh: 100,
@ -5101,7 +5139,8 @@ elements.onion = {
state: "solid",
density: 1050,
cutInto: "cut_onion",
cutIntoEmit: "stench",
breakInto:"onion_powder",
//cutIntoEmit: "stench",
}
elements.cut_onion = {
color: "#dcc5ed",
@ -5114,6 +5153,7 @@ elements.cut_onion = {
burnInto: "steam",
state: "solid",
density: 1050,
breakInto:"onion_powder",
hidden: true,
reactions:{ "nut_oil": {elem1:"fried_onion", tempMin: 70, chance:10}}
}
@ -5183,6 +5223,28 @@ elements.onion_seed = {
"XX|M1|XX",
],
}
elements.onion_powder = {
color: "#e6d8b8",
reactions: {
"stench": { elem2:null, chance:0.25 },
"steam": { elem2:"fragrance", chance:0.1 },
"flea": { elem2:null, chance:0.01 },
"termite": { elem2:null, chance:0.01 },
"fly": { elem2:null, chance:0.01 },
"ant": { elem2:null, chance:0.01 },
"stink_bug": { elem2:null, chance:0.01 },
},
behavior: behaviors.POWDER,
tempHigh: 300,
stateHigh: ["fire","smoke","smoke","smoke","ash"],
burn:10,
burnTime:300,
burnInto: ["fire","smoke","smoke","smoke","smoke","smoke","smoke","fragrance"],
category:"food",
state: "solid",
density: 1400,
isFood: true,
}
elements.unhusked_rice = {
color: ["#c99a42","#b08638","#deb15d"],
behavior: [
@ -5223,7 +5285,8 @@ elements.rice = {
isFood: true,
density: 1050,
reactions:{
"water":{elem1:"porridge",elem2:"porridge",chance:3,tempMin:70}
"water":{elem1:"porridge",elem2:"porridge",chance:3,tempMin:70},
"nut_oil":{elem1:"fried_rice",elem2:null,chance:3,tempMin:60}
}
}
elements.cooked_rice = {
@ -5233,13 +5296,12 @@ elements.cooked_rice = {
tempHigh: 200,
stateHigh: "burnt_rice",
burn:65,
burnTime:60,
burnInto: "dead_plant",
breakInto: "rice_flour",
state: "solid",
isFood: true,
density: 1050,reactions:{
"water":{elem1:"porridge",elem2:"porridge",chance:3,tempMin:70}
"water":{elem1:"porridge",elem2:"porridge",chance:3,tempMin:70},
"nut_oil":{elem1:"fried_rice",elem2:null,chance:3,tempMin:60}
},
hidden:true
}
@ -5251,12 +5313,26 @@ elements.porridge = {
stateHigh: "steam",
viscosity: 999,
burn:65,
burnTime:60,
burnInto: "dead_plant",
state: "solid",
isFood: true,
density: 1050,
}
elements.fried_rice = {
color: "#e8dda0",
behavior: behaviors.POWDER,
category:"food",
tempHigh: 200,
stateHigh: "burnt_rice",
burn:65,
burnTime:60,
state: "solid",
isFood: true,
density: 1050,reactions:{
"salt":{color1:"#ede5b9",elem2:null,chance:3},
"monosodium_glutamate":{color1:"#ede5b9",elem2:null,chance:3}
},
hidden:true
}
elements.burnt_rice = {
color: "#262217",
behavior: behaviors.POWDER,
@ -5265,7 +5341,6 @@ elements.burnt_rice = {
stateHigh: "ash",
burn:65,
burnTime:60,
burnInto: "dead_plant",
state: "solid",
isFood: true,
density: 1050,
@ -6696,3 +6771,141 @@ elements.hot_sauce = {
isFood: true
}
elements.head.reactions.hot_sauce = {elem2:["smoke","fire",null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null], chance:3}
elements.durian_wood = {
color: "#5e4b23",
behavior: behaviors.WALL,
tempHigh: 400,
stateHigh: ["ember","charcoal","fire","fire","fire"],
category: "solids",
burn: 5,
burnTime: 300,
burnInto: ["ember","charcoal","fire"],
state: "solid",
hardness: 0.15,
breakInto: "sawdust",
breakIntoColor: ["#dba66e","#cc8a64"],
hidden: true
}
elements.durian_branch = {
color: "#5e4b23",
behavior: [
"CR:durian_leaves,durian_branch%2|CR:durian_leaves,durian_branch%2|CR:durian_leaves,durian_branch%2",
"XX|XX|XX",
"XX|XX|XX",
],
tempHigh: 100,
stateHigh: "durian_wood",
tempLow: -30,
stateLow: "durian_wood",
category: "life",
burn: 40,
burnTime: 50,
burnInto: ["sap","ember","charcoal"],
hidden: true,
state: "solid",
density: 1500,
hardness: 0.15,
breakInto: ["sap","sawdust"],
}
elements.durian_leaves = {
color: ["#326b25","#2e751e"],
behavior: [
"XX|XX|XX",
"XX|XX|XX",
"XX|CR:durian%0.1|XX",
],
reactions: {
"vinegar": { elem1:"dead_plant", elem2:null, chance:0.035 },
"baking_soda": { elem1:"dead_plant", elem2:null, chance:0.01 },
"bleach": { elem1:"dead_plant", elem2:null, chance:0.05 },
"alcohol": { elem1:"dead_plant", elem2:null, chance:0.035 }
},
category:"life",
tempHigh: 100,
stateHigh: "dead_plant",
tempLow: -1.66,
stateLow: "frozen_plant",
burn:65,
burnTime:60,
burnInto: "dead_plant",
breakInto: "dead_plant",
state: "solid",
density: 1050,
hidden: true
}
elements.durian = {
color: ["#578524","#5b8f1f"],
behavior: behaviors.POWDER,
category:"food",
tempHigh: 100,
stateHigh: "dead_plant",
burn:65,
burnTime:60,
cutInto: "cut_durian",
state: "solid",
density: 1050,
}
elements.cut_durian = {
color: ["#e3e04b","#d1cf36"],
behavior: behaviors.STURDYPOWDER,
category:"food",
tempHigh: 100,
stateHigh: ["sugar","steam"],
burn:65,
burnTime:60,
state: "solid",
density: 1050,
hidden: true,
freezeDryInto: "freeze_dried_fruits",
freezeDryIntoColor: "#a19f3b",
}
elements.durian_seed = {
color: "#a17d3b",
tick: function(pixel) {
if (isEmpty(pixel.x,pixel.y+1)) {
movePixel(pixel,pixel.x,pixel.y+1);
}
else {
if (Math.random() < 0.02 && pixel.age > 50 && pixel.temp < 100) {
if (!outOfBounds(pixel.x,pixel.y+1)) {
var dirtPixel = pixelMap[pixel.x][pixel.y+1];
if (dirtPixel.element === "dirt" || dirtPixel.element === "mud" || dirtPixel.element === "sand" || dirtPixel.element === "wet_sand" || dirtPixel.element === "clay_soil" || dirtPixel.element === "mycelium") {
changePixel(dirtPixel,"root");
}
}
if (isEmpty(pixel.x,pixel.y-1)) {
movePixel(pixel,pixel.x,pixel.y-1);
createPixel(Math.random() > 0.5 ? "durian_wood" : "durian_branch",pixel.x,pixel.y+1);
}
}
else if (pixel.age > 1000) {
changePixel(pixel,"durian_wood");
}
pixel.age++;
}
doDefaults(pixel);
},
properties: {
"age":0
},
tempHigh: 100,
stateHigh: "dead_plant",
tempLow: -2,
stateLow: "frozen_plant",
burn: 65,
burnTime: 15,
category: "life",
state: "solid",
density: 1500,
cooldown: defaultCooldown,
seed: true,
behavior: [
"XX|XX|XX",
"XX|FX%10|XX",
"XX|M1|XX",
],
};

View File

@ -1,5 +1,5 @@
var modName = "mods/../a_mod_by_alice.js" //can't do "alice's mod" because the apostrophe will fuck up code, be too confusing, or both
var dependencies = ["mods/libhooktick.js", "mods/chem.js", "mods/minecraft.js", "mods/Neutronium Mod.js", "mods/CrashTestDummy.js", "mods/fey_and_more.js", "mods/velocity.js", "mods/ketchup_mod.js", "mods/moretools.js", "mods/aChefsDream.js", "mods/nousersthings.js"]; //thanks to mollthecoder, PlanetN9ne, StellarX20 (3), MelecieDiancie, R74n, Nubo318, Sightnado, sqeč, and NoUsernameFound
var dependencies = ["mods/libhooktick.js", "mods/chem.js", "mods/minecraft.js", "mods/Neutronium Mod.js", "mods/CrashTestDummy.js", "mods/fey_and_more.js", "mods/velocity.js", "mods/ketchup_mod.js", "mods/moretools.js", "mods/aChefsDream.js", "mods/nousersthings.js"]; //thanks to mollthecoder, PlanetN9ne, StellarX20 (3), MelecieDiancie, R74n, Nubo318, Sightnado, SquareScreamYT, and NoUsernameFound
var dependencyExistence = dependencies.map(x => enabledMods.includes(x));
var allDependenciesExist = dependencyExistence.reduce(function(a,b) { return a && b });
//console.log(allDependenciesExist);

View File

@ -15,5 +15,22 @@ elements.element_eraser = {
},
category: "tools",
excludeRandom: true,
desc: "Input a element to erase only that element."
desc: "Use on pixels to delete specified element."
}
let finalEraseElement2 = null;
elements.exclusive_element_eraser = {
color: "#eeeeee",
onSelect: function() {
var answer = prompt("Please input the element you do not wish to delete. It will not work if you enter multiple element types while paused.",(finalEraseElement2||undefined));
if (!answer2) { return }
finalEraseElement2 = mostSimilarElement(answer2);
},
tool: function(pixel) {
if (pixel.element != finalEraseElement2) {
deletePixel(pixel.x,pixel.y)
}
},
category: "tools",
excludeRandom: true,
desc: "Use on pixels to delete any element except the specified element."
}