Merge branch 'R74nCom:main' into main

This commit is contained in:
JustAGenericUsername 2024-05-21 06:11:38 -04:00 committed by GitHub
commit e06c3bc4bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -411,3 +411,4 @@ elements.algae.reactions.quicklime = { "elem1": ["oil","methane","methane","coal
elements.algae.reactions.slaked_lime = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 }; elements.algae.reactions.slaked_lime = { "elem1": ["oil","methane","methane","coal"], tempMin:280, chance:0.000025 };
delete elements.dirt.reactions.bone delete elements.dirt.reactions.bone
delete elements.rock.reactions.dead_plant

View File

@ -4,7 +4,6 @@ let topColor = 'rgb(130, 0, 0)';
let blending = 0.7; let blending = 0.7;
function cssColorToRGB(color) { function cssColorToRGB(color) {
console.log(color);
let rgbMatch = color.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/); let rgbMatch = color.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
return [parseInt(rgbMatch[1]), parseInt(rgbMatch[2]), parseInt(rgbMatch[3])]; return [parseInt(rgbMatch[1]), parseInt(rgbMatch[2]), parseInt(rgbMatch[3])];
} }
@ -29,4 +28,4 @@ elements.fire.tick = function(pixel) {
let originalColor = pixel.color; let originalColor = pixel.color;
pixel.color = blendColors(originalColor, topColor, blending); pixel.color = blendColors(originalColor, topColor, blending);
} }
}; };