Merge pull request #279 from SquareScreamYT/main
This commit is contained in:
slweeb
GitHub
commit
78ce6f3611
|
|
@ -199,9 +199,9 @@
|
|||
<tr><td>rays.js</td><td>Adds more Ray types</td><td>Alice</td></tr>
|
||||
|
||||
<!----><tr><td class="modCat" colspan="3">Food & Cooking</td></tr><!---->
|
||||
<tr><td>aChefsDream.js</td><td>Adds more food and animals</td><td>SquareScreamYT and RealerRaddler</td></tr>
|
||||
<tr><td>bananas.js</td><td>Adds bananas and banana plants</td><td>Alice</td></tr>
|
||||
<tr><td>greenitemsandmore.js</td><td>Adds various green things, including apples and more food</td><td>zonneschijn7</td>
|
||||
<tr><td>food&animals.js</td><td>Adds more food and animals</td><td>SquareScreamYT and RealerRaddler</td></tr>
|
||||
<tr><td>ketchup_mod.js</td><td>Adds a bunch of ketchup related stuff, plus a few other condiments</td><td>Nubo318 (main dev), Devi, Alice (contributors)</td></tr>
|
||||
<tr><td>lemonade.js</td><td>Adds lemons and lemonade</td><td>personman / baconthemyth</td></tr>
|
||||
<tr><td>morefoodsmod.js</td><td>Adds more foods</td><td>Clide4</td></tr>
|
||||
|
|
@ -209,6 +209,7 @@
|
|||
<tr><td>sbstuff.js</td><td>Adds many foods</td><td>Stefan Blox</td></tr>
|
||||
|
||||
<!----><tr><td class="modCat" colspan="3">Life & Nature</td></tr><!---->
|
||||
<tr><td>aChefsDream.js</td><td>Adds more food and animals</td><td>SquareScreamYT and RealerRaddler</td></tr>
|
||||
<tr><td>apioforms_pre.js</td><td>An incomplete implementation of elements from the <a href="https://osmarks.net/apioform/">Apioform Game</a></td><td>Alice</td></tr>
|
||||
<tr><td>bacteria_mod.js</td><td>Adds content from the <a href="https://www.curseforge.com/minecraft/mc-mods/bacterium">Bacterium Mod</a>: (Bacteria, Replacer B., Jammer Block)</td><td>Alice</td></tr>
|
||||
<tr><td>bananas.js</td><td>Adds bananas and banana plants</td><td>Alice</td></tr>
|
||||
|
|
@ -219,7 +220,6 @@
|
|||
<tr><td>fantastic_creatures.js</td><td>Adds various animals</td><td>Melecie</td></tr>
|
||||
<tr><td>fantasy_elements.js</td><td>Fantasy creatures and substances</td><td>pixelegend4</td></tr>
|
||||
<tr><td>fey_and_more.js</td><td>Adds fairies, magic, and a lot of other things</td><td>Melecie</td></tr>
|
||||
<tr><td>food&animals.js</td><td>Adds more food and animals</td><td>SquareScreamYT and RealerRaddler</td></tr>
|
||||
<tr><td>fwibblen.js</td><td>Adds a flying creature that turns nickel into itself, and a second creature that does the same to the first one</td><td>Alice</td></tr>
|
||||
<tr><td>human_edit.js</td><td>Improvements to humans</td><td>Alice</td></tr>
|
||||
<tr><td>miscible_psoup_and_birthpool.js</td><td>Makes Primordial Soup and Birthpool mix instead of the birthpool settling to the bottom. Will be deprecated upon the release of Magical Menagerie</td><td>Alice</td></tr>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,8 @@
|
|||
/*
|
||||
Created by SquareScreamYT and RealerRaddler
|
||||
Thanks to Alice, nousernamefound and Fioushemastor for helping :)
|
||||
|
||||
food&animals.js
|
||||
|
||||
MORE FOODS AND ANIMALS!!
|
||||
|
||||
Created by @SquareScreamYT and @RealerRaddler
|
||||
|
||||
v1.0
|
||||
v1.1
|
||||
|
||||
Changelog (v1.0)
|
||||
- added chickens
|
||||
|
|
@ -51,7 +47,61 @@ Changelog (v1.0)
|
|||
- added olive branches
|
||||
- added olive leaves
|
||||
- added cooking oil
|
||||
|
||||
|
||||
|
||||
|
||||
Changelog (v1.1)
|
||||
- added apples and related stuff
|
||||
- apples
|
||||
- applewood
|
||||
- apple branches
|
||||
- apple leaves
|
||||
- apple juice
|
||||
- made by smashing apples
|
||||
- apple seeds
|
||||
- apple slices
|
||||
- made by cutting apples
|
||||
- apple jam
|
||||
- made by putting sugar in apple juice
|
||||
- added knife tool
|
||||
- cuts, peels, etc. pixels
|
||||
- readded potato skin and peeled potato
|
||||
- changed fried potato recipe from potato to skinned potato\
|
||||
- added pepper
|
||||
- added cake
|
||||
- made by mixing baked batter and cream
|
||||
- added icing sugar
|
||||
- made by smashing sugar
|
||||
- added icing
|
||||
- made by shift-mixing icing sugar
|
||||
- noodles description
|
||||
- bug fix (freezing crushed worms makes them alive)
|
||||
*/
|
||||
|
||||
/*
|
||||
elements.test = {
|
||||
//other needed properties
|
||||
cutInto: "elem"
|
||||
}
|
||||
*/
|
||||
|
||||
elements.knife = {
|
||||
color: "#adb5bd",
|
||||
// other needed properties
|
||||
tool: (pixel) => {
|
||||
//store cutInto as a variable for legibility
|
||||
var cutInto = elements[pixel.element].cutInto;
|
||||
//if there’s no cutInto, it should equal undefined, which is falsey and !undefined = true
|
||||
if (!cutInto) { return };
|
||||
//if cutInto is an array, randomly pick one of its elements
|
||||
if(cutInto instanceof Array) { cutInto = cutInto[Math.floor(Math.random() * cutInto.length)] };
|
||||
//change pixel into the (chosen) element
|
||||
changePixel(pixel, cutInto)
|
||||
},
|
||||
category:"tools",
|
||||
}
|
||||
|
||||
elements.chicken = {
|
||||
color: ["#c29046", "#f5d271", "#d4bd7d"],
|
||||
behavior: [
|
||||
|
|
@ -249,6 +299,7 @@ if (!elements.broth.reactions) elements.broth.reactions = {};
|
|||
elements.broth.reactions.water = { elem1: "soup", elem2: "soup" }
|
||||
|
||||
elements.noodles = {
|
||||
desc: "whatever noodles",
|
||||
color: ["#F3BA4F", "#F7D161"],
|
||||
behavior: behaviors.POWDER,
|
||||
category: "food",
|
||||
|
|
@ -315,7 +366,7 @@ elements.crushed_worm = {
|
|||
tempHigh: 50,
|
||||
stateHigh: ["ash", "smoke"],
|
||||
tempLow: -4,
|
||||
stateLow: "frozen_worm",
|
||||
stateLow: "frozen_crushed_worm",
|
||||
density: 200.33,
|
||||
isFood: true,
|
||||
hidden: true,
|
||||
|
|
@ -520,7 +571,6 @@ elements.olive = {
|
|||
isFood: false
|
||||
}
|
||||
|
||||
|
||||
elements.cooking_oil = {
|
||||
color: "#ffc844",
|
||||
behavior: behaviors.LIQUID,
|
||||
|
|
@ -533,25 +583,37 @@ elements.cooking_oil = {
|
|||
viscosity: 250,
|
||||
state: "liquid",
|
||||
density: 825,
|
||||
hidden: true,
|
||||
temp: 30,
|
||||
reaction: {
|
||||
"potato": {elem1: "fried_potato", tempMin: 70}
|
||||
reactions: {
|
||||
"peeled_potato": {elem2: "fried_potato", tempMin: 70}
|
||||
}
|
||||
},
|
||||
|
||||
/*
|
||||
|
||||
elements.potato_skin = {
|
||||
color: ["#DC8A5A", "#A86C36", "#DC9A59", "#A76B35"],
|
||||
behavior: behaviors.STURDYPOWDER,
|
||||
elements.pepper = {
|
||||
color: ["#1f190a", "#2b200d", "#362712", "#3b2211"],
|
||||
behavior: behaviors.POWDER,
|
||||
category: "food",
|
||||
state: "solid",
|
||||
isFood: true,
|
||||
temp: 20,
|
||||
hidden: true,
|
||||
tempHigh: 250,
|
||||
stateHigh: ["ash", "smoke"]
|
||||
stateHigh: ["ash", "smoke"],
|
||||
}
|
||||
|
||||
elements.potato.cutInto = ["peeled_potato","peeled_potato","peeled_potato","potato_skin"]//{elem1: ["potato_skin","peeled_potato"] }
|
||||
|
||||
elements.potato_skin = {
|
||||
color: ["#DC8A5A", "#A86C36", "#DC9A59", "#A76B35"],
|
||||
behavior: behaviors.POWDER,
|
||||
category: "food",
|
||||
state: "solid",
|
||||
isFood: true,
|
||||
temp: 20,
|
||||
hidden: true,
|
||||
density: 1100,
|
||||
tempHigh: 250,
|
||||
stateHigh: ["ash", "smoke"],
|
||||
}
|
||||
|
||||
elements.peeled_potato = {
|
||||
|
|
@ -562,13 +624,15 @@ elements.peeled_potato = {
|
|||
isFood: true,
|
||||
temp: 20,
|
||||
hidden: true,
|
||||
reaction: {
|
||||
breakInto: "mashed_potato",
|
||||
tempHigh: 176,
|
||||
stateHigh: "baked_potato",
|
||||
density: 1100,
|
||||
reactions: {
|
||||
"cooking_oil": { elem1: "fried_potato", tempMin: 70 }
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
elements.fried_potato = {
|
||||
color: ["#DD7908", "#D57206", "#CA6801", "#D68001"],
|
||||
behavior: behaviors.STURDYPOWDER,
|
||||
|
|
@ -577,6 +641,242 @@ elements.fried_potato = {
|
|||
temp: 35,
|
||||
hidden: true,
|
||||
tempHigh: 600,
|
||||
density: 1110,
|
||||
stateHigh: ["ash", "smoke"],
|
||||
isFood: true,
|
||||
}
|
||||
|
||||
elements.applewood = {
|
||||
color: "#632e1f",
|
||||
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.apple_branch = {
|
||||
color: "#632e1f",
|
||||
behavior: [
|
||||
"CR:apple_leaves,apple_branch%2|CR:apple_leaves,apple_branch%2|CR:apple_leaves,apple_branch%2",
|
||||
"XX|XX|XX",
|
||||
"XX|XX|XX",
|
||||
],
|
||||
tempHigh: 100,
|
||||
stateHigh: "applewood",
|
||||
tempLow: -30,
|
||||
stateLow: "applewood",
|
||||
category: "life",
|
||||
burn: 40,
|
||||
burnTime: 50,
|
||||
burnInto: ["sap","ember","charcoal"],
|
||||
hidden: true,
|
||||
state: "solid",
|
||||
density: 1500,
|
||||
hardness: 0.15,
|
||||
breakInto: ["sap","sawdust"],
|
||||
}
|
||||
elements.apple_leaves = {
|
||||
color: ["#00d404","#0ec911","#109e12"],
|
||||
behavior: [
|
||||
"XX|XX|XX",
|
||||
"XX|XX|XX",
|
||||
"XX|CR:apple%0.15|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.apple = {
|
||||
color: ["#eb1a1a","#f22c2c","#d62020"],
|
||||
behavior: behaviors.POWDER,
|
||||
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:"food",
|
||||
tempHigh: 100,
|
||||
stateHigh: "dead_plant",
|
||||
tempLow: -1.66,
|
||||
stateLow: "frozen_plant",
|
||||
burn:65,
|
||||
burnTime:60,
|
||||
burnInto: "dead_plant",
|
||||
breakInto: "apple_juice",
|
||||
cutInto: "apple_slice",
|
||||
state: "solid",
|
||||
density: 1050,
|
||||
}
|
||||
|
||||
elements.apple_slice = {
|
||||
color: "#f0af37",
|
||||
behavior: behaviors.STURDYPOWDER,
|
||||
category:"food",
|
||||
tempHigh: 100,
|
||||
stateHigh: ["sugar","steam"],
|
||||
burn:65,
|
||||
burnTime:60,
|
||||
burnInto: "dead_plant",
|
||||
breakInto: "apple_juice",
|
||||
state: "solid",
|
||||
density: 1050,
|
||||
hidden: true,
|
||||
}
|
||||
|
||||
elements.apple_seed = {
|
||||
color: "#854610",
|
||||
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 ? "applewood" : "apple_branch",pixel.x,pixel.y+1);
|
||||
}
|
||||
}
|
||||
else if (pixel.age > 1000) {
|
||||
changePixel(pixel,"applewood");
|
||||
}
|
||||
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",
|
||||
],
|
||||
};
|
||||
|
||||
elements.apple_juice = {
|
||||
color: "#ffde55",
|
||||
behavior: behaviors.LIQUID,
|
||||
category: "liquids",
|
||||
tempHigh: 400,
|
||||
stateHigh: "fire",
|
||||
burn: 70,
|
||||
burnTime: 300,
|
||||
burnInto: ["steam", "smoke"],
|
||||
state: "liquid",
|
||||
density: 825,
|
||||
hidden: true,
|
||||
temp: 30,
|
||||
reactions: {
|
||||
"sugar": { elem1:"apple_jam", elem2:null, chance:0.35 }
|
||||
},
|
||||
};
|
||||
|
||||
elements.cake = {
|
||||
color: ["#f2e5bf","#e8daba"],
|
||||
behavior: behaviors.STURDYPOWDER,
|
||||
tempHigh: 550,
|
||||
stateHigh: "ash",
|
||||
category: "food",
|
||||
burn: 10,
|
||||
burnTime: 400,
|
||||
burnInto: ["smoke","smoke","smoke","ash"],
|
||||
breakInto: "crumb",
|
||||
state: "solid",
|
||||
density: 233.96,
|
||||
hidden: true,
|
||||
isFood: true
|
||||
};
|
||||
|
||||
elements.icing_sugar = {
|
||||
color: "#f8f8f1",
|
||||
behavior: behaviors.POWDER,
|
||||
onMix: function(icing_sugar1, icing_sugar2) {
|
||||
if (shiftDown && Math.random() < 0.2) {
|
||||
changePixel(icing_sugar1,"icing")
|
||||
}
|
||||
},
|
||||
tempHigh: 186,
|
||||
stateHigh: "caramel",
|
||||
viscosity: 1.5,
|
||||
category: "food",
|
||||
state: "solid",
|
||||
hidden: true,
|
||||
density: 1036.86,
|
||||
isFood: true
|
||||
};
|
||||
|
||||
elements.icing = {
|
||||
color: "#fefefb",
|
||||
behavior: behaviors.STURDYPOWDER,
|
||||
onMix: function(icing_sugar1, icing_sugar2) {
|
||||
if ((shiftDown && Math.random() < 0.2) || (elements[icing_sugar2.element].id === elements.icing_sugar.id && Math.random() < 0.25)) {
|
||||
changePixel(icing_sugar1,"icing")
|
||||
}
|
||||
},
|
||||
viscosity: 1.5,
|
||||
tempHigh: 1000,
|
||||
stateHigh: ["smoke","smoke","smoke","steam","steam","calcium"],
|
||||
stateLowColorMultiplier: 0.97,
|
||||
category: "food",
|
||||
isFood: true,
|
||||
state: "solid",
|
||||
density: 959.97,
|
||||
};
|
||||
|
||||
elements.cream.reactions.baked_batter = {elem2: "cake" }
|
||||
|
||||
elements.sugar.breakInto = {elem1: "icing_sugar"}
|
||||
|
||||
elements.apple_jam = {
|
||||
color: "#ebc034",
|
||||
behavior: behaviors.LIQUID,
|
||||
category: "food",
|
||||
tempHigh: 400,
|
||||
stateHigh: ["sugar","smoke"],
|
||||
burn: 70,
|
||||
burnTime: 300,
|
||||
viscosity: 750,
|
||||
state: "liquid",
|
||||
density: 825,
|
||||
hidden: true
|
||||
};
|
||||
Loading…
Reference in New Issue