fix inter-mod interference
This commit is contained in:
parent
4f1def8d33
commit
abf1029de7
|
|
@ -1,3 +1,7 @@
|
||||||
|
var modName = "mods/randomness.js";
|
||||||
|
var libraryMod = "mods/code_library.js";
|
||||||
|
|
||||||
|
if(enabledMods.includes(libraryMod)) {
|
||||||
//i made some stupid things
|
//i made some stupid things
|
||||||
|
|
||||||
//TPT reference
|
//TPT reference
|
||||||
|
|
@ -158,6 +162,8 @@ elements.black_decay = { //random mystcraft mod reference
|
||||||
excludeRandom: true,
|
excludeRandom: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
elements.steel.behavior = behaviors.FAIRYKILL;
|
||||||
|
|
||||||
elements.tungstensteel = {
|
elements.tungstensteel = {
|
||||||
color: "#555589",
|
color: "#555589",
|
||||||
behavior: behaviors.FAIRYKILL,
|
behavior: behaviors.FAIRYKILL,
|
||||||
|
|
@ -676,96 +682,36 @@ elements.molten_densinium = {
|
||||||
|
|
||||||
elements.acid.ignore.push("densinium","molten_densinium")
|
elements.acid.ignore.push("densinium","molten_densinium")
|
||||||
|
|
||||||
//https://gist.github.com/kig/2115205
|
|
||||||
function hslToHex(c) {
|
|
||||||
var hue=0, saturation=0, lightness=0;
|
|
||||||
var tmp = 0;
|
|
||||||
for (var i=0,j=0,k=0; i<c.length; i++) {
|
|
||||||
var ch = c.charCodeAt(i);
|
|
||||||
if (ch >= 48 && ch <= 57) {
|
|
||||||
tmp = tmp * 10 + (ch-48);
|
|
||||||
k = 1;
|
|
||||||
continue;
|
|
||||||
} else if (k === 1) {
|
|
||||||
switch(j) {
|
|
||||||
case 0: hue = (tmp % 360) / 360; break;
|
|
||||||
case 1:
|
|
||||||
saturation = (tmp > 100 ? 100 : tmp) / 100; break;
|
|
||||||
case 2:
|
|
||||||
lightness = (tmp > 100 ? 100 : tmp) / 100; break;
|
|
||||||
}
|
|
||||||
j++;
|
|
||||||
}
|
|
||||||
k = 0;
|
|
||||||
tmp = 0;
|
|
||||||
}
|
|
||||||
var h = (hue / (1/6));
|
|
||||||
var c = (1-Math.abs(2*lightness-1))*saturation;
|
|
||||||
var x = c * (1-Math.abs((h%2)-1));
|
|
||||||
switch (h | 0) {
|
|
||||||
case 0: r=c; g=x; b=0; break;
|
|
||||||
case 1: r=x; g=c; b=0; break;
|
|
||||||
case 2: r=0; g=c; b=x; break;
|
|
||||||
case 3: r=0; g=x; b=c; break;
|
|
||||||
case 4: r=x; g=0; b=c; break;
|
|
||||||
case 5: r=c; g=0; b=x; break;
|
|
||||||
}
|
|
||||||
var m = lightness - 0.5*c;
|
|
||||||
r+=m; g+=m; b+=m;
|
|
||||||
r=r*255|0; g=g*255|0; b=b*255|0;
|
|
||||||
var hex = '#';
|
|
||||||
k = (r >> 4 & 0xf) + 48;
|
|
||||||
if (k > 57) k += 7;
|
|
||||||
hex += String.fromCharCode(k);
|
|
||||||
k = (r & 0xf) + 48;
|
|
||||||
if (k > 57) k += 7;
|
|
||||||
hex += String.fromCharCode(k);
|
|
||||||
k = (g >> 4 & 0xf) + 48;
|
|
||||||
if (k > 57) k += 7;
|
|
||||||
hex += String.fromCharCode(k);
|
|
||||||
k = (g & 0xf) + 48;
|
|
||||||
if (k > 57) k += 7;
|
|
||||||
hex += String.fromCharCode(k);
|
|
||||||
k = (b >> 4 & 0xf) + 48;
|
|
||||||
if (k > 57) k += 7;
|
|
||||||
hex += String.fromCharCode(k);
|
|
||||||
k = (b & 0xf) + 48;
|
|
||||||
if (k > 57) k += 7;
|
|
||||||
hex += String.fromCharCode(k);
|
|
||||||
return hex;
|
|
||||||
}
|
|
||||||
//e.g. hslToHex("hsl(60,100,100)")
|
|
||||||
|
|
||||||
rainbowDustArray = []
|
rainbowDustArray = []
|
||||||
for(i = 0; i < 24; i++) {
|
for(i = 0; i < 24; i++) {
|
||||||
rainbowDustArray.push("hsl(" + (i * 15) + ",15,45)")
|
rainbowDustArray.push([i * 15,15,45])
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; i < rainbowDustArray.length; i++) {
|
for(i = 0; i < rainbowDustArray.length; i++) {
|
||||||
rainbowDustArray[i] = hslToHex(rainbowDustArray[i])
|
rainbowDustArray[i] = hslToHex(...rainbowDustArray[i])
|
||||||
}
|
}
|
||||||
|
|
||||||
rainbowStoneArray = []
|
rainbowStoneArray = []
|
||||||
for(i = 0; i < 24; i++) {
|
for(i = 0; i < 24; i++) {
|
||||||
rainbowStoneArray.push("hsl(" + (i * 15) + ",40,48)")
|
rainbowStoneArray.push([i * 15,40,48])
|
||||||
rainbowStoneArray.push("hsl(" + (i * 15) + ",48,38)")
|
rainbowStoneArray.push([i * 15,48,38])
|
||||||
rainbowStoneArray.push("hsl(" + (i * 15) + ",52,47)")
|
rainbowStoneArray.push([i * 15,52,47])
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; i < rainbowStoneArray.length; i++) {
|
for(i = 0; i < rainbowStoneArray.length; i++) {
|
||||||
rainbowStoneArray[i] = hslToHex(rainbowStoneArray[i])
|
rainbowStoneArray[i] = hslToHex(...rainbowStoneArray[i])
|
||||||
}
|
}
|
||||||
|
|
||||||
rainbowGravelArray = []
|
rainbowGravelArray = []
|
||||||
for(i = 0; i < 24; i++) {
|
for(i = 0; i < 24; i++) {
|
||||||
rainbowGravelArray.push("hsl(" + (i * 15) + ",35,58)")
|
rainbowGravelArray.push([i * 15,35,58])
|
||||||
rainbowGravelArray.push("hsl(" + (i * 15) + ",38,49)")
|
rainbowGravelArray.push([i * 15,38,49])
|
||||||
rainbowGravelArray.push("hsl(" + (i * 15) + ",53,63)")
|
rainbowGravelArray.push([i * 15,53,63])
|
||||||
rainbowGravelArray.push("hsl(" + (i * 15) + ",23,32)")
|
rainbowGravelArray.push([i * 15,23,32])
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; i < rainbowGravelArray.length; i++) {
|
for(i = 0; i < rainbowGravelArray.length; i++) {
|
||||||
rainbowGravelArray[i] = hslToHex(rainbowGravelArray[i])
|
rainbowGravelArray[i] = hslToHex(...rainbowGravelArray[i])
|
||||||
}
|
}
|
||||||
|
|
||||||
elements.rainbow_stone = {
|
elements.rainbow_stone = {
|
||||||
|
|
@ -906,3 +852,8 @@ runAfterLoad(function() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
if(!enabledMods.includes(libraryMod)) { enabledMods.splice(enabledMods.indexOf(modName),0,libraryMod) };
|
||||||
|
alert(`The "${libraryMod}" mod is required and has been automatically inserted (reload for this to take effect).`)
|
||||||
|
localStorage.setItem("enabledMods", JSON.stringify(enabledMods));
|
||||||
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue