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

more reaction logic 

copying radiation reactions was easy but copying *water* reactions, while *simultaneously* keeping the "water" immutable, is a doozy
This commit is contained in:
Laetitia (O-01-67) 2022-12-13 10:07:13 -05:00 committed by GitHub
parent 5dd6c1f3c6
commit eee1aedb0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mods/haseulite.js
View File

@ -37,7 +37,7 @@ if(enabledMods.includes(loonaMod) && enabledMods.includes(fireMod) && enabledMod
}; };
var pixel2 = pixel; var pixel2 = pixel;
var pixel1 = newPixel; var pixel1 = newPixel;
var r = newInfo.reactions[reactionTarget]; var r = JSON.parse(JSON.stringify(newInfo.reactions[reactionTarget]));
if (r.setting && settings[r.setting]===0) { if (r.setting && settings[r.setting]===0) {
return false; return false;
@ -60,6 +60,11 @@ if(enabledMods.includes(loonaMod) && enabledMods.includes(fireMod) && enabledMod
if (r.y !== undefined && (pixel1.y < r.y[0] || pixel1.y > r.y[1])) { if (r.y !== undefined && (pixel1.y < r.y[0] || pixel1.y > r.y[1])) {
return false; return false;
} }
if(r.elem1 !== undefined && r.elem2 !== undefined) {
if(r.elem1 !== null && r.elem2 !== null) {
r.elem1 = [r.elem1,r.elem2].flat();
};
};
if (r.elem1 !== undefined) { if (r.elem1 !== undefined) {
// if r.elem1 is an array, set elem1 to a random element from the array, otherwise set it to r.elem1 // if r.elem1 is an array, set elem1 to a random element from the array, otherwise set it to r.elem1
if (Array.isArray(r.elem1)) { if (Array.isArray(r.elem1)) {
@ -695,7 +700,7 @@ if(enabledMods.includes(loonaMod) && enabledMods.includes(fireMod) && enabledMod
var rOtherPixel = pixelMap[rfX][rfY]; var rOtherPixel = pixelMap[rfX][rfY];
if(!rOtherPixel) { return false }; if(!rOtherPixel) { return false };
var rOtherElement = rOtherPixel.element; var rOtherElement = rOtherPixel.element;
if(rOtherElement.includes("water") || (Math.random() < 0.3 && jinsouliteReducedSwapWhitelist.includes(rOtherElement))) { if(rOtherElement.endsWith("water") || (Math.random() < 0.3 && jinsouliteReducedSwapWhitelist.includes(rOtherElement))) {
swapPixels(pixel,rOtherPixel); swapPixels(pixel,rOtherPixel);
did = true; did = true;
}; };
@ -753,6 +758,9 @@ if(enabledMods.includes(loonaMod) && enabledMods.includes(fireMod) && enabledMod
if(typeof(pixel2) === "undefined" || isEmpty(rfX,rfY,true)) { if(typeof(pixel2) === "undefined" || isEmpty(rfX,rfY,true)) {
return false; return false;
}; };
if(typeof(pixel1) === "undefined" || isEmpty(pixel.x,pixel.y,true)) {
return false;
};
var rOtherElement = pixel2.element; var rOtherElement = pixel2.element;
var waterReactions = elements.water.reactions; var waterReactions = elements.water.reactions;
if(waterReactions[rOtherElement]) { if(waterReactions[rOtherElement]) {
@ -789,6 +797,11 @@ if(enabledMods.includes(loonaMod) && enabledMods.includes(fireMod) && enabledMod
pixel1[key] = r.attr1[key]; pixel1[key] = r.attr1[key];
} }
} }
var elem1 = r.elem1
if (elem1 !== undefined && elem1 instanceof Array) {
elem1 = elem1[Math.floor(Math.random() * elem1.length)];
};
if (r.elem2 !== undefined) { if (r.elem2 !== undefined) {
// if r.elem2 is an array, set elem2 to a random element from the array, otherwise set it to r.elem2 // if r.elem2 is an array, set elem2 to a random element from the array, otherwise set it to r.elem2
if (Array.isArray(r.elem2)) { if (Array.isArray(r.elem2)) {
@ -796,7 +809,7 @@ if(enabledMods.includes(loonaMod) && enabledMods.includes(fireMod) && enabledMod
} else { var elem2 = r.elem2; } } else { var elem2 = r.elem2; }
if (elem2 == null) { if (elem2 == null) {
deletePixel(pixel2.x,pixel2.y); if(elem1 !== undefined) { changePixel(pixel2,elem1) };
} }
else { else {
changePixel(pixel2,elem2); changePixel(pixel2,elem2);