Merge branch 'R74nCom:main' into main

mod-list.html

@@ -217,6 +217,7 @@
 <tr><td>the_ground.js</td><td>Adds several rock types, worldgen settings, and gemstones</td><td>Alice</td></tr>
 
 <!----><tr><td class="modCat" colspan="3">Machines & Technology</td></tr><!---->
+<tr><td>circuitcore.js</td><td>An extension to logicgates.js that adds advanced circuits. <a href="https://redbirdly.github.io/circuitcore_tutorial.html" target="_blank">Documentation</a>.</td><td>RedBirdly</td></tr>
 <tr><td>clone_liquid.js</td><td>Adds a liquid form of cloner</td><td>Alice</td></tr>
 <tr><td>colored_lightbulbs.js</td><td>Adds a light bulb that can be painted.</td><td>guzzo86, ggod</td></tr>
 <tr><td>combustion.js</td><td>Adds components necessary for combustion engines</td><td>uptzik</td></tr>
@@ -293,6 +294,7 @@
 <tr><td>human_edit.js</td><td>Improvements to humans</td><td>Alice</td></tr>
 <tr><td>Humanitize.js</td><td>Makes humans cultured and able to craft, mine, build houses, trade, and much more.</td><td>Nekonico</td></tr>
 <tr><td>kopalstuff.js</td><td>Adds creatures, spirits, DNA, foods, and more</td><td>DaviStudios</td></tr>
+<tr><td>lizard_mod.js</td><td>Adds lizards to sandboxels.</td><td>RedBirdly</td></tr>
 <tr><td>lost_souls.js</td><td>Adds souls and related elements, the mod can also be found <a href="https://github.com/HACKERPRO908/lost_souls.js">on Github</a></td><td>pixelegend4, SquareScreamYT, salmonfishy</td></tr>
 <tr><td>miscible_psoup_and_birthpool.js</td><td>Makes Primordial Soup and Birthpool mix instead of the birthpool settling to the bottom. Will be deprecated upon the release of Magical Menagerie</td><td>Alice</td></tr>
 <tr><td>mobs.js</td><td>Adds Creepers, Zombies, and Skeletons</td><td>Alice</td></tr>

mods/devtests.js

@@ -3,6 +3,7 @@ elements.rad_fluid = {
     category: "liquids",
     density: 1500,
     state: "liquid",
+    emit: true
 }
 elements.rad_fluid.color = elements.radiation.color;
 elements.rad_fluid.reactions = elements.radiation.reactions;
@@ -214,12 +215,44 @@ viewInfo[9] = { // Blur
 };
 
 elements.fire.emit = true;
-elements.lightning.emit = true;
+elements.lightning.emit = 15;
 elements.electric.emit = true;
 elements.plasma.emit = true;
-elements.uranium.emit = true;
-elements.uranium.emitColor = "#00ff00";
+elements.uranium.emit = 3;
+elements.uranium.emitColor = "#009800";
 elements.rainbow.emit = true;
+elements.static.emit = true;
+elements.flash.emit = true;
+elements.cold_fire.emit = true;
+elements.blaster.emit = true;
+elements.ember.emit = true;
+elements.fw_ember.emit = 10;
+elements.bless.emit = true;
+elements.pop.emit = true;
+elements.explosion.emit = true;
+elements.n_explosion.emit = 10;
+elements.supernova.emit = 20;
+elements.midas_touch.emit = true;
+elements.fireball.emit = true;
+
+elements.sun.emit = 15;
+elements.light.emit = 3;
+elements.liquid_light.emit = true;
+elements.laser.emit = 3;
+elements.neutron.emit = 3;
+elements.proton.emit = 3;
+elements.radiation.emit = 3;
+elements.fallout.emit = 3;
+elements.rad_steam.emit = 2;
+elements.rad_steam.emitColor = "#6ad48c";
+elements.rad_cloud.emit = 2;
+elements.rad_cloud.emitColor = "#009800";
+elements.rad_glass.emit = 2;
+elements.rad_glass.emitColor = "#009800";
+elements.rad_shard.emit = 2;
+elements.rad_shard.emitColor = "#009800";
+elements.malware.emit = 2;
+elements.border.emit = 2;
 
 viewInfo[8] = { // Blur Glow (Emissive pixels only)
     name: "blurglow",
@@ -234,21 +267,61 @@ viewInfo[8] = { // Blur Glow (Emissive pixels only)
     post: function(ctx) {
         devtestsCtx.canvas.width = ctx.canvas.width;
         devtestsCtx.canvas.height = ctx.canvas.height;
-        devtestsCtx.filter = "blur(20px)";
+        devtestsCtx.filter = "blur(30px)";
         // Draw the blurred content on the canvas
         devtestsCtx.drawImage(devtestsCtx2.canvas, 0, 0);
-        devtestsCtx.drawImage(devtestsCtx2.canvas, 0, 0);
-        devtestsCtx.drawImage(devtestsCtx2.canvas, 0, 0);
         devtestsCtx.filter = "none";
     },
 };
 
+// viewInfo[7] = { // Pixelized Glow (Emissive pixels only)
+//     name: "pixelglow",
+//     pixel: viewInfo[1].pixel,
+//     effects: true,
+//     colorEffects: true,
+//     pre: function(ctx) {
+//         devtestsCtx2.canvas.width = width;
+//         devtestsCtx2.canvas.height = height;
+//         devtestsCtx.canvas.width = ctx.canvas.width;
+//         devtestsCtx.canvas.height = ctx.canvas.height;
+//         if (devtestsCtx.msImageSmoothingEnabled !== false) {
+//             devtestsCtx.msImageSmoothingEnabled = false;
+//             devtestsCtx.mozImageSmoothingEnabled = false;
+//             devtestsCtx.webkitImageSmoothingEnabled = false;
+//             devtestsCtx.imageSmoothingEnabled = false;
+//         }
+//     },
+//     pixel: viewInfo[1].pixel,
+//     post: function(ctx) {
+//         // devtestsCtx.canvas.width = ctx.canvas.width;
+//         // devtestsCtx.canvas.height = ctx.canvas.height;
+//         // devtestsCtx.filter = "blur(30px)";
+//         // Draw the blurred content on the canvas
+//         devtestsCtx.filter = "blur(30px)";
+//         devtestsCtx.drawImage(devtestsCtx2.canvas, 0, 0, width, height, 0, 0, devtestsCtx.canvas.width, devtestsCtx.canvas.height);
+//         devtestsCtx.filter = "none";
+//         devtestsCtx.drawImage(devtestsCtx.canvas, 0, 0, devtestsCtx.canvas.width, devtestsCtx.canvas.height, 0, 0, devtestsCtx.canvas.width, devtestsCtx.canvas.height);
+//     },
+// };
+
 renderEachPixel(function(pixel,ctx) {
     if (view === 8) {
-        if (elements[pixel.element].emit || pixel.emit) {
-            var a = (settings.textures !== 0) ? pixel.alpha : undefined;
-            drawSquare(devtestsCtx2,elements[pixel.element].emitColor||pixel.color,pixel.x,pixel.y,undefined,a);
+        if (elements[pixel.element].emit || pixel.emit || (elements[pixel.element].colorOn && pixel.charge)) {
+            let a = (settings.textures !== 0) ? pixel.alpha : undefined;
+            let d = elements[pixel.element].emit||true;
+            if (d === true) d = 5;
+            let r = Math.floor(d/2);
+            drawSquare(devtestsCtx2,elements[pixel.element].emitColor||pixel.color,pixel.x-r,pixel.y-r,d,a);
             // viewInfo[1].pixel(pixel,devtestsCtx2);
         }
     }
+    // else if (view === 7) {
+    //     let a = (settings.textures !== 0) ? pixel.alpha : undefined;
+    //     let d = elements[pixel.element].emit||true;
+    //     if (d === true) d = 5;
+    //     let r = Math.floor(d/2);
+    //     devtestsCtx2.fillStyle = pixel.color;
+    //     if (devtestsCtx2.globalAlpha !== a) { devtestsCtx2.globalAlpha = a; }
+    //     devtestsCtx2.fillRect(pixel.x-r, pixel.y-r, d, d);
+    // }
 })

mods/fractals.js

@@ -89,7 +89,7 @@ elements.mandelbrot = {
                 }
             }
                 */
-            iteration = gridWeightedAverage(pixel.x, pixel.y)
+            iteration = preCalculatedGrid[pixel.x][pixel.y].iteration
             if (iteration >= 99.5) {
                 pixel.color = "rgb(255, 255, 255)"
             } else {

mods/lattice_filler.js

@@ -0,0 +1,29 @@
+elements.lattice_filler = {
+    behavior: [
+        "XX|CL|XX",
+        "CL|DL|CL",
+        "XX|CL|XX",
+    ],
+    category: "special",
+    state: "solid",
+    density: 1834,
+    color: "#ff266e",
+    reactions: {
+        "lightning": {elem1: "destructive_lattice_filler", elem2: null}
+        }
+};
+
+elements.destructive_lattice_filler = {
+    behavior: [
+        "DL|CL|DL",
+        "CL|DL|CL",
+        "DL|CL|DL",
+    ],
+    category: "special",
+    state: "solid",
+    density: 1834,
+    color: "#ff0037",
+    hidden: true,
+};
+
+elements.filler.reactions.laser = { "elem1":"lattice_filler", "elem2": "lattice_filler" }

mods/souls.js

@@ -83,7 +83,8 @@ elements.soul = {
     ignoreAir: true,
     category: "life",
     insulate: true,
-    hidden: true
+    hidden: true,
+    emit: 3
 }
 
 elements.ectoplasm = {
@@ -106,7 +107,8 @@ elements.ectoplasm = {
     insulate: true,
     viscosity: 1666,
     hardness: 100,
-    hidden: true
+    hidden: true,
+    emit: 2
 }
 
 elements.head.breakInto = "soul";