Use upcoming code library
This commit is contained in:
parent
6a27b228ea
commit
d4d5783637
|
|
@ -1,5 +1,7 @@
|
||||||
urlParams = new URLSearchParams(window.location.search);
|
var modName = "mods/random_liquids.js";
|
||||||
|
var libraryMod = "mods/code_library.js";
|
||||||
|
|
||||||
|
if(enabledMods.includes(libraryMod)) {
|
||||||
if(urlParams.get('liquidAmount') != null) { //null check
|
if(urlParams.get('liquidAmount') != null) { //null check
|
||||||
liquidAmount = urlParams.get('liquidAmount')
|
liquidAmount = urlParams.get('liquidAmount')
|
||||||
if(isNaN(liquidAmount) || liquidAmount === "" || liquidAmount === null) { //NaN check
|
if(isNaN(liquidAmount) || liquidAmount === "" || liquidAmount === null) { //NaN check
|
||||||
|
|
@ -17,18 +19,6 @@ if(urlParams.get('makeLiquidString') !== null) { //if the variable exists at all
|
||||||
makeLiquidString = false
|
makeLiquidString = false
|
||||||
}
|
}
|
||||||
|
|
||||||
function _randomInt(max) {
|
|
||||||
if(max >= 0) {
|
|
||||||
return Math.floor(Math.random() * (max + 1))
|
|
||||||
} else {
|
|
||||||
return 0 - Math.floor(Math.random() * (Math.abs(max) + 1))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function _randomArrayChoice(array) {
|
|
||||||
return array[_randomInt(array.length - 1)]
|
|
||||||
}
|
|
||||||
|
|
||||||
//arbitrarily picked
|
//arbitrarily picked
|
||||||
const initialArrayL = ["m","n","p","t","ch","k","b","d","j","g","f","th","s","sh","h","l","r","y","w","z","sp","st","sk","sl","spl","stl","skl","sr","spr","str","skr","sl","fl","fr","pl","pr","tl","tr","kl","kr","shr","fl","fr","thr"] //:eggTF:
|
const initialArrayL = ["m","n","p","t","ch","k","b","d","j","g","f","th","s","sh","h","l","r","y","w","z","sp","st","sk","sl","spl","stl","skl","sr","spr","str","skr","sl","fl","fr","pl","pr","tl","tr","kl","kr","shr","fl","fr","thr"] //:eggTF:
|
||||||
const vowelArrayL = ["a","e","i","o","u","ay","ee","ie","oa","ew","oo","oi","ow"] //:eggTF:
|
const vowelArrayL = ["a","e","i","o","u","ay","ee","ie","oa","ew","oo","oi","ow"] //:eggTF:
|
||||||
|
|
@ -39,29 +29,29 @@ function generateName() {
|
||||||
//these are picked arbitrarily
|
//these are picked arbitrarily
|
||||||
|
|
||||||
//console.log("getting random type")
|
//console.log("getting random type")
|
||||||
var randomInt1 = _randomInt(6)
|
var randomInt1 = randomIntegerFromZeroToValue(6)
|
||||||
|
|
||||||
//console.log("generating type " + randomInt1)
|
//console.log("generating type " + randomInt1)
|
||||||
if(randomInt1 == 0) {
|
if(randomInt1 == 0) {
|
||||||
var randomName = _randomArrayChoice(initialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(finalArrayL)
|
var randomName = randomChoice(initialArrayL) + randomChoice(vowelArrayL) + randomChoice(finalArrayL)
|
||||||
//console.log("generated T" + randomInt1 + " name")
|
//console.log("generated T" + randomInt1 + " name")
|
||||||
} else if(randomInt1 == 1) {
|
} else if(randomInt1 == 1) {
|
||||||
var randomName = _randomArrayChoice(initialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(medialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(finalArrayL)
|
var randomName = randomChoice(initialArrayL) + randomChoice(vowelArrayL) + randomChoice(medialArrayL) + randomChoice(vowelArrayL) + randomChoice(finalArrayL)
|
||||||
//console.log("generated T" + randomInt1 + " name")
|
//console.log("generated T" + randomInt1 + " name")
|
||||||
} else if(randomInt1 == 2) {
|
} else if(randomInt1 == 2) {
|
||||||
var randomName = _randomArrayChoice(initialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(finalArrayL) + "e"
|
var randomName = randomChoice(initialArrayL) + randomChoice(vowelArrayL) + randomChoice(finalArrayL) + "e"
|
||||||
//console.log("generated T" + randomInt1 + " name")
|
//console.log("generated T" + randomInt1 + " name")
|
||||||
} else if(randomInt1 == 3) {
|
} else if(randomInt1 == 3) {
|
||||||
var randomName = _randomArrayChoice(initialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(medialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(medialArrayL) + _randomArrayChoice(finalArrayL)
|
var randomName = randomChoice(initialArrayL) + randomChoice(vowelArrayL) + randomChoice(medialArrayL) + randomChoice(vowelArrayL) + randomChoice(medialArrayL) + randomChoice(finalArrayL)
|
||||||
//console.log("generated T" + randomInt1 + " name")
|
//console.log("generated T" + randomInt1 + " name")
|
||||||
} else if(randomInt1 == 4) {
|
} else if(randomInt1 == 4) {
|
||||||
var randomName = _randomArrayChoice(vowelArrayL) + _randomArrayChoice(initialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(finalArrayL)
|
var randomName = randomChoice(vowelArrayL) + randomChoice(initialArrayL) + randomChoice(vowelArrayL) + randomChoice(finalArrayL)
|
||||||
//console.log("generated T" + randomInt1 + " name")
|
//console.log("generated T" + randomInt1 + " name")
|
||||||
} else if(randomInt1 == 5) {
|
} else if(randomInt1 == 5) {
|
||||||
var randomName = _randomArrayChoice(initialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(medialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(medialArrayL) + _randomArrayChoice(vowelArrayL)
|
var randomName = randomChoice(initialArrayL) + randomChoice(vowelArrayL) + randomChoice(medialArrayL) + randomChoice(vowelArrayL) + randomChoice(medialArrayL) + randomChoice(vowelArrayL)
|
||||||
//console.log("generated T" + randomInt1 + " name")
|
//console.log("generated T" + randomInt1 + " name")
|
||||||
} else if(randomInt1 == 6) {
|
} else if(randomInt1 == 6) {
|
||||||
var randomName = _randomArrayChoice(initialArrayL) + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(medialArrayL) + _randomArrayChoice(vowelArrayL)
|
var randomName = randomChoice(initialArrayL) + randomChoice(vowelArrayL) + randomChoice(medialArrayL) + randomChoice(vowelArrayL)
|
||||||
//console.log("generated T" + randomInt1 + " name")
|
//console.log("generated T" + randomInt1 + " name")
|
||||||
} else {
|
} else {
|
||||||
var randomName = randomArrayChoice(vowelArrayL) + randomArrayChoice(medialArrayL) + randomArrayChoice(vowelArrayL) + randomArrayChoice(finalArrayL)
|
var randomName = randomArrayChoice(vowelArrayL) + randomArrayChoice(medialArrayL) + randomArrayChoice(vowelArrayL) + randomArrayChoice(finalArrayL)
|
||||||
|
|
@ -74,133 +64,22 @@ function generateName() {
|
||||||
const whiteColor = {r: 255, g: 255, b: 255}
|
const whiteColor = {r: 255, g: 255, b: 255}
|
||||||
const blackColor = {r: 0, g: 0, b: 0}
|
const blackColor = {r: 0, g: 0, b: 0}
|
||||||
|
|
||||||
function _rgbToHex(color) {
|
|
||||||
if(typeof(color) == "object") { //Expects object like "{r: 172, g: 11, b: 34}"
|
|
||||||
//console.log("Loading colors");
|
|
||||||
//console.log("Loading R");
|
|
||||||
var red = color.r;
|
|
||||||
//console.log("Loading G");
|
|
||||||
var green = color.g;
|
|
||||||
//console.log("Loading B");
|
|
||||||
var blue = color.b;
|
|
||||||
//console.log("Rounding R");
|
|
||||||
red = Math.round(red);
|
|
||||||
//console.log("Rounding G");
|
|
||||||
green = Math.round(green);
|
|
||||||
//console.log("Rounding B");
|
|
||||||
blue = Math.round(blue);
|
|
||||||
//console.log("Bounding R");
|
|
||||||
red = Math.min(255,Math.max(0,red));
|
|
||||||
//console.log("Bounding G");
|
|
||||||
green = Math.min(255,Math.max(0,green));
|
|
||||||
//console.log("Bounding B");
|
|
||||||
blue = Math.min(255,Math.max(0,blue));
|
|
||||||
//console.log("Converting R");
|
|
||||||
red = red.toString(16);
|
|
||||||
//console.log("Converting G");
|
|
||||||
green = green.toString(16);
|
|
||||||
//console.log("Converting B");
|
|
||||||
blue = blue.toString(16);
|
|
||||||
//console.log("Padding R");
|
|
||||||
while(red.length < 2) {
|
|
||||||
red = "0" + red;
|
|
||||||
};
|
|
||||||
//console.log("Padding G");
|
|
||||||
while(green.length < 2) {
|
|
||||||
green = "0" + green;
|
|
||||||
};
|
|
||||||
//console.log("Padding B");
|
|
||||||
while(blue.length < 2) {
|
|
||||||
blue = "0" + blue;
|
|
||||||
};
|
|
||||||
//console.log("Concatenating");
|
|
||||||
return "#" + red + green + blue;
|
|
||||||
} else if(typeof(color) == "string") { //Expects string like "rgb(20,137,4)". Also doesn't round properly for some reason...
|
|
||||||
//console.log("Splitting string")
|
|
||||||
color = color.split(",");
|
|
||||||
//console.log("Getting R");
|
|
||||||
var red = parseFloat(color[0].substring(4))
|
|
||||||
//console.log("Getting G");
|
|
||||||
var green = parseFloat(color[1])
|
|
||||||
//console.log("Getting B");
|
|
||||||
var blue = parseFloat(color[2].slice(0,-1))
|
|
||||||
//console.log("Rounding R");
|
|
||||||
red = Math.round(red);
|
|
||||||
//console.log("Rounding G");
|
|
||||||
green = Math.round(green);
|
|
||||||
//console.log("Rounding B");
|
|
||||||
blue = Math.round(blue);
|
|
||||||
//console.log("Bounding R");
|
|
||||||
red = Math.min(255,Math.max(0,red));
|
|
||||||
//console.log("Bounding G");
|
|
||||||
green = Math.min(255,Math.max(0,green));
|
|
||||||
//console.log("Bounding B");
|
|
||||||
blue = Math.min(255,Math.max(0,blue));
|
|
||||||
//console.log("Converting R");
|
|
||||||
red = red.toString(16);
|
|
||||||
//console.log("Converting G");
|
|
||||||
green = green.toString(16);
|
|
||||||
//console.log("Converting B");
|
|
||||||
blue = blue.toString(16);
|
|
||||||
//console.log("Padding R");
|
|
||||||
while(red.length < 2) {
|
|
||||||
red = "0" + red;
|
|
||||||
};
|
|
||||||
//console.log("Padding G");
|
|
||||||
while(green.length < 2) {
|
|
||||||
green = "0" + green;
|
|
||||||
};
|
|
||||||
//console.log("Padding B");
|
|
||||||
while(blue.length < 2) {
|
|
||||||
blue = "0" + blue;
|
|
||||||
};
|
|
||||||
//console.log("Concatenating");
|
|
||||||
return "#" + red + green + blue;
|
|
||||||
} else {
|
|
||||||
throw "error: Only objects and strings are supported."
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
function _multiplyColorObjects(color1,color2,weight1=0.5) { /*third argument is for color1 and expects a float from 0
|
|
||||||
to 1, where 0 means "all color2" and 1 means "all color1"*/
|
|
||||||
var w1 = Math.min(Math.max(weight1,0),1)
|
|
||||||
var red1 = color1.r
|
|
||||||
var green1 = color1.g
|
|
||||||
var blue1 = color1.b
|
|
||||||
var red2 = color2.r
|
|
||||||
var green2 = color2.g
|
|
||||||
var blue2 = color2.b
|
|
||||||
var red3 = (red1 * w1) + (red2 * (1 - w1))
|
|
||||||
var green3 = (green1 * w1) + (green2 * (1 - w1))
|
|
||||||
var blue3 = (blue1 * w1) + (blue2 * (1 - w1))
|
|
||||||
return {r: red3, g: green3, b: blue3}
|
|
||||||
}
|
|
||||||
|
|
||||||
function generateColors() {
|
function generateColors() {
|
||||||
var randomR = _randomInt(255)
|
var randomR = randomIntegerFromZeroToValue(255)
|
||||||
var randomG = _randomInt(255)
|
var randomG = randomIntegerFromZeroToValue(255)
|
||||||
var randomB = _randomInt(255)
|
var randomB = randomIntegerFromZeroToValue(255)
|
||||||
var randomColor = {r: randomR, g: randomG, b: randomB}
|
var randomColor = {r: randomR, g: randomG, b: randomB}
|
||||||
var newLiquidColor = _multiplyColorObjects(whiteColor,randomColor,weight1=0.1)
|
var newLiquidColor = averageColorObjects(whiteColor,randomColor,weight1=0.1)
|
||||||
var newSolidColor = _multiplyColorObjects(whiteColor,randomColor,weight1=0.4)
|
var newSolidColor = averageColorObjects(whiteColor,randomColor,weight1=0.4)
|
||||||
var newGasColor = _multiplyColorObjects(whiteColor,randomColor,weight1=0.7)
|
var newGasColor = averageColorObjects(whiteColor,randomColor,weight1=0.7)
|
||||||
var newLiquidColor = _rgbToHex(newLiquidColor)
|
var newLiquidColor = rgbToHex(newLiquidColor)
|
||||||
var newSolidColor = _rgbToHex(newSolidColor)
|
var newSolidColor = rgbToHex(newSolidColor)
|
||||||
var newGasColor = _rgbToHex(newGasColor)
|
var newGasColor = rgbToHex(newGasColor)
|
||||||
return [newLiquidColor, newSolidColor, newGasColor]
|
return [newLiquidColor, newSolidColor, newGasColor]
|
||||||
}
|
}
|
||||||
|
|
||||||
function _add2(number1,number2) {
|
|
||||||
return number1 + number2
|
|
||||||
}
|
|
||||||
|
|
||||||
function _arrayAverage(array) {
|
|
||||||
var total = array.reduce(_add2,0)
|
|
||||||
return total / array.length
|
|
||||||
}
|
|
||||||
|
|
||||||
function _generateAveragedRandoms() {
|
function _generateAveragedRandoms() {
|
||||||
return _arrayAverage([Math.random(),Math.random(),Math.random()])
|
return averageNumericArray([Math.random(),Math.random(),Math.random()])
|
||||||
}
|
}
|
||||||
|
|
||||||
function avgRndToMult() {
|
function avgRndToMult() {
|
||||||
|
|
@ -238,7 +117,7 @@ for(i = 0; i < liquidAmount; i++) {
|
||||||
var boilingPoint = freezingPoint + Math.abs((273 * (avgRndToMult() ** 9)) - 273);
|
var boilingPoint = freezingPoint + Math.abs((273 * (avgRndToMult() ** 9)) - 273);
|
||||||
var gasDensity = 0.00143 * avgRndToMult() * 1000 * densityAdjustment;
|
var gasDensity = 0.00143 * avgRndToMult() * 1000 * densityAdjustment;
|
||||||
if(typeof(elements[name]) != "undefined") {
|
if(typeof(elements[name]) != "undefined") {
|
||||||
name = name + _randomArrayChoice(vowelArrayL) + _randomArrayChoice(finalArrayL);
|
name = name + randomChoice(vowelArrayL) + randomChoice(finalArrayL);
|
||||||
};
|
};
|
||||||
liquidConductivityAdjust = 0.5 * Math.sqrt(avgRndToMult());
|
liquidConductivityAdjust = 0.5 * Math.sqrt(avgRndToMult());
|
||||||
|
|
||||||
|
|
@ -329,3 +208,8 @@ for(i = 0; i < liquidAmount; i++) {
|
||||||
if(makeLiquidString == true) {
|
if(makeLiquidString == true) {
|
||||||
console.log(`Liquids added to liquidString (length ${liquidString.length})`)
|
console.log(`Liquids added to liquidString (length ${liquidString.length})`)
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
alert(`The ${libraryMod} mod is required and has been automatically inserted (reload for this to take effect).`)
|
||||||
|
enabledMods.splice(enabledMods.indexOf(modName),0,libraryMod)
|
||||||
|
localStorage.setItem("enabledMods", JSON.stringify(enabledMods));
|
||||||
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue