commodore
/
sandboxels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugg ficses 4

This commit is contained in:
An Orbit 2024-06-26 11:39:24 -04:00 committed by GitHub
parent beedbd5553
commit a52f7ae3cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mods/a_mod_by_alice.js
View File

@ -5099,7 +5099,7 @@ color1 and color2 spread through striped paint like dye does with itself. <u>col
}); });
//CONFIGURABLE MAXIMUM COLOR OFFSET (maxColorOffset) ## //CONFIGURABLE MAXIMUM COLOR OFFSET (maxColorOffset) ##
defaultColorOffset = 15; defaultColorOffset = 15;
pixelColorPick = function(pixel,customColor=null,maxOffset=null) { pixelColorPick = function(pixel,customColor=null,maxOffset=null,dontForceColorsToNulls=false) {
var element = pixel.element; var element = pixel.element;
var elementInfo = elements[element]; var elementInfo = elements[element];
//if (elementInfo.behavior instanceof Array) { //if (elementInfo.behavior instanceof Array) {
@ -5131,11 +5131,18 @@ color1 and color2 spread through striped paint like dye does with itself. <u>col
}; };
if(typeof(rgb) !== "object") { rgb = convertColorFormats(rgb,"json") }; //somehow rgb can be a hex triplet even though it's pulled from the f*cking JSON color object and there's no logical way that that should be able to happen if(typeof(rgb) !== "object") { rgb = convertColorFormats(rgb,"json") }; //somehow rgb can be a hex triplet even though it's pulled from the f*cking JSON color object and there's no logical way that that should be able to happen
var maxColorOffset = Math.floor(Math.random() * (Math.random() > 0.5 ? -1 : 1) * Math.random() * offsetAmount); var maxColorOffset = Math.floor(Math.random() * (Math.random() > 0.5 ? -1 : 1) * Math.random() * offsetAmount);
if((typeof(rgb?.r) !== "number") || (typeof(rgb?.g) !== "number") || (typeof(rgb?.b) !== "number")) { var maxRepickTries = 10;
console.log(pixel.element,pixel.color,"\n",rgb,customColor); var repickTries = 0;
var rgbWasNull = (rgb === null);
if(rgb == null || (typeof(rgb?.r) !== "number") || (typeof(rgb?.g) !== "number") || (typeof(rgb?.b) !== "number")) {
//console.log(pixel.element,pixel.color,"\n",rgb,customColor,Array.isArray(elementInfo.colorObject) ? elementInfo.colorObject.indexOf(rgb) : elementInfo.colorObject);
//this SHOULDN'T be necessary but SOMEHOW IT IS //this SHOULDN'T be necessary but SOMEHOW IT IS
var color_also_fxck_you = elementInfo.colorObject; while(rgb == null && repickTries < maxRepickTries) {
while(Array.isarray(color_also_fxck_you)) { color_also_fxck_you = randomChoice(color_also_fxck_you) } var color_also_fxck_you = elementInfo.colorObject;
while(Array.isArray(color_also_fxck_you)) { color_also_fxck_you = randomChoice(color_also_fxck_you) };
rgb = color_also_fxck_you
};
//console.log(pixel.element,pixel.color,rgb,customColor);
}; };
var r = rgb.r + maxColorOffset; var r = rgb.r + maxColorOffset;
var g = rgb.g + maxColorOffset; var g = rgb.g + maxColorOffset;
@ -5152,6 +5159,9 @@ color1 and color2 spread through striped paint like dye does with itself. <u>col
color = color[Math.floor(Math.random() * color.length)]; color = color[Math.floor(Math.random() * color.length)];
} }
}*/ }*/
if((!dontForceColorsToNulls) && rgbWasNull && rgb !== null) {
pixel.color = convertColorFormats(rgb,"rgb")
};
return color; return color;
} }
//FIND MODE, PIXEL PROPERTIES LINKED TO SPECIAL CODE, CONFIGURABLE VISUAL DISTORTION AND VISUAL PIXEL SHAPE SETTINGS (acid_and_shapes.js) ## //FIND MODE, PIXEL PROPERTIES LINKED TO SPECIAL CODE, CONFIGURABLE VISUAL DISTORTION AND VISUAL PIXEL SHAPE SETTINGS (acid_and_shapes.js) ##
@ -5506,6 +5516,9 @@ color1 and color2 spread through striped paint like dye does with itself. <u>col
if((typeof(pixel.color) !== "string") || (pixel.color.indexOf("NaN") >= 0)) { if((typeof(pixel.color) !== "string") || (pixel.color.indexOf("NaN") >= 0)) {
pixel.color = pixelColorPick(pixel) pixel.color = pixelColorPick(pixel)
}; };
if(pixel.color.length <= 7) { //hex triplets as colors seem to break some mods and can't be allowed
pixel.color = convertColorFormats(pixel.color,"rgb")
};
var colorFunction = viewColorFunctions[view] ?? normalColorFunction; var colorFunction = viewColorFunctions[view] ?? normalColorFunction;
ctx.fillStyle = colorFunction(pixel); ctx.fillStyle = colorFunction(pixel);
if(find) { //if find and matching, override fill style with the find coloration if(find) { //if find and matching, override fill style with the find coloration